diff --git a/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs index 8922ab37e1..8a25858cfd 100644 --- a/third_party/nixpkgs/.git-blame-ignore-revs +++ b/third_party/nixpkgs/.git-blame-ignore-revs @@ -171,3 +171,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 # nixos/kanidm: inherit lib, nixfmt 8f18393d380079904d072007fb19dc64baef0a3a + +# fetchurl: nixfmt-rfc-style +ce21e97a1f20dee15da85c084f9d1148d84f853b diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 586ff0ce77..d8fe943b58 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -120,7 +120,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /nixos/modules/system/boot/loader/systemd-boot @JulienMalka # Images and installer media -/nixos/modules/installer/cd-dvd/ +/nixos/modules/profiles/installation-device.nix @ElvishJerricco +/nixos/modules/installer/cd-dvd/ @ElvishJerricco /nixos/modules/installer/sd-card/ # Updaters @@ -162,7 +163,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # C compilers /pkgs/development/compilers/gcc -/pkgs/development/compilers/llvm @RossComputerGuy +/pkgs/development/compilers/llvm @alyssais @RossComputerGuy /pkgs/development/compilers/emscripten @raitobezarius /doc/languages-frameworks/emscripten.section.md @raitobezarius @@ -336,9 +337,6 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange /pkgs/build-support/node/fetch-npm-deps @winterqt /doc/languages-frameworks/javascript.section.md @winterqt -# environment.noXlibs option aka NoX -/nixos/modules/config/no-x-libs.nix @SuperSandro2000 - # OCaml /pkgs/build-support/ocaml @ulrikstrid /pkgs/development/compilers/ocaml @ulrikstrid diff --git a/third_party/nixpkgs/.mailmap b/third_party/nixpkgs/.mailmap index 68b9a683e5..12ba1f6ae4 100644 --- a/third_party/nixpkgs/.mailmap +++ b/third_party/nixpkgs/.mailmap @@ -1,6 +1,9 @@ ajs124 Anderson Torres Atemu +Christina Sørensen +Christina Sørensen +Christina Sørensen <89321978+cafkafk@users.noreply.github.com> Daniel Løvbrøtte Olsen Fabian Affolter goatastronaut0212 diff --git a/third_party/nixpkgs/doc/README.md b/third_party/nixpkgs/doc/README.md index 211f986b85..534fc92de5 100644 --- a/third_party/nixpkgs/doc/README.md +++ b/third_party/nixpkgs/doc/README.md @@ -2,10 +2,20 @@ This directory houses the sources files for the Nixpkgs reference manual. -Going forward, it should only contain [reference](https://nix.dev/contributing/documentation/diataxis#reference) documentation. -For tutorials, guides and explanations, contribute to instead. +> [!IMPORTANT] +> We are actively restructuring our documentation to follow the [Diátaxis framework](https://diataxis.fr/) +> +> Going forward, this directory should **only** contain [reference documentation](https://nix.dev/contributing/documentation/diataxis#reference). +> For tutorials, guides and explanations, contribute to instead. +> +> We are actively working to generate **all** reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code. +> This also provides the benefit of using `:doc` in the `nix repl` to view reference documentation locally on the fly. -For documentation only relevant for contributors, use Markdown files and code comments in the source code. +For documentation only relevant for contributors, use Markdown files next to the source and regular code comments. + +> [!TIP] +> Feedback for improving support for parsing and rendering doc-comments is highly appreciated. +> [Open an issue](https://github.com/NixOS/nixpkgs/issues/new?labels=6.topic%3A+documentation&title=Doc%3A+) to request bugfixes or new features. Rendered documentation: - [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/) diff --git a/third_party/nixpkgs/doc/build-helpers/images/dockertools.section.md b/third_party/nixpkgs/doc/build-helpers/images/dockertools.section.md index 6732f79073..26c1d9c14a 100644 --- a/third_party/nixpkgs/doc/build-helpers/images/dockertools.section.md +++ b/third_party/nixpkgs/doc/build-helpers/images/dockertools.section.md @@ -453,7 +453,7 @@ See [](#ex-dockerTools-streamLayeredImage-exploringlayers) to understand how the `streamLayeredImage` allows scripts to be run when creating the additional layer with symlinks, allowing custom behaviour to affect the final results of the image (see the documentation of the `extraCommands` and `fakeRootCommands` attributes). The resulting repository tarball will list a single image as specified by the `name` and `tag` attributes. -By default, that image will use a static creation date (see documentation for the `created` attribute). +By default, that image will use a static creation date (see documentation for the `created` and `mtime` attributes). This allows the function to produce reproducible images. ### Inputs {#ssec-pkgs-dockerTools-streamLayeredImage-inputs} @@ -516,6 +516,7 @@ This allows the function to produce reproducible images. `created` (String; _optional_) : Specifies the time of creation of the generated image. + This date will be used for the image metadata. This should be either a date and time formatted according to [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) or `"now"`, in which case the current date will be used. :::{.caution} @@ -524,6 +525,18 @@ This allows the function to produce reproducible images. _Default value:_ `"1970-01-01T00:00:01Z"`. +`mtime` (String; _optional_) + +: Specifies the time used for the modification timestamp of files within the layers of the generated image. + This should be either a date and time formatted according to [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) or `"now"`, in which case the current date will be used. + + :::{.caution} + Using a non-constant date will cause built layers to have a different hash each time, preventing deduplication. + Using `"now"` also means that the generated image will not be reproducible anymore (because the date will always change whenever it's built). + ::: + + _Default value:_ `"1970-01-01T00:00:01Z"`. + `uid` (Number; _optional_) []{#dockerTools-buildLayeredImage-arg-uid} `gid` (Number; _optional_) []{#dockerTools-buildLayeredImage-arg-gid} `uname` (String; _optional_) []{#dockerTools-buildLayeredImage-arg-uname} diff --git a/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md b/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md index 31b42bd774..ff00548e04 100644 --- a/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md @@ -501,7 +501,7 @@ writeTextFile { text = '' Contents of File ''; - destination = "share/my-file"; + destination = "/share/my-file"; } ``` @@ -586,7 +586,7 @@ writeTextFile { echo "hi" ''; executable = true; - destination = "bin/my-script"; + destination = "/bin/my-script"; } ``` @@ -674,7 +674,7 @@ writeTextFile { echo "hi" ''; executable = true; - destination = "bin/my-script"; + destination = "/bin/my-script"; } ``` diff --git a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md index a2961eceeb..ca983eec4f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md @@ -23,12 +23,13 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * if it is a string of the form `owner:branch` then it tries to download the `branch` of owner `owner` for a project of the same name using the same vcs, and the `version` attribute of the resulting derivation is set to `"dev"`, additionally if the owner is not provided (i.e. if the `owner:` prefix is missing), it defaults to the original owner of the package (see below), * if it is a string of the form `"#N"`, and the domain is github, then it tries to download the current head of the pull request `#N` from github, * `defaultVersion` (optional). Coq libraries may be compatible with some specific versions of Coq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `coq` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `coqPackages` attribute set. -* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `hash` attribute (you may put the empty string `""` in order to automatically insert a fake hash, this will trigger an error which will allow you to find the correct hash), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). +* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `hash` attribute (you may put the empty string `""` in order to automatically insert a fake hash, this will trigger an error which will allow you to find the correct hash), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev`, `artifact` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). * `fetcher` (optional, defaults to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `hash` and returns an attribute set with a `version` and `src`. * `repo` (optional, defaults to the value of `pname`), * `owner` (optional, defaults to `"coq-community"`). * `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example), * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, +* `releaseArtifact` (optional, defaults to `(v: null)`), provides a default mapping from release names to artifact names (only works for github artifact for now), * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, * `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, * `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set). diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index bb7d0d5d4d..3e07aa1cd4 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -47,7 +47,7 @@ checks = forAllSystems (system: { tarball = jobs.${system}.tarball; # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 - } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { + } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.hostPlatform.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.` @@ -64,7 +64,7 @@ boot.loader.grub.enable = false; fileSystems."/".device = "nodev"; # See https://search.nixos.org/options?show=system.stateVersion&query=stateversion - system.stateVersion = lib.versions.majorMinor lib.version; # DON'T do this in real configs! + system.stateVersion = lib.trivial.release; # DON'T do this in real configs! }) ]; }).config.system.build.toplevel; diff --git a/third_party/nixpkgs/lib/tests/test-with-nix.nix b/third_party/nixpkgs/lib/tests/test-with-nix.nix index 1316aaa49b..a6aee98594 100644 --- a/third_party/nixpkgs/lib/tests/test-with-nix.nix +++ b/third_party/nixpkgs/lib/tests/test-with-nix.nix @@ -33,7 +33,7 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { nativeBuildInputs = [ nix pkgs.gitMinimal - ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; + ] ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools; strictDeps = true; } '' datadir="${nix}/share" diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index b042e0376a..a0a834fe3e 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -2028,6 +2028,13 @@ github = "Atry"; githubId = 601530; }; + attila = { + name = "Attila Oláh"; + email = "attila@dorn.haus"; + github = "attilaolah"; + githubId = 196617; + keys = [ { fingerprint = "BF2E 4759 74D3 88E0 E30C 9604 07E6 C064 3FD1 42C3"; } ]; + }; auchter = { name = "Michael Auchter"; email = "a@phire.org"; @@ -2514,6 +2521,12 @@ githubId = 6145260; keys = [ { fingerprint = "804B 6CB8 AED5 61D9 3DAD 4DC5 E2F2 2C5E DF20 119D"; } ]; }; + benchand = { + name = "Ben Chand"; + email = "BenChand1995@gmail.com"; + github = "BenChand"; + githubId = 3618457; + }; bendlas = { email = "herwig@bendlas.net"; matrix = "@bendlas:matrix.org"; @@ -2661,6 +2674,13 @@ githubId = 7346933; name = "betaboon"; }; + beviu = { + name = "beviu"; + email = "nixpkgs@beviu.com"; + github = "beviu"; + githubId = 56923875; + keys = [ { fingerprint = "30D6 A755 E3C3 5797 CBBB 05B6 CD20 2E66 5CAD 7D06"; } ]; + }; bew = { email = "benoit.dechezelles@gmail.com"; github = "bew"; @@ -2733,6 +2753,13 @@ githubId = 19915050; name = "binarycat"; }; + binary-eater = { + email = "sergeantsagara@protonmail.com"; + github = "Binary-Eater"; + githubId = 10691440; + name = "Rahul Rameshbabu"; + keys = [ { fingerprint = "678A 8DF1 D9F2 B51B 7110 BE53 FF24 7B3E 5411 387B"; } ]; + }; binsky = { email = "timo@binsky.org"; github = "binsky08"; @@ -2750,6 +2777,12 @@ githubId = 10164833; name = "Birk Bohne"; }; + bjesus = { + email = "nixpkgs@yoavmoshe.com"; + github = "bjesus"; + githubId = 55081; + name = "Yo'av Moshe"; + }; bjornfor = { email = "bjorn.forsman@gmail.com"; github = "bjornfor"; @@ -3306,6 +3339,12 @@ githubId = 141733; name = "Andrew Bruce"; }; + camerondugan = { + email = "cameron.dugan@protonmail.com"; + github = "camerondugan"; + githubId = 54632731; + name = "Cameron Dugan"; + }; cameronfyfe = { email = "cameron.j.fyfe@gmail.com"; github = "cameronfyfe"; @@ -3422,6 +3461,12 @@ githubId = 5241813; name = "Carter Sande"; }; + casaca = { + name = "J McNutt"; + email = "jmacasac@hotmail.com"; + github = "casaca24"; + githubId = 87252279; + }; casey = { email = "casey@rodarmor.net"; github = "casey"; @@ -4050,6 +4095,12 @@ email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + codgician = { + email = "codgician@outlook.com"; + github = "codgician"; + githubId = 15964984; + name = "codgician"; + }; codifryed = { email = "gb@guyboldon.com"; name = "Guy Boldon"; @@ -7041,6 +7092,13 @@ githubId = 5918766; name = "Franz Thoma"; }; + fnune = { + email = "fausto.nunez@mailbox.org"; + github = "fnune"; + githubId = 16181067; + name = "Fausto Núñez Alberro"; + keys = [ { fingerprint = "668E 01D1 B129 3F42 0A0F 933A C880 6451 94A2 D562"; } ]; + }; foo-dogsquared = { email = "foodogsquared@foodogsquared.one"; github = "foo-dogsquared"; @@ -9079,6 +9137,12 @@ githubId = 54999; name = "Ariel Nunez"; }; + interdependence = { + email = "git@williamvandervalk.com"; + github = "interdependence"; + githubId = 45567423; + name = "William Vandervalk"; + }; Intuinewin = { email = "antoinelabarussias@gmail.com"; github = "Intuinewin"; @@ -9110,6 +9174,12 @@ githubId = 1817528; name = "Igor Polyakov"; }; + iosmanthus = { + email = "myosmanthustree@gmail.com"; + github = "iosmanthus"; + githubId = 16307070; + name = "iosmanthus"; + }; iquerejeta = { github = "iquerejeta"; githubId = 31273774; @@ -9847,6 +9917,11 @@ githubId = 1061229; name = "Jiehong Ma"; }; + jigglycrumb = { + github = "jigglycrumb"; + githubId = 1476865; + name = "jigglycrumb"; + }; jirkamarsik = { email = "jiri.marsik89@gmail.com"; github = "jirkamarsik"; @@ -11817,6 +11892,12 @@ githubId = 13804737; keys = [ { fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; } ]; }; + lgbishop = { + email = "lachlan.bishop@hotmail.com"; + github = "lgbishop"; + githubId = 125634066; + name = "Lachlan Bishop"; + }; lgcl = { email = "dev@lgcl.de"; name = "Leon Vack"; @@ -12207,6 +12288,12 @@ githubId = 8555953; name = "Laure Tavard"; }; + ltrump = { + email = "ltrump@163.com"; + github = "L-Trump"; + githubId = 37738631; + name = "Luo Chen"; + }; ltstf1re = { email = "ltstf1re@disroot.org"; github = "lsf1re"; @@ -12252,6 +12339,12 @@ githubId = 15693688; name = "Lucas Eduardo Wendt"; }; + lucastso10 = { + email = "lucastso10@gmail.com"; + github = "lucastso10"; + githubId = 84486266; + name = "Lucas Teixeira Soares"; + }; lucc = { email = "lucc+nix@posteo.de"; github = "lucc"; @@ -13415,6 +13508,12 @@ github = "Mephistophiles"; githubId = 4850908; }; + merrkry = { + email = "merrkry@tsubasa.moe"; + name = "merrkry"; + github = "merrkry"; + githubId = 124278440; + }; mevatron = { email = "mevatron@gmail.com"; name = "mevatron"; @@ -13895,7 +13994,7 @@ name = "Maciej Kazulak"; }; mkez = { - email = "matias.zwinger+nix@protonmail.com"; + email = "matias+nix@zwinger.fi"; github = "mk3z"; githubId = 52108954; name = "Matias Zwinger"; @@ -15310,6 +15409,19 @@ githubId = 5047052; name = "Niclas Hirschfeld"; }; + nwjsmith = { + email = "nate@theinternate.com"; + github = "nwjsmith"; + githubId = 1348; + name = "Nate Smith"; + }; + nyabinary = { + name = "Niko Cantero"; + email = "nyanbinary@keemail.me"; + matrix = "@niko:conduit.rs"; + github = "nyabinary"; + githubId = 97130632; + }; nyadiia = { email = "nyadiia@pm.me"; github = "nyadiia"; @@ -15317,13 +15429,6 @@ name = "Nadia"; keys = [ { fingerprint = "6B51 E324 238A F455 2381 313A 9254 1B0C D2A9 3AD8"; } ]; }; - nyanbinary = { - email = "nyanbinary@keemail.me"; - matrix = "@niko:conduit.rs"; - github = "nyabinary"; - githubId = 97130632; - name = "Niko"; - }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -16563,6 +16668,12 @@ githubId = 358550; name = "Philip Lykke Carlsen"; }; + plebhash = { + name = "plebhash"; + email = "plebhash@proton.me"; + github = "plebhash"; + githubId = 147345153; + }; pleshevskiy = { email = "dmitriy@pleshevski.ru"; github = "pleshevskiy"; @@ -16902,6 +17013,12 @@ githubId = 406946; name = "Valentin Lorentz"; }; + projectinitiative = { + name = "ProjectInitiative"; + github = "ProjectInitiative"; + githubId = 6314611; + keys = [ { fingerprint = "EEC7 53FC EAAA FD9E 4DC0 9BB5 CAEB 4185 C226 D76B"; } ]; + }; prominentretail = { email = "me@jakepark.me"; github = "ProminentRetail"; @@ -18037,6 +18154,12 @@ githubId = 17805516; name = "Rohan Rao"; }; + rolfschr = { + email = "rolf.schr@posteo.de"; + github = "rolfschr"; + githubId = 1188465; + name = "Rolf Schröder"; + }; rollf = { email = "rolf.schroeder@limbus-medtec.com"; github = "rollf"; @@ -18099,12 +18222,6 @@ github = "rosehobgoblin"; githubId = 84164410; }; - roshaen = { - name = "Roshan Kumar"; - email = "roshaen09@gmail.com"; - github = "roshaen"; - githubId = 58213083; - }; RossComputerGuy = { name = "Tristan Ross"; email = "tristan.ross@midstall.com"; @@ -19233,6 +19350,12 @@ github = "kf5grd"; githubId = 18297490; }; + shogo = { + email = "shouryagoel10000@gmail.com"; + github = "Sh0g0-1758"; + githubId = 114918019; + name = "Shourya Goel"; + }; shortcord = { name = "Short Cord"; email = "short@shortcord.com"; @@ -19899,6 +20022,12 @@ github = "srounce"; githubId = 60792; }; + sshine = { + email = "simon@simonshine.dk"; + github = "sshine"; + githubId = 50879; + name = "Simon Shine"; + }; SShrike = { email = "severen@shrike.me"; github = "severen"; @@ -23177,6 +23306,12 @@ github = "YoshiRulz"; githubId = 13409956; }; + youhaveme9 = { + name = "Roshan Kumar"; + email = "roshaen09@gmail.com"; + github = "youhaveme9"; + githubId = 58213083; + }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; diff --git a/third_party/nixpkgs/maintainers/scripts/convert-to-import-cargo-lock/shell.nix b/third_party/nixpkgs/maintainers/scripts/convert-to-import-cargo-lock/shell.nix index fc2e234830..2938cf2d0c 100644 --- a/third_party/nixpkgs/maintainers/scripts/convert-to-import-cargo-lock/shell.nix +++ b/third_party/nixpkgs/maintainers/scripts/convert-to-import-cargo-lock/shell.nix @@ -13,5 +13,5 @@ mkShell { clippy rustfmt ] - ++ lib.optional stdenv.isDarwin pkgs.libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv; } diff --git a/third_party/nixpkgs/maintainers/scripts/kde/generate-sources.py b/third_party/nixpkgs/maintainers/scripts/kde/generate-sources.py index a5a5fbfd72..e107e00fb7 100755 --- a/third_party/nixpkgs/maintainers/scripts/kde/generate-sources.py +++ b/third_party/nixpkgs/maintainers/scripts/kde/generate-sources.py @@ -16,7 +16,7 @@ import utils LEAF_TEMPLATE = jinja2.Template(''' -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "{{ pname }}"; } @@ -25,7 +25,7 @@ mkKdeDerivation { ROOT_TEMPLATE = jinja2.Template(''' {callPackage}: { {%- for p in packages %} - {{ p }} = callPackage ./{{ p }} {}; + {{ p }} = callPackage ./{{ p }} { }; {%- endfor %} } '''.strip()); diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index 4d1ed177c1..f502e569aa 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -114,6 +114,7 @@ middleclass,,,,,, mimetypes,,,,,, mpack,,,,,, moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn +neorg,,,,,,GaetanLepage neotest,,,,,,mrcjkb nlua,,,,,,teto nui.nvim,,,,,,mrcjkb diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate-py/__init__.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate-py/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate-py/pluginupdate.py similarity index 100% rename from third_party/nixpkgs/maintainers/scripts/pluginupdate.py rename to third_party/nixpkgs/maintainers/scripts/pluginupdate-py/pluginupdate.py diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 5081616f13..e75a2850f2 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -565,6 +565,7 @@ with lib.maintainers; linux-kernel = { members = [ TredwellGit + k900 ma27 nequissimus qyliss diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.section.md index 76d9585a0b..5b72112477 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.section.md @@ -1,8 +1,6 @@ # Minimal {#sec-profile-minimal} This profile defines a small NixOS configuration. It does not contain any -graphical stuff. It's a very short file that enables -[noXlibs](#opt-environment.noXlibs), sets -[](#opt-i18n.supportedLocales) to -only support the user-selected locale, -and [disables packages' documentation](#opt-documentation.enable). +graphical stuff. It's a very short file that sets [](#opt-i18n.supportedLocales) +to only support the user-selected locale, and +[disables packages' documentation](#opt-documentation.enable). diff --git a/third_party/nixpkgs/nixos/doc/manual/development/testing-installer.chapter.md b/third_party/nixpkgs/nixos/doc/manual/development/testing-installer.chapter.md index 2eaa016149..92c759a855 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/testing-installer.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/testing-installer.chapter.md @@ -6,13 +6,13 @@ tedious, so here is a quick way to see if the installer works properly: ```ShellSession # mount -t tmpfs none /mnt # nixos-generate-config --root /mnt -$ nix-build '' -A config.system.build.nixos-install +$ nix-build '' -A nixos-install # ./result/bin/nixos-install ``` To start a login shell in the new NixOS installation in `/mnt`: ```ShellSession -$ nix-build '' -A config.system.build.nixos-enter +$ nix-build '' -A nixos-enter # ./result/bin/nixos-enter ``` diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md index 8f37eb3539..b927c7c0e8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md @@ -220,6 +220,8 @@ The NixOS installer ships with multiple partitioning tools. The examples below use `parted`, but also provides `fdisk`, `gdisk`, `cfdisk`, and `cgdisk`. +Use the command 'lsblk' to find the name of your 'disk' device. + The recommended partition scheme differs depending if the computer uses *Legacy Boot* or *UEFI*. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md index 32c3dc2f54..48dc9b31b6 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md @@ -46,10 +46,13 @@ If you experience any issues, please report them. The original Perl script can still be used for now by setting `system.switch.enableNg` to `false`. +- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html) + was added through the `boot.initrd.systemd.dmVerity` option. + - The [Xen Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable). - This release includes Xen [4.17.5](https://wiki.xenproject.org/wiki/Xen_Project_4.17_Release_Notes), [4.18.3](https://wiki.xenproject.org/wiki/Xen_Project_4.18_Release_Notes) and [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes), as well as support for booting the hypervisor on EFI systems. ::: {.warning} - Booting into Xen through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported. + Booting into Xen through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported. ::: - There are two flavours of Xen available by default: `xen`, which includes all built-in components, and `xen-slim`, which replaces the built-in components with their Nixpkgs equivalents. - The `qemu-xen-traditional` component has been deprecated by upstream Xen, and is no longer available in any of the Xen packages. @@ -58,7 +61,7 @@ ## New Modules {#sec-release-24.11-new-modules} -- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). +- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwarrior 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. @@ -146,6 +149,10 @@ - [ToDesk](https://www.todesk.com/linux.html), a remote desktop applicaton. Available as [services.todesk.enable](#opt-services.todesk.enable). +- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](option.html#opt-services.dependency-track). + +- [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage: @@ -194,6 +201,8 @@ - The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have now been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively. +- The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network. + - The fcgiwrap module now allows multiple instances running as distinct users. The option `services.fgciwrap` now takes an attribute set of the configuration of each individual instance. @@ -254,6 +263,9 @@ - `pkgs.nextcloud27` has been removed since it's EOL. +- The `environment.noXlibs` option has been removed. It was a common source of unexpected rebuilds and breakage that was often hard to diagnose. + If you need to disable certain libraries, you're encouraged to add your own overlay to your configuration that targets the packages you care about. + - `frigate` was updated past 0.14.0. This release includes various breaking changes, so please go read the [release notes](https://github.com/blakeblackshear/frigate/releases/tag/v0.14.0). Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created admin account from the `frigate.service` journal after upgrading. @@ -460,11 +472,23 @@ - The `openlens` package got removed, suggested replacment `lens-desktop` +- The `services.dnsmasq.extraConfig` option has been removed, as it had been deprecated for over 2 years. This option has been replaced by `services.dnsmasq.settings`. + - The NixOS installation media no longer support the ReiserFS or JFS file systems by default. - Minimal installer ISOs are no longer built on the small channel. Please obtain installer images from the full release channels. +- The `isync` package has been updated to version `1.5.0`, which introduces some breaking changes. See the [compatibility concerns](https://sourceforge.net/projects/isync/files/isync/1.5.0/) for more details. + +- Legacy package `globalprotect-openconnect` 1.x and related module + `globalprotect-vpn` were dropped. Two new packages `gpauth` and `gpclient` + from the 2.x version of the GlobalProtect-openconnect project are added in its + place. The GUI components related to the project are non-free and not + packaged. + +- Compatible string matching for `hardware.deviceTree.overlays` has been changed to a more correct behavior. See [below](#sec-release-24.11-migration-dto-compatible) for details. + ## Other Notable Changes {#sec-release-24.11-notable-changes} @@ -504,6 +528,8 @@ The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. +- Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11 + - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an unrestricted access to it can set `boot.kernel.sysctl."kernel.dmesg_restrict" = false`. @@ -587,3 +613,22 @@ in { ]; }; ``` + +### `hardware.deviceTree.overlays` compatible string matching {#sec-release-24.11-migration-dto-compatible} + +The original compatible string implementation in older NixOS versions relied on substring matching, +which is incorrect for overlays with multiple compatible strings and other cases. + +The new behavior is consistent with what other tools already do - the overlay is considered applicable if, +and only if, _any_ of the compatible strings in the overlay match _any_ of the compatible strings in the DT. + +To provide some examples: + +| Overlay `compatible` | DT `compatible` | Pre-24.11 behavior | Correct behavior | Notes | +|----------------------|-----------------|--------------------|------------------|--------------------------------------------| +| `"foo"` | `"foo", "bar"` | match | match | Most common use case does not change | +| `"foo"` | `"foobar"` | match | no match | Substrings should not be matched | +| `"foo bar"` | `"foo", "bar"` | match | no match | Separators should not be matched to spaces | +| `"foo", "bar"` | `"baz", "bar"` | no match | match | One compatible string matching is enough | + +Note that this also allows writing overlays that explicitly apply to multiple boards. diff --git a/third_party/nixpkgs/nixos/lib/make-disk-image.nix b/third_party/nixpkgs/nixos/lib/make-disk-image.nix index 208eaf59dc..a943edb7b5 100644 --- a/third_party/nixpkgs/nixos/lib/make-disk-image.nix +++ b/third_party/nixpkgs/nixos/lib/make-disk-image.nix @@ -321,7 +321,7 @@ let format' = format; in let e2fsprogs lkl config.system.build.nixos-install - config.system.build.nixos-enter + nixos-enter nix systemdMinimal ] diff --git a/third_party/nixpkgs/nixos/lib/make-multi-disk-zfs-image.nix b/third_party/nixpkgs/nixos/lib/make-multi-disk-zfs-image.nix index 077bb8f227..1dac232e2b 100644 --- a/third_party/nixpkgs/nixos/lib/make-multi-disk-zfs-image.nix +++ b/third_party/nixpkgs/nixos/lib/make-multi-disk-zfs-image.nix @@ -124,7 +124,7 @@ let tools = lib.makeBinPath ( with pkgs; [ - config.system.build.nixos-enter + nixos-enter config.system.build.nixos-install dosfstools e2fsprogs diff --git a/third_party/nixpkgs/nixos/lib/make-single-disk-zfs-image.nix b/third_party/nixpkgs/nixos/lib/make-single-disk-zfs-image.nix index 585fa93b7f..e37b79797d 100644 --- a/third_party/nixpkgs/nixos/lib/make-single-disk-zfs-image.nix +++ b/third_party/nixpkgs/nixos/lib/make-single-disk-zfs-image.nix @@ -112,7 +112,7 @@ let tools = lib.makeBinPath ( with pkgs; [ - config.system.build.nixos-enter + nixos-enter config.system.build.nixos-install dosfstools e2fsprogs diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix index 7b58d3adc2..205fd1fa7b 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix @@ -52,7 +52,7 @@ let ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' ${cache} - ${lib.optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' + ${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) '' ${cache32} ''} ''} diff --git a/third_party/nixpkgs/nixos/modules/config/ldso.nix b/third_party/nixpkgs/nixos/modules/config/ldso.nix index 60156dd040..f8d89db022 100644 --- a/third_party/nixpkgs/nixos/modules/config/ldso.nix +++ b/third_party/nixpkgs/nixos/modules/config/ldso.nix @@ -32,7 +32,7 @@ in { config = { assertions = [ - { assertion = isNull config.environment.ldso32 || pkgs.stdenv.isx86_64; + { assertion = isNull config.environment.ldso32 || pkgs.stdenv.hostPlatform.isx86_64; message = "Option environment.ldso32 currently only works on x86_64."; } ]; @@ -44,7 +44,7 @@ in { "d /${libDir} 0755 root root - -" "L+ /${libDir}/${ldsoBasename} - - - - ${config.environment.ldso}" ] - ) ++ optionals pkgs.stdenv.isx86_64 ( + ) ++ optionals pkgs.stdenv.hostPlatform.isx86_64 ( if isNull config.environment.ldso32 then [ "r /${libDir32}/${ldsoBasename32} - - - - -" ] else [ diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix deleted file mode 100644 index e3fd0b34dd..0000000000 --- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix +++ /dev/null @@ -1,91 +0,0 @@ -# This module gets rid of all dependencies on X11 client libraries -# (including fontconfig). -{ config, lib, ... }: -{ - options = { - environment.noXlibs = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Switch off the options in the default configuration that - require X11 libraries. This includes client-side font - configuration and SSH forwarding of X11 authentication - in. Thus, you probably do not want to enable this option if - you want to run X11 programs on this machine via SSH. - ''; - }; - }; - - config = lib.mkIf config.environment.noXlibs { - programs.ssh.setXAuthLocation = false; - security.pam.services.su.forwardXAuth = lib.mkForce false; - - fonts.fontconfig.enable = false; - - nixpkgs.overlays = lib.singleton (lib.const (super: { - beam = super.beam_nox; - cairo = super.cairo.override { x11Support = false; }; - dbus = super.dbus.override { x11Support = false; }; - fastfetch = super.fastfetch.override { vulkanSupport = false; waylandSupport = false; x11Support = false; }; - ffmpeg = super.ffmpeg.override { ffmpegVariant = "headless"; }; - ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; }; - ffmpeg_6 = super.ffmpeg_6.override { ffmpegVariant = "headless"; }; - ffmpeg_7 = super.ffmpeg_7.override { ffmpegVariant = "headless"; }; - # dep of graphviz, libXpm is optional for Xpm support - gd = super.gd.override { withXorg = false; }; - ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; }; - gjs = (super.gjs.override { installTests = false; }).overrideAttrs { doCheck = false; }; # avoid test dependency on gtk3 - gobject-introspection = super.gobject-introspection.override { x11Support = false; }; - gpg-tui = super.gpg-tui.override { x11Support = false; }; - gpsd = super.gpsd.override { guiSupport = false; }; - graphviz = super.graphviz-nox; - gst_all_1 = super.gst_all_1 // { - gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; }; - gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableGl = false; enableWayland = false; enableX11 = false; }; - gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableWayland = false; enableX11 = false; gtkSupport = false; qt5Support = false; qt6Support = false; }; - gst-plugins-rs = super.gst_all_1.gst-plugins-rs.override { withGtkPlugins = false; }; - }; - imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; - imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; - intel-vaapi-driver = super.intel-vaapi-driver.override { enableGui = false; }; - libdevil = super.libdevil-nox; - libextractor = super.libextractor.override { gtkSupport = false; }; - libplacebo = super.libplacebo.override { vulkanSupport = false; }; - libva = super.libva-minimal; - limesuite = super.limesuite.override { withGui = false; }; - mc = super.mc.override { x11Support = false; }; - mpv-unwrapped = super.mpv-unwrapped.override { drmSupport = false; screenSaverSupport = false; sdl2Support = false; vulkanSupport = false; waylandSupport = false; x11Support = false; }; - msmtp = super.msmtp.override { withKeyring = false; }; - mupdf = super.mupdf.override { enableGL = false; enableX11 = false; }; - neofetch = super.neofetch.override { x11Support = false; }; - networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; - networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; - networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; - networkmanager-openconnect = super.networkmanager-openconnect.override { withGnome = false; }; - networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; - networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; - networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; - pango = super.pango.override { x11Support = false; }; - pinentry-curses = super.pinentry-curses.override { withLibsecret = false; }; - pinentry-tty = super.pinentry-tty.override { withLibsecret = false; }; - pipewire = super.pipewire.override { vulkanSupport = false; x11Support = false; }; - pythonPackagesExtensions = super.pythonPackagesExtensions ++ [ - (python-final: python-prev: { - # tk feature requires wayland which fails to compile - matplotlib = python-prev.matplotlib.override { enableTk = false; }; - }) - ]; - qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; - qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); - qt5 = super.qt5.overrideScope (lib.const (super': { - qtbase = super'.qtbase.override { withGtk3 = false; withQttranslation = false; }; - })); - stoken = super.stoken.override { withGTK3 = false; }; - # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 - util-linux = super.util-linux.override { translateManpages = false; }; - vim-full = super.vim-full.override { guiSupport = false; }; - vte = super.vte.override { gtkVersion = null; }; - zbar = super.zbar.override { enableVideo = false; withXorg = false; }; - })); - }; -} diff --git a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix index 6a6aeaab65..6e6e577e6e 100644 --- a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix +++ b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); myConfigFile = diff --git a/third_party/nixpkgs/nixos/modules/config/stub-ld.nix b/third_party/nixpkgs/nixos/modules/config/stub-ld.nix index 87b7bdf07a..05945852ee 100644 --- a/third_party/nixpkgs/nixos/modules/config/stub-ld.nix +++ b/third_party/nixpkgs/nixos/modules/config/stub-ld.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable { environment.ldso = mkDefault stub-ld; - environment.ldso32 = mkIf pkgs.stdenv.isx86_64 (mkDefault stub-ld32); + environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32); }; meta.maintainers = with lib.maintainers; [ tejing ]; diff --git a/third_party/nixpkgs/nixos/modules/hardware/graphics.nix b/third_party/nixpkgs/nixos/modules/hardware/graphics.nix index 99c122f75c..2d6b377ae5 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/graphics.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/graphics.nix @@ -14,7 +14,7 @@ let in { imports = [ - (lib.mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "graphics" "extraPackages" ]) (lib.mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] "S3TC support is now always enabled in Mesa.") (lib.mkRemovedOptionModule [ "hardware" "opengl" "driSupport"] "The setting can be removed.") @@ -100,7 +100,7 @@ in config = lib.mkIf cfg.enable { assertions = [ { - assertion = cfg.enable32Bit -> pkgs.stdenv.isx86_64; + assertion = cfg.enable32Bit -> pkgs.stdenv.hostPlatform.isx86_64; message = "`hardware.graphics.enable32Bit` only makes sense on a 64-bit system."; } { @@ -112,7 +112,7 @@ in systemd.tmpfiles.settings.graphics-driver = { "/run/opengl-driver"."L+".argument = toString driversEnv; "/run/opengl-driver-32" = - if pkgs.stdenv.isi686 then + if pkgs.stdenv.hostPlatform.isi686 then { "L+".argument = "opengl-driver"; } else if cfg.enable32Bit then { "L+".argument = toString driversEnv32; } diff --git a/third_party/nixpkgs/nixos/modules/image/assert_uki_repart_match.py b/third_party/nixpkgs/nixos/modules/image/assert_uki_repart_match.py new file mode 100644 index 0000000000..e0f266cf15 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/image/assert_uki_repart_match.py @@ -0,0 +1,78 @@ +import json +import sys + +store_verity_type = "@NIX_STORE_VERITY@" # replaced at import by Nix + + +def extract_uki_cmdline_params(ukify_json: dict) -> dict[str, str]: + """ + Return a dict of the parameters in the .cmdline section of the UKI + Exits early if "usrhash" is not included. + """ + cmdline = ukify_json.get(".cmdline", {}).get("text") + if cmdline is None: + print("Failed to get cmdline from ukify output") + + params = {} + for param in cmdline.split(): + key, val = param.partition("=")[::2] + params[key] = val + + if "usrhash" not in params: + print( + f"UKI cmdline does not contain a usrhash:\n{cmdline}" + ) + exit(1) + + return params + + +def hashes_match(partition: dict[str, str], expected: str) -> bool: + """ + Checks if the value of the "roothash" key in the passed partition object matches `expected`. + """ + if partition.get("roothash") != expected: + pretty_part = json.dumps(partition, indent=2) + print( + f"hash mismatch, expected to find roothash {expected} in:\n{pretty_part}" + ) + return False + else: + return True + + +def check_partitions( + partitions: list[dict], uki_params: dict[str, str] +) -> bool: + """ + Checks if the usrhash from `uki_params` has a matching roothash + for the corresponding partition in `partitions`. + """ + for part in partitions: + if part.get("type") == store_verity_type: + expected = uki_params["usrhash"] + return hashes_match(part, expected) + + return False + + +def main() -> None: + ukify_json = json.load(sys.stdin) + repart_json_output = sys.argv[1] + + with open(repart_json_output, "r") as r: + repart_json = json.load(r) + + uki_params = extract_uki_cmdline_params(ukify_json) + + if check_partitions(repart_json, uki_params): + print("UKI and repart verity hashes match") + else: + print("Compatibility check for UKI and image failed!") + print(f"UKI cmdline parameters:\n{uki_params}") + print(f"repart config: {repart_json_output}") + exit(1) + + +if __name__ == "__main__": + main() diff --git a/third_party/nixpkgs/nixos/modules/image/repart-verity-store.nix b/third_party/nixpkgs/nixos/modules/image/repart-verity-store.nix new file mode 100644 index 0000000000..3f341ca421 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/image/repart-verity-store.nix @@ -0,0 +1,209 @@ +# opinionated module that can be used to build nixos images with +# a dm-verity protected nix store +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.image.repart.verityStore; + + verityMatchKey = "store"; + + # TODO: make these and other arch mappings available from systemd-lib for example + partitionTypes = { + usr = + { + "x86_64" = "usr-x86-64"; + "arm64" = "usr-arm64"; + } + ."${pkgs.stdenv.hostPlatform.linuxArch}"; + + usr-verity = + { + "x86_64" = "usr-x86-64-verity"; + "arm64" = "usr-arm64-verity"; + } + ."${pkgs.stdenv.hostPlatform.linuxArch}"; + }; + + verityHashCheck = + pkgs.buildPackages.writers.writePython3Bin "assert_uki_repart_match.py" + { + flakeIgnore = [ "E501" ]; # ignores PEP8's line length limit of 79 (black defaults to 88 characters) + } + ( + builtins.replaceStrings [ "@NIX_STORE_VERITY@" ] [ + partitionTypes.usr-verity + ] (builtins.readFile ./assert_uki_repart_match.py) + ); +in +{ + options.image.repart.verityStore = { + enable = lib.mkEnableOption "building images with a dm-verity protected nix store"; + + ukiPath = lib.mkOption { + type = lib.types.str; + default = "/EFI/Linux/${config.system.boot.loader.ukiFile}"; + defaultText = "/EFI/Linux/\${config.system.boot.loader.ukiFile}"; + description = '' + Specify the location on the ESP where the UKI is placed. + ''; + }; + + partitionIds = { + esp = lib.mkOption { + type = lib.types.str; + default = "00-esp"; + description = '' + Specify the attribute name of the ESP. + ''; + }; + store-verity = lib.mkOption { + type = lib.types.str; + default = "10-store-verity"; + description = '' + Specify the attribute name of the store's dm-verity hash partition. + ''; + }; + store = lib.mkOption { + type = lib.types.str; + default = "20-store"; + description = '' + Specify the attribute name of the store partition. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + boot.initrd.systemd.dmVerity.enable = true; + + image.repart.partitions = { + # dm-verity hash partition + ${cfg.partitionIds.store-verity}.repartConfig = { + Type = partitionTypes.usr-verity; + Verity = "hash"; + VerityMatchKey = lib.mkDefault verityMatchKey; + Label = lib.mkDefault "store-verity"; + }; + # dm-verity data partition that contains the nix store + ${cfg.partitionIds.store} = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = partitionTypes.usr; + Verity = "data"; + Format = lib.mkDefault "erofs"; + VerityMatchKey = lib.mkDefault verityMatchKey; + Label = lib.mkDefault "store"; + }; + }; + + }; + + system.build = { + + # intermediate system image without ESP + intermediateImage = + (config.system.build.image.override { + # always disable compression for the intermediate image + compression.enable = false; + }).overrideAttrs + ( + _: previousAttrs: { + # make it easier to identify the intermediate image in build logs + pname = "${previousAttrs.pname}-intermediate"; + + # do not prepare the ESP, this is done in the final image + systemdRepartFlags = previousAttrs.systemdRepartFlags ++ [ "--defer-partitions=esp" ]; + + # the image will be self-contained so we can drop references + # to the closure that was used to build it + unsafeDiscardReferences.out = true; + } + ); + + # UKI with embedded usrhash from intermediateImage + uki = + let + inherit (config.system.boot.loader) ukiFile; + cmdline = "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}"; + in + # override the default UKI + lib.mkOverride 99 ( + pkgs.runCommand ukiFile + { + nativeBuildInputs = [ + pkgs.jq + pkgs.systemdUkify + ]; + } + '' + mkdir -p $out + + # Extract the usrhash from the output of the systemd-repart invocation for the intermediate image. + usrhash=$(jq -r \ + '.[] | select(.type=="${partitionTypes.usr-verity}") | .roothash' \ + ${config.system.build.intermediateImage}/repart-output.json + ) + + # Build UKI with the embedded usrhash. + ukify build \ + --config=${config.boot.uki.configFile} \ + --cmdline="${cmdline} usrhash=$usrhash" \ + --output="$out/${ukiFile}" + '' + ); + + # final system image that is created from the intermediate image by injecting the UKI from above + finalImage = + (config.system.build.image.override { + # continue building with existing intermediate image + createEmpty = false; + }).overrideAttrs + ( + finalAttrs: previousAttrs: + let + copyUki = "CopyFiles=${config.system.build.uki}/${config.system.boot.loader.ukiFile}:${cfg.ukiPath}"; + in + { + nativeBuildInputs = previousAttrs.nativeBuildInputs ++ [ + pkgs.systemdUkify + verityHashCheck + ]; + + postPatch = '' + # add entry to inject UKI into ESP + echo '${copyUki}' >> $finalRepartDefinitions/${cfg.partitionIds.esp}.conf + ''; + + preBuild = '' + # check that we build the final image with the same intermediate image for + # which the injected UKI was built by comparing the UKI cmdline with the repart output + # of the intermediate image + # + # This is necessary to notice incompatible substitutions of + # non-reproducible store paths, for example when working with distributed + # builds, or when offline-signing the UKI. + ukify --json=short inspect ${config.system.build.uki}/${config.system.boot.loader.ukiFile} \ + | assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json" + + # copy the uncompressed intermediate image, so that systemd-repart picks it up + cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw . + chmod +w ${config.image.repart.imageFileBasename}.raw + ''; + + # the image will be self-contained so we can drop references + # to the closure that was used to build it + unsafeDiscardReferences.out = true; + } + ); + }; + }; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/image/repart.nix b/third_party/nixpkgs/nixos/modules/image/repart.nix index e471f9485c..b2f03d96ad 100644 --- a/third_party/nixpkgs/nixos/modules/image/repart.nix +++ b/third_party/nixpkgs/nixos/modules/image/repart.nix @@ -69,6 +69,10 @@ let }) opts; in { + imports = [ + ./repart-verity-store.nix + ]; + options.image.repart = { name = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix index 42584d8816..0e717a2b6a 100644 --- a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix @@ -150,6 +150,15 @@ in Whether to configure the sd image to expand it's partition on boot. ''; }; + + nixPathRegistrationFile = mkOption { + type = types.str; + default = "/nix-path-registration"; + description = '' + Location of the file containing the input for nix-store --load-db once the machine has booted. + If overriding fileSystems."/" then you should to set this to the root mount + /nix-path-registration + ''; + }; }; config = { @@ -255,11 +264,8 @@ in ''; }) {}; - boot.postBootCommands = lib.mkIf config.sdImage.expandOnBoot '' - # On the first boot do some maintenance tasks - if [ -f /nix-path-registration ]; then - set -euo pipefail - set -x + boot.postBootCommands = let + expandOnBoot = lib.optionalString config.sdImage.expandOnBoot '' # Figure out device names for the boot device and root filesystem. rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /) bootDevice=$(lsblk -npo PKNAME $rootPart) @@ -269,16 +275,25 @@ in echo ",+," | sfdisk -N$partNum --no-reread $bootDevice ${pkgs.parted}/bin/partprobe ${pkgs.e2fsprogs}/bin/resize2fs $rootPart + ''; + nixPathRegistrationFile = config.sdImage.nixPathRegistrationFile; + in '' + # On the first boot do some maintenance tasks + if [ -f ${nixPathRegistrationFile} ]; then + set -euo pipefail + set -x + + ${expandOnBoot} # Register the contents of the initial Nix store - ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration + ${config.nix.package.out}/bin/nix-store --load-db < ${nixPathRegistrationFile} # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag. touch /etc/NIXOS ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system # Prevents this from running on later boots. - rm -f /nix-path-registration + rm -f ${nixPathRegistrationFile} fi ''; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/get-version-suffix b/third_party/nixpkgs/nixos/modules/installer/tools/get-version-suffix deleted file mode 100644 index 8d72905cdc..0000000000 --- a/third_party/nixpkgs/nixos/modules/installer/tools/get-version-suffix +++ /dev/null @@ -1,23 +0,0 @@ -getVersion() { - local dir="$1" - rev= - gitDir="$dir/.git" - if [ -e "$gitDir" ]; then - if [ -z "$(type -P git)" ]; then - echo "warning: Git not found; cannot figure out revision of $dir" >&2 - return - fi - cd "$dir" - rev=$(git --git-dir="$gitDir" rev-parse --short HEAD) - if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then - rev+=M - fi - fi -} - -if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then - getVersion $nixpkgs - if [ -n "$rev" ]; then - echo ".git.$rev" - fi -fi diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index f9ea7eb395..5e23e8dda4 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/f409bhlpp0xkzvdz95qr2yvfjfi8r9jc-nix-2.18.5"; - i686-linux = "/nix/store/ra39jzrxq3bcpf55aahwv5037akvylf5-nix-2.18.5"; - aarch64-linux = "/nix/store/xiw8a4jbnw18svgdb04hyqzg5bsjspqf-nix-2.18.5"; - x86_64-darwin = "/nix/store/k2gzx7i90x3h2c8g6xdi1jkwbl6ic895-nix-2.18.5"; - aarch64-darwin = "/nix/store/rqwymbndaqxma6p8s5brcl9k32n5xx54-nix-2.18.5"; + x86_64-linux = "/nix/store/mczjdfprd67mdn90488854bf6b3nkp8j-nix-2.18.7"; + i686-linux = "/nix/store/qqll8zrx7ibdx34ry1ijanqdpdpnibbc-nix-2.18.7"; + aarch64-linux = "/nix/store/lwysvjn745fwsz8nv13zzsfq0dhiyxlp-nix-2.18.7"; + x86_64-darwin = "/nix/store/frzvlvzzj7hwvg8p0y0ivl27430nxhfy-nix-2.18.7"; + aarch64-darwin = "/nix/store/43dp3pl3k95gszp1hl9sjm22gly65sxi-nix-2.18.7"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index 7f16b97440..ee7c3e8c88 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -3,8 +3,6 @@ { config, lib, pkgs, ... }: -with lib; - let makeProg = args: pkgs.substituteAll (args // { dir = "bin"; @@ -17,28 +15,6 @@ let ''; }); - nixos-build-vms = makeProg { - name = "nixos-build-vms"; - src = ./nixos-build-vms/nixos-build-vms.sh; - inherit (pkgs) runtimeShell; - manPage = ./manpages/nixos-build-vms.8; - }; - - nixos-install = makeProg { - name = "nixos-install"; - src = ./nixos-install.sh; - inherit (pkgs) runtimeShell; - nix = config.nix.package.out; - path = makeBinPath [ - pkgs.jq - nixos-enter - pkgs.util-linuxMinimal - ]; - manPage = ./manpages/nixos-install.8; - }; - - nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; }; - nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; @@ -51,8 +27,6 @@ let manPage = ./manpages/nixos-generate-config.8; }; - inherit (pkgs) nixos-option; - nixos-version = makeProg { name = "nixos-version"; src = ./nixos-version.sh; @@ -61,32 +35,141 @@ let inherit (config.system) configurationRevision; json = builtins.toJSON ({ nixosVersion = config.system.nixos.version; - } // optionalAttrs (config.system.nixos.revision != null) { + } // lib.optionalAttrs (config.system.nixos.revision != null) { nixpkgsRevision = config.system.nixos.revision; - } // optionalAttrs (config.system.configurationRevision != null) { + } // lib.optionalAttrs (config.system.configurationRevision != null) { configurationRevision = config.system.configurationRevision; }); manPage = ./manpages/nixos-version.8; }; - nixos-enter = makeProg { - name = "nixos-enter"; - src = ./nixos-enter.sh; - inherit (pkgs) runtimeShell; - path = makeBinPath [ - pkgs.util-linuxMinimal - ]; - manPage = ./manpages/nixos-enter.8; - }; + nixos-install = pkgs.nixos-install.override { nix = config.nix.package; }; + nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; }; + defaultConfigTemplate = '' + # Edit this configuration file to define what should be installed on + # your system. Help is available in the configuration.nix(5) man page, on + # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + + { config, lib, pkgs, ... }: + + { + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + $bootLoaderConfig + # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password\@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + $xserverConfig + + $desktopConfiguration + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # hardware.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # tree + # ]; + # }; + + # List packages installed in system profile. To search, run: + # \$ nix search wget + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment? + + } + ''; in - { - options.system.nixos-generate-config = { - configuration = mkOption { + configuration = lib.mkOption { internal = true; - type = types.str; + type = lib.types.str; + default = defaultConfigTemplate; description = '' The NixOS module that `nixos-generate-config` saves to `/etc/nixos/configuration.nix`. @@ -100,9 +183,9 @@ in ''; }; - desktopConfiguration = mkOption { + desktopConfiguration = lib.mkOption { internal = true; - type = types.listOf types.lines; + type = lib.types.listOf lib.types.lines; default = []; description = '' Text to preseed the desktop configuration that `nixos-generate-config` @@ -118,9 +201,9 @@ in }; }; - options.system.disableInstallerTools = mkOption { + options.system.disableInstallerTools = lib.mkOption { internal = true; - type = types.bool; + type = lib.types.bool; default = false; description = '' Disable nixos-rebuild, nixos-generate-config, nixos-installer @@ -130,145 +213,48 @@ in ''; }; - config = lib.mkMerge [ (lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) { + imports = let + mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: { + options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // { + default = config.nix.enable; + internal = true; + }; - system.nixos-generate-config.configuration = mkDefault '' - # Edit this configuration file to define what should be installed on - # your system. Help is available in the configuration.nix(5) man page, on - # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - - { config, lib, pkgs, ... }: - - { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - $bootLoaderConfig - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password\@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - $xserverConfig - - $desktopConfiguration - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # hardware.pulseaudio.enable = true; - # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.alice = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # packages = with pkgs; [ - # firefox - # tree - # ]; - # }; - - # List packages installed in system profile. To search, run: - # \$ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment? - - } - ''; - - environment.systemPackages = - [ nixos-build-vms - nixos-install - nixos-rebuild - nixos-generate-config - nixos-option - nixos-version - nixos-enter - ]; - - documentation.man.man-db.skipPackages = [ nixos-version ]; - - }) - - # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. - ({ - system.build = { - inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; + config = lib.mkIf config.system.tools.${name}.enable { + environment.systemPackages = [ package ]; + }; }; - })]; + in [ + (mkToolModule { name = "nixos-build-vms"; }) + (mkToolModule { name = "nixos-enter"; }) + (mkToolModule { name = "nixos-generate-config"; package = nixos-generate-config; }) + (mkToolModule { name = "nixos-install"; package = nixos-install; }) + (mkToolModule { name = "nixos-option"; }) + (mkToolModule { name = "nixos-rebuild"; package = nixos-rebuild; }) + (mkToolModule { name = "nixos-version"; package = nixos-version; }) + ]; + config = lib.mkMerge [ + (lib.mkIf config.system.disableInstallerTools { + system.tools = { + nixos-build-vms.enable = false; + nixos-enter.enable = false; + nixos-generate-config.enable = false; + nixos-install.enable = false; + nixos-option.enable = false; + nixos-rebuild.enable = false; + nixos-version.enable = false; + }; + }) + { + documentation.man.man-db.skipPackages = [ nixos-version ]; + + # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. + system.build = { + inherit nixos-generate-config nixos-install nixos-rebuild; + nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; + nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; + }; + } + ]; } diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix index 44903a15c5..4048fd6857 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -386,7 +386,10 @@ in `nixpkgs.config` options should be passed when creating the instance instead. Current value: - ${lib.generators.toPretty { multiline = true; } opt.config} + ${lib.generators.toPretty { multiline = true; } cfg.config} + + Defined in: + ${lib.concatMapStringsSep "\n" (file: " - ${file}") opt.config.files} ''; } ]; diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs/test.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs/test.nix index be9a88a077..e70b7a12e8 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs/test.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs/test.nix @@ -16,6 +16,11 @@ let nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.buildPlatform = "aarch64-linux"; }; + externalPkgsWithConfig = { + _file = "ext-pkgs-config.nix"; + nixpkgs.pkgs = pkgs; + nixpkgs.config.allowUnfree = true; + }; ambiguous = { _file = "ambiguous.nix"; nixpkgs.hostPlatform = "aarch64-linux"; @@ -108,6 +113,20 @@ lib.recurseIntoAttrs { For a future proof system configuration, we recommend to remove the legacy definitions. '']; + assert builtins.trace (lib.head (getErrors externalPkgsWithConfig)) + getErrors externalPkgsWithConfig == + ['' + Your system configures nixpkgs with an externally created instance. + `nixpkgs.config` options should be passed when creating the instance instead. + + Current value: + { + allowUnfree = true; + } + + Defined in: + - ext-pkgs-config.nix + '']; assert getErrors { nixpkgs.localSystem = pkgs.stdenv.hostPlatform; nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 5068a04c8d..62af5974b9 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -20,7 +20,6 @@ ./config/nix-channel.nix ./config/nix-flakes.nix ./config/nix-remote-build.nix - ./config/no-x-libs.nix ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix @@ -858,6 +857,7 @@ ./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix + ./services/misc/turn-rs.nix ./services/misc/tuxclocker.nix ./services/misc/transfer-sh.nix ./services/misc/tzupdate.nix @@ -1044,7 +1044,6 @@ ./services/networking/gdomap.nix ./services/networking/ghostunnel.nix ./services/networking/git-daemon.nix - ./services/networking/globalprotect-vpn.nix ./services/networking/gns3-server.nix ./services/networking/gnunet.nix ./services/networking/go-autoconfig.nix @@ -1193,6 +1192,7 @@ ./services/networking/scion/scion-daemon.nix ./services/networking/scion/scion-dispatcher.nix ./services/networking/scion/scion-router.nix + ./services/networking/scion/scion-ip-gateway.nix ./services/networking/seafile.nix ./services/networking/searx.nix ./services/networking/shadowsocks.nix @@ -1397,6 +1397,7 @@ ./services/web-apps/crabfit.nix ./services/web-apps/davis.nix ./services/web-apps/cryptpad.nix + ./services/web-apps/dependency-track.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix ./services/web-apps/documize.nix @@ -1430,6 +1431,7 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ifm.nix + ./services/web-apps/immich.nix ./services/web-apps/invidious.nix ./services/web-apps/invoiceplane.nix ./services/web-apps/isso.nix @@ -1624,6 +1626,7 @@ ./system/boot/stage-2.nix ./system/boot/systemd.nix ./system/boot/systemd/coredump.nix + ./system/boot/systemd/dm-verity.nix ./system/boot/systemd/initrd-secrets.nix ./system/boot/systemd/initrd.nix ./system/boot/systemd/journald.nix @@ -1638,6 +1641,7 @@ ./system/boot/systemd/sysupdate.nix ./system/boot/systemd/sysusers.nix ./system/boot/systemd/tmpfiles.nix + ./system/boot/systemd/tpm2.nix ./system/boot/systemd/user.nix ./system/boot/systemd/userdbd.nix ./system/boot/systemd/homed.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix b/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix index 249b767593..970b76cfbf 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix @@ -52,7 +52,7 @@ in # VMware support. "mptspi" "vmxnet3" "vsock" ] ++ lib.optional platform.isx86 "vmw_balloon" - ++ lib.optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ + ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [ "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport" # Hyper-V support. @@ -68,7 +68,7 @@ in # Broadcom "vc4" - ] ++ lib.optionals pkgs.stdenv.isAarch64 [ + ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ # Most of the following falls into two categories: # - early KMS / early display # - early storage (e.g. USB) support diff --git a/third_party/nixpkgs/nixos/modules/profiles/base.nix b/third_party/nixpkgs/nixos/modules/profiles/base.nix index be79bd205c..943f9d8e31 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/base.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/base.nix @@ -19,13 +19,7 @@ pkgs.cryptsetup # needed for dm-crypt volumes # Some text editors. - (pkgs.vim.customize { - name = "vim"; - vimrcConfig.packages.default = { - start = [ pkgs.vimPlugins.vim-nix ]; - }; - vimrcConfig.customRC = "syntax on"; - }) + pkgs.vim # Some networking tools. pkgs.fuse diff --git a/third_party/nixpkgs/nixos/modules/profiles/minimal.nix b/third_party/nixpkgs/nixos/modules/profiles/minimal.nix index e6aafccb89..df21b75c82 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/minimal.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/minimal.nix @@ -19,7 +19,7 @@ with lib; # Perl is a default package. environment.defaultPackages = mkDefault [ ]; - environment.stub-ld.enable = false; + environment.stub-ld.enable = mkDefault false; # The lessopen package pulls in Perl. programs.less.lessopen = mkDefault null; @@ -29,6 +29,8 @@ with lib; programs.command-not-found.enable = mkDefault false; + programs.ssh.setXAuthLocation = mkDefault false; + services.logrotate.enable = mkDefault false; services.udisks2.enable = mkDefault false; diff --git a/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix b/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix index 4425fe1a9f..a2912cb1d8 100644 --- a/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix +++ b/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix @@ -1,9 +1,22 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { options.programs.clash-verge = { enable = lib.mkEnableOption "Clash Verge"; - package = lib.mkPackageOption pkgs "clash-verge" {}; + package = lib.mkOption { + type = lib.types.package; + description = '' + The clash-verge package to use. Available options are + clash-verge-rev and clash-nyanpasu, both are forks of + the original clash-verge project. + ''; + example = "pkgs.clash-verge-rev"; + }; autoStart = lib.mkEnableOption "Clash Verge auto launch"; tunMode = lib.mkEnableOption "Clash Verge TUN mode"; }; @@ -16,10 +29,12 @@ environment.systemPackages = [ cfg.package - (lib.mkIf cfg.autoStart (pkgs.makeAutostartItem { - name = "clash-verge"; - package = cfg.package; - })) + (lib.mkIf cfg.autoStart ( + pkgs.makeAutostartItem { + name = "clash-verge"; + package = cfg.package; + } + )) ]; security.wrappers.clash-verge = lib.mkIf cfg.tunMode { diff --git a/third_party/nixpkgs/nixos/modules/programs/nautilus-open-any-terminal.nix b/third_party/nixpkgs/nixos/modules/programs/nautilus-open-any-terminal.nix index f878a9f261..41f26e03d3 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nautilus-open-any-terminal.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nautilus-open-any-terminal.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.nautilus-open-any-terminal; @@ -23,20 +28,28 @@ in nautilus-open-any-terminal ]; - environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4"; + environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) { + NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4"; + }; + environment.pathsToLink = [ "/share/nautilus-python/extensions" ]; programs.dconf = lib.optionalAttrs (cfg.terminal != null) { enable = true; - profiles.user.databases = [{ - settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal; - lockAll = true; - }]; + profiles.user.databases = [ + { + settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal; + lockAll = true; + } + ]; }; }; meta = { - maintainers = with lib.maintainers; [ stunkymonkey linsui ]; + maintainers = with lib.maintainers; [ + stunkymonkey + linsui + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix index ab811994be..35c5cc86f3 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix @@ -1,4 +1,9 @@ -{ lib, pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: let cfg = config.programs.waybar; @@ -11,11 +16,9 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - systemd.user.services.waybar = { - description = "Waybar as systemd service"; - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; - script = "${cfg.package}/bin/waybar"; + systemd = { + packages = [ cfg.package ]; + user.services.waybar.wantedBy = [ "graphical-session.target" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 7e37114983..63f612eec9 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -21,6 +21,10 @@ in # Completely removed modules (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") + (mkRemovedOptionModule [ "environment" "noXlibs" ] '' + The environment.noXlibs option was removed, as it often caused surprising breakages for new users. + If you need its functionality, you can apply similar overlays in your own config. + '') (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "hardware" "brightnessctl" ] '' The brightnessctl module was removed because newer versions of @@ -74,6 +78,7 @@ in (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") + (mkRemovedOptionModule [ "services" "globalprotect"] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "homeassistant-satellite"] "The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`.") (mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix index a5cb0da295..7344fdf4a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix @@ -8,7 +8,7 @@ let pcmPlugin = cfg.jackd.enable && cfg.alsa.enable; loopback = cfg.jackd.enable && cfg.loopback.enable; - enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; + enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12"; bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12"; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix index 6c60fc2d48..20186016af 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix @@ -30,12 +30,12 @@ let lib.optionalString (val != null) "${val}"; os' = prefix: val: lib.optionalString (val != null) (prefix + "${val}"); - flatten = key: value: + toQueryString = key: value: "&${key}=${value}"; in "--stream.stream=\"${opt.type}://" + os opt.location + "?" + os' "name=" name + os' "&sampleformat=" opt.sampleFormat + os' "&codec=" opt.codec - + lib.concatStrings (lib.mapAttrsToList lib.flatten opt.query) + "\""; + + lib.concatStrings (lib.mapAttrsToList toQueryString opt.query) + "\""; optionalNull = val: ret: lib.optional (val != null) ret; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix index cf3b6b8d13..d5efda74f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix @@ -118,15 +118,6 @@ in name = user; ensurePermissions = { "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT"; - - # https://forums.mysql.com/read.php?10,668311,668315#msg-668315 - "function sys.extract_table_from_file_name" = "execute"; - "function sys.format_path" = "execute"; - "function sys.format_statement" = "execute"; - "function sys.extract_schema_from_file_name" = "execute"; - "function sys.ps_thread_account" = "execute"; - "function sys.format_time" = "execute"; - "function sys.format_bytes" = "execute"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix b/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix index 94f6e6ba4f..f7a86915d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix @@ -656,6 +656,11 @@ in { }; config = mkIf (fd_cfg.enable || sd_cfg.enable || dir_cfg.enable) { + systemd.slices.system-bacula = { + description = "Bacula Slice"; + documentation = [ "man:bacula(8)" "https://www.bacula.org/" ]; + }; + systemd.services.bacula-fd = mkIf fd_cfg.enable { after = [ "network.target" ]; description = "Bacula File Daemon"; @@ -666,6 +671,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LogsDirectory = "bacula"; StateDirectory = "bacula"; + Slice = "system-bacula.slice"; }; }; @@ -679,6 +685,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LogsDirectory = "bacula"; StateDirectory = "bacula"; + Slice = "system-bacula.slice"; }; }; @@ -694,6 +701,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LogsDirectory = "bacula"; StateDirectory = "bacula"; + Slice = "system-bacula.slice"; }; preStart = '' if ! test -e "${libDir}/db-created"; then diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index c4bad59a6f..a8a8973f25 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix @@ -515,10 +515,12 @@ in '' set -eou pipefail compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf) - if [[ $compression == zstd ]]; then + if [[ $compression == "" ]]; then + compression="bzip2" + elif [[ $compression == zstd ]]; then compression="zstd --rm" fi - find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet + find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet ''; startAt = "Sun 01:45"; serviceConfig.Slice = "system-hydra.slice"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix index a534cdfbe1..19234fd82c 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix @@ -67,16 +67,16 @@ let inherit (cfg.provision) organizations users; }); - provisioningScript = pkgs.writeShellScript "post-start-provision" '' - set -euo pipefail - export INFLUX_HOST="http://"${escapeShellArg ( + influxHost = "http://${escapeShellArg ( if ! hasAttr "http-bind-address" cfg.settings || hasInfix "0.0.0.0" cfg.settings.http-bind-address then "localhost:8086" else cfg.settings.http-bind-address - )} + )}"; - # Wait for the influxdb server to come online + waitUntilServiceIsReady = pkgs.writeShellScript "wait-until-service-is-ready" '' + set -euo pipefail + export INFLUX_HOST=${influxHost} count=0 while ! influx ping &>/dev/null; do if [ "$count" -eq 300 ]; then @@ -92,6 +92,11 @@ let sleep 0.1 count=$((count++)) done + ''; + + provisioningScript = pkgs.writeShellScript "post-start-provision" '' + set -euo pipefail + export INFLUX_HOST=${influxHost} # Do the initial database setup. Pass /dev/null as configs-path to # avoid saving the token as the active config. @@ -447,11 +452,13 @@ in "admin-token:${cfg.provision.initialSetup.tokenFile}" ]; - ExecStartPost = mkIf cfg.provision.enable ( + ExecStartPost = [ + waitUntilServiceIsReady + ] ++ (lib.optionals cfg.provision.enable ( [provisioningScript] ++ # Only the restarter runs with elevated privileges optional anyAuthDefined "+${restarterScript}" - ); + )); }; path = [ diff --git a/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.md b/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.md index 12d920e7bc..7cf3bedda5 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.md +++ b/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.md @@ -35,3 +35,10 @@ Note that the TigerBeetle module won't open any firewall ports automatically, so A complete list of options for TigerBeetle can be found [here](#opt-services.tigerbeetle.enable). +## Upgrading {#module-services-tigerbeetle-upgrading} + +Usually, TigerBeetle's [upgrade process](https://docs.tigerbeetle.com/operating/upgrading) only requires replacing the binary used for the servers. +This is not directly possible with NixOS since the new binary will be located at a different place in the Nix store. + +However, since TigerBeetle is managed through systemd on NixOS, the only action you need to take when upgrading is to make sure the version of TigerBeetle you're upgrading to supports upgrades from the version you're currently running. +This information will be on the [release notes](https://github.com/tigerbeetle/tigerbeetle/releases) for the version you're upgrading to. diff --git a/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.nix b/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.nix index a9c7a24250..7b512055e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/tigerbeetle.nix @@ -42,8 +42,8 @@ in }; cacheGridSize = mkOption { - type = types.strMatching "[0-9]+(K|M|G)B"; - default = "1GB"; + type = types.strMatching "[0-9]+(K|M|G)iB"; + default = "1GiB"; description = '' The grid cache size. The grid cache acts like a page cache for TigerBeetle. @@ -97,16 +97,26 @@ in ''; serviceConfig = { - Type = "exec"; - - DynamicUser = true; - ProtectHome = true; DevicePolicy = "closed"; - + DynamicUser = true; + ExecStart = "${lib.getExe cfg.package} start --cache-grid=${cfg.cacheGridSize} --addresses=${lib.escapeShellArg (builtins.concatStringsSep "," cfg.addresses)} ${replicaDataPath}"; + LockPersonality = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; StateDirectory = "tigerbeetle"; StateDirectoryMode = 700; - - ExecStart = "${lib.getExe cfg.package} start --cache-grid=${cfg.cacheGridSize} --addresses=${lib.escapeShellArg (builtins.concatStringsSep "," cfg.addresses)} ${replicaDataPath}"; + Type = "exec"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix index bf57d12557..532c64c0f4 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -19,7 +19,7 @@ let ''; cfg = config.services.pipewire; enable32BitAlsaPlugins = cfg.alsa.support32Bit - && pkgs.stdenv.isx86_64 + && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.pipewire != null; # The package doesn't output to $out/lib/pipewire directly so that the diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/iptsd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/iptsd.nix index 3a299c2428..bfd4b35227 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/iptsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/iptsd.nix @@ -18,15 +18,15 @@ in { type = lib.types.submodule { freeformType = format.type; options = { - Touch = { + Touchscreen = { DisableOnPalm = lib.mkOption { default = false; - description = "Ignore all touch inputs if a palm was registered on the display."; + description = "Ignore all touchscreen inputs if a palm was registered on the display."; type = lib.types.bool; }; DisableOnStylus = lib.mkOption { default = false; - description = "Ignore all touch inputs if a stylus is in proximity."; + description = "Ignore all touchscreen inputs if a stylus is in proximity."; type = lib.types.bool; }; }; @@ -43,6 +43,10 @@ in { }; config = lib.mkIf cfg.enable { + warnings = lib.optional (lib.hasAttr "Touch" cfg.config) '' + The option `services.iptsd.config.Touch` has been renamed to `services.iptsd.config.Touchscreen`. + ''; + systemd.packages = [ pkgs.iptsd ]; environment.etc."iptsd.conf".source = configFile; systemd.services."iptsd@".restartTriggers = [ configFile ]; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix index e3f356ade6..a532f629ef 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix @@ -434,7 +434,7 @@ in ''; systemd.services.systemd-udevd = - { restartTriggers = cfg.packages; + { restartTriggers = [ config.environment.etc."udev/rules.d".source ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index 6db1b108cc..6fb5f0588d 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -97,6 +97,8 @@ in defaultText = lib.literalExpression "cfg.settings != {}"; }; + allowNetworking = lib.mkEnableOption "network access for logrotate"; + settings = lib.mkOption { default = { }; description = '' @@ -240,12 +242,55 @@ in config = lib.mkIf cfg.enable { systemd.services.logrotate = { description = "Logrotate Service"; + documentation = [ + "man:logrotate(8)" + "man:logrotate(5)" + ]; startAt = "hourly"; serviceConfig = { - Restart = "no"; - User = "root"; - ExecStart = "${pkgs.logrotate}/sbin/logrotate ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}"; + Type = "oneshot"; + ExecStart = "${lib.getExe pkgs.logrotate} ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}"; + + # performance + Nice = 19; + IOSchedulingClass = "best-effort"; + IOSchedulingPriority = 7; + + # hardening + CapabilityBoundingSet = [ + "CAP_CHOWN" + "CAP_SETGID" + ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + "@chown" + ]; + UMask = "0027"; + } // lib.optionalAttrs (!cfg.allowNetworking) { + PrivateNetwork = true; + RestrictAddressFamilies = "none"; }; }; systemd.services.logrotate-checkconf = { diff --git a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix index 9eccd34cef..644a932145 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix @@ -80,7 +80,7 @@ in { PrivateUsers = true; SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal"; - } // (optionalAttrs (!pkgs.stdenv.isAarch64) { # FIXME: figure out why this breaks on aarch64 + } // (optionalAttrs (!pkgs.stdenv.hostPlatform.isAarch64) { # FIXME: figure out why this breaks on aarch64 SystemCallFilter = "@system-service"; }); }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix index 75b08bb059..95b77da250 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix @@ -30,6 +30,10 @@ let ENGINE = "haystack.backends.whoosh_backend.WhooshEngine"; PATH = "/var/lib/mailman-web/fulltext-index"; }; + } // lib.optionalAttrs cfg.enablePostfix { + EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"; + EMAIL_HOST = "127.0.0.1"; + EMAIL_PORT = 25; } // cfg.webSettings; webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings); diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix index 054a7803b9..ed98ef3ed8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.services.mame; - mame = "mame${lib.optionalString pkgs.stdenv.is64bit "64"}"; + mame = "mame${lib.optionalString pkgs.stdenv.hostPlatform.is64bit "64"}"; in { options = { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix index af1773dab2..026e4eae6d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix @@ -448,4 +448,5 @@ in }; + meta.maintainers = with lib.maintainers; [ felixsinger ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tabby.nix b/third_party/nixpkgs/nixos/modules/services/misc/tabby.nix index d63a6b24ae..8fabd10d90 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tabby.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tabby.nix @@ -71,7 +71,7 @@ in - nixpkgs.config.cudaSupport - nixpkgs.config.rocmSupport - - if stdenv.isDarwin && stdenv.isAarch64 + - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 IFF multiple acceleration methods are found to be enabled or if you haven't set either `cudaSupport or rocmSupport` you will have to diff --git a/third_party/nixpkgs/nixos/modules/services/misc/turn-rs.nix b/third_party/nixpkgs/nixos/modules/services/misc/turn-rs.nix new file mode 100644 index 0000000000..b591205417 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/turn-rs.nix @@ -0,0 +1,86 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.turn-rs; + format = pkgs.formats.toml { }; +in +{ + options.services.turn-rs = { + enable = lib.mkEnableOption "turn-rs server"; + package = lib.mkPackageOption pkgs "turn-rs" { }; + + secretFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/turn-rs.env"; + description = '' + Environment variables from this file will be interpolated into the + final config file using envsubst with this syntax: `$ENVIRONMENT` or + `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. + This is useful to avoid putting secrets into the nix store. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + }; + description = "Turn-rs server config file"; + default = { }; + example = { + turn = { + realm = "localhost"; + interfaces = [ + { + transport = "udp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + { + transport = "tcp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + ]; + }; + + auth.static_credentials = { + user1 = "test"; + user2 = "test"; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.turn-rs.settings = { + api.bind = lib.mkDefault "127.0.0.1:3000"; + log.level = lib.mkDefault "info"; + }; + + systemd.services.turn-rs = { + enable = true; + wantedBy = [ "multi-user.target" ]; + description = "Turn-rs Server Daemon"; + preStart = + let + configFile = format.generate "turn-rs-config.toml" cfg.settings; + in + '' + ${lib.getExe pkgs.envsubst} -i "${configFile}" -o /run/turn-rs/config.toml + ''; + serviceConfig = { + RuntimeDirectory = "turn-rs"; + EnvironmentFile = lib.optional (cfg.secretFile != null) cfg.secretFile; + ExecStart = "${lib.getExe cfg.package} --config=/run/turn-rs/config.toml"; + DynamicUser = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index c698c9005a..29a30e938e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -236,9 +236,17 @@ let isSystemUser = true; inherit (conf) group; }); - users.groups = (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) { - "${name}-exporter" = {}; - }); + users.groups = mkMerge [ + (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) { + "${name}-exporter" = {}; + }) + (mkIf (name == "smartctl") { + "smartctl-exporter-access" = {}; + }) + ]; + services.udev.extraRules = mkIf (name == "smartctl") '' + ACTION=="add", SUBSYSTEM=="nvme", KERNEL=="nvme[0-9]*", RUN+="${pkgs.acl}/bin/setfacl -m g:smartctl-exporter-access:rw /dev/$kernel" + ''; networking.firewall.extraCommands = mkIf (conf.openFirewall && !nftables) (concatStrings [ "ip46tables -A nixos-fw ${conf.firewallFilter} " "-m comment --comment ${name}-exporter -j nixos-fw-accept" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index e3dcc6126f..90adfe911a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -58,7 +58,7 @@ in PrivateDevices = lib.mkForce false; ProtectProc = "invisible"; ProcSubset = "pid"; - SupplementaryGroups = [ "disk" ]; + SupplementaryGroups = [ "disk" "smartctl-exporter-access" ]; SystemCallFilter = [ "@system-service" "~@privileged" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix index 6fd3b5707a..65b6259c12 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix @@ -269,7 +269,10 @@ in systemd.services.smartd = { description = "S.M.A.R.T. Daemon"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; + serviceConfig = { + Type = "notify"; + ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; + }; }; services.systembus-notify.enable = mkDefault ns.enable; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix index 67b15b520f..9361393d91 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix @@ -509,6 +509,11 @@ in else lib.unique (lib.forEach cfg.upsd.listen (listen: listen.port)); }; + systemd.slices.system-ups = { + description = "Network UPS Tools (NUT) Slice"; + documentation = [ "https://networkupstools.org/" ]; + }; + systemd.services.upsmon = let secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor; createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets; @@ -523,6 +528,7 @@ in ExecStart = "${pkgs.nut}/sbin/upsmon"; ExecReload = "${pkgs.nut}/sbin/upsmon -c reload"; LoadCredential = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor; + Slice = "system-ups.slice"; }; environment = envVars; }; @@ -542,6 +548,7 @@ in ExecStart = "${pkgs.nut}/sbin/upsd -u root"; ExecReload = "${pkgs.nut}/sbin/upsd -c reload"; LoadCredential = lib.mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users; + Slice = "system-ups.slice"; }; environment = envVars; restartTriggers = [ @@ -559,6 +566,7 @@ in RemainAfterExit = true; # TODO: replace 'root' by another username. ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start"; + Slice = "system-ups.slice"; }; environment = envVars; restartTriggers = [ diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix index a7f39b3791..6aaaf62950 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix @@ -274,7 +274,7 @@ in CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID"; ProtectSystem = true; # Doesn't work on i686, causing service to fail - MemoryDenyWriteExecute = !pkgs.stdenv.isi686; + MemoryDenyWriteExecute = !pkgs.stdenv.hostPlatform.isi686; ProtectHome = true; PrivateTmp = true; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix index 20986f8d93..633e37ad25 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix @@ -20,13 +20,7 @@ let listsAsDuplicateKeys = true; }; - # Because formats.generate is outputting a file, we use of conf-file. Once - # `extraConfig` is deprecated we can just use - # `dnsmasqConf = format.generate "dnsmasq.conf" cfg.settings` - dnsmasqConf = pkgs.writeText "dnsmasq.conf" '' - conf-file=${settingsFormat.generate "dnsmasq.conf" cfg.settings} - ${cfg.extraConfig} - ''; + dnsmasqConf = settingsFormat.generate "dnsmasq.conf" cfg.settings; in @@ -34,6 +28,7 @@ in imports = [ (lib.mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ]) + (lib.mkRemovedOptionModule [ "services" "dnsmasq" "extraConfig" ] "This option has been replaced by `services.dnsmasq.settings`") ]; ###### interface @@ -104,17 +99,6 @@ in ''; }; - extraConfig = lib.mkOption { - type = lib.types.lines; - default = ""; - description = '' - Extra configuration directives that should be added to - `dnsmasq.conf`. - - This option is deprecated, please use {option}`settings` instead. - ''; - }; - }; }; @@ -124,8 +108,6 @@ in config = lib.mkIf cfg.enable { - warnings = lib.optional (cfg.extraConfig != "") "Text based config is deprecated, dnsmasq now supports `services.dnsmasq.settings` for an attribute-set based config"; - services.dnsmasq.settings = { dhcp-leasefile = lib.mkDefault "${stateDir}/dnsmasq.leases"; conf-file = lib.mkDefault (lib.optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix deleted file mode 100644 index 87ce8a5e14..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.globalprotect; - - execStart = - if cfg.csdWrapper == null then - "${pkgs.globalprotect-openconnect}/bin/gpservice" - else - "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}"; -in - -{ - options.services.globalprotect = { - enable = lib.mkEnableOption "globalprotect"; - - settings = lib.mkOption { - description = '' - GlobalProtect-openconnect configuration. For more information, visit - . - ''; - default = { }; - example = { - "vpn1.company.com" = { - openconnect-args = "--script=/path/to/vpnc-script"; - }; - }; - type = lib.types.attrs; - }; - - csdWrapper = lib.mkOption { - description = '' - A script that will produce a Host Integrity Protection (HIP) report, - as described at - ''; - default = null; - example = lib.literalExpression ''"''${pkgs.openconnect}/libexec/openconnect/hipreport.sh"''; - type = lib.types.nullOr lib.types.path; - }; - }; - - config = lib.mkIf cfg.enable { - services.dbus.packages = [ pkgs.globalprotect-openconnect ]; - - environment.etc."gpservice/gp.conf".text = lib.generators.toINI { } cfg.settings; - - systemd.services.gpservice = { - description = "GlobalProtect openconnect DBus service"; - serviceConfig = { - Type = "dbus"; - BusName = "com.yuezk.qt.GPService"; - ExecStart = execStart; - }; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix index 41d8ab4058..85676d29f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -406,4 +406,6 @@ in } ''; }; + + meta.maintainers = with lib.maintainers; [ felixsinger ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix index 5a5cefe86d..ea5be25a4d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix @@ -1,18 +1,18 @@ { config, pkgs, lib, ... }: -with lib; let + inherit (lib) mkOption types; cfg = config.services.nar-serve; in { meta = { - maintainers = [ maintainers.rizary maintainers.zimbatm ]; + maintainers = with lib.maintainers; [ rizary zimbatm ]; }; options = { services.nar-serve = { - enable = mkEnableOption "serving NAR file contents via HTTP"; + enable = lib.mkEnableOption "serving NAR file contents via HTTP"; - package = mkPackageOption pkgs "nar-serve" { }; + package = lib.mkPackageOption pkgs "nar-serve" { }; port = mkOption { type = types.port; @@ -48,7 +48,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.nar-serve = { description = "NAR server"; after = [ "network.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix b/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix index 5e33d872ea..5d009d6d30 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix @@ -68,10 +68,10 @@ in servers = [ "/${cfg.domain}/127.0.0.1#5300" ]; - extraConfig = '' - bind-interfaces - listen-address=127.0.0.1 - ''; + settings = { + bind-interfaces = true; + listen-address = "127.0.0.1"; + }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix index b17416c1e3..fe878ddbe0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -603,8 +603,8 @@ in reuseport = mkOption { type = types.bool; - default = pkgs.stdenv.isLinux; - defaultText = literalExpression "pkgs.stdenv.isLinux"; + default = pkgs.stdenv.hostPlatform.isLinux; + defaultText = literalExpression "pkgs.stdenv.hostPlatform.isLinux"; description = '' Whether to enable SO_REUSEPORT on all used sockets. This lets multiple processes bind to the same port. This speeds up operation especially diff --git a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-ip-gateway.nix b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-ip-gateway.nix new file mode 100644 index 0000000000..1801828c8a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-ip-gateway.nix @@ -0,0 +1,92 @@ +{ + config, + lib, + pkgs, + ... +}: + +with lib; + +let + globalCfg = config.services.scion; + cfg = config.services.scion.scion-ip-gateway; + toml = pkgs.formats.toml { }; + json = pkgs.formats.json { }; + connectionDir = if globalCfg.stateless then "/run" else "/var/lib"; + defaultConfig = { + tunnel = { }; + gateway = { + traffic_policy_file = "${trafficConfigFile}"; + }; + }; + defaultTrafficConfig = { + ASes = { }; + ConfigVersion = 9001; + }; + configFile = toml.generate "scion-ip-gateway.toml" (recursiveUpdate defaultConfig cfg.config); + trafficConfigFile = json.generate "scion-ip-gateway-traffic.json" ( + recursiveUpdate defaultTrafficConfig cfg.trafficConfig + ); +in +{ + options.services.scion.scion-ip-gateway = { + enable = mkEnableOption "the scion-ip-gateway service"; + config = mkOption { + default = { }; + type = toml.type; + example = literalExpression '' + { + tunnel = { + src_ipv4 = "172.16.100.1"; + }; + } + ''; + description = '' + scion-ip-gateway daemon configuration + ''; + }; + trafficConfig = mkOption { + default = { }; + type = json.type; + example = literalExpression '' + { + ASes = { + "2-ffaa:0:b" = { + Nets = [ + "172.16.1.0/24" + ]; + }; + }; + ConfigVersion = 9001; + } + ''; + description = '' + scion-ip-gateway traffic configuration + ''; + }; + }; + config = mkIf cfg.enable { + systemd.services.scion-ip-gateway = { + description = "SCION IP Gateway Service"; + after = [ + "network-online.target" + "scion-dispatcher.service" + ]; + wants = [ + "network-online.target" + "scion-dispatcher.service" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + Group = if (config.services.scion.scion-dispatcher.enable == true) then "scion" else null; + ExecStart = "${globalCfg.package}/bin/scion-ip-gateway --config ${configFile}"; + DynamicUser = true; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + Restart = "on-failure"; + KillMode = "control-group"; + RemainAfterExit = false; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix index efab97f7cd..0b26f24e7e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix @@ -42,6 +42,7 @@ in scion-daemon.enable = true; scion-router.enable = true; scion-control.enable = true; + scion-ip-gateway.enable = true; }; assertions = [ { assertion = cfg.bypassBootstrapWarning == true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index a690dc610e..2acae67739 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -121,10 +121,16 @@ in { serviceConfig = { Type = "oneshot"; }; - script = '' - status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service) - if [[ $status != Connected* ]]; then - ${cfg.package}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags} + # https://github.com/tailscale/tailscale/blob/v1.72.1/ipn/backend.go#L24-L32 + script = let + statusCommand = "${lib.getExe cfg.package} status --json --peers=false | ${lib.getExe pkgs.jq} -r '.BackendState'"; + in '' + while [[ "$(${statusCommand})" == "NoState" ]]; do + sleep 0.5 + done + status=$(${statusCommand}) + if [[ "$status" == "NeedsLogin" || "$status" == "NeedsMachineAuth" ]]; then + ${lib.getExe cfg.package} up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags} fi ''; }; @@ -137,7 +143,7 @@ in { Type = "oneshot"; }; script = '' - ${cfg.package}/bin/tailscale set ${escapeShellArgs cfg.extraSetFlags} + ${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index e13d574c0d..4fec023a23 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -50,6 +50,15 @@ let ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); + configIsGenerated = with cfg; + networks != {} || extraConfig != "" || userControlled.enable; + + # the original configuration file + configFile = + if configIsGenerated + then pkgs.writeText "wpa_supplicant.conf" generatedConfig + else "/etc/wpa_supplicant.conf"; + # Creates a network block for wpa_supplicant.conf mkNetwork = opts: let @@ -81,8 +90,8 @@ let let deviceUnit = optional (iface != null) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device"; configStr = if cfg.allowAuxiliaryImperativeNetworks - then "-c /etc/wpa_supplicant.conf -I ${pkgs.writeText "wpa_supplicant.conf" generatedConfig}" - else "-c /etc/wpa_supplicant.conf"; + then "-c /etc/wpa_supplicant.conf -I ${configFile}" + else "-c ${configFile}"; in { description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}"; @@ -103,6 +112,12 @@ let script = '' + ${optionalString (configIsGenerated && !cfg.allowAuxiliaryImperativeNetworks) '' + if [ -f /etc/wpa_supplicant.conf ]; then + echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." + fi + ''} + # ensure wpa_supplicant.conf exists, or the daemon will fail to start ${optionalString cfg.allowAuxiliaryImperativeNetworks '' touch /etc/wpa_supplicant.conf @@ -516,9 +531,6 @@ in { hardware.wirelessRegulatoryDatabase = true; - environment.etc."wpa_supplicant.conf" = - lib.mkIf (!cfg.allowAuxiliaryImperativeNetworks) { text = generatedConfig; }; - environment.systemPackages = [ pkgs.wpa_supplicant ]; services.dbus.packages = optional cfg.dbusControlled pkgs.wpa_supplicant; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index c1c952adac..0fb51400d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, ... }: -with lib; + let + inherit (lib) mkIf mkOption; + inherit (lib.types) nullOr path bool listOf str; keysPath = "/var/lib/yggdrasil/keys.json"; cfg = config.services.yggdrasil; @@ -11,14 +13,14 @@ let in { imports = [ - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "yggdrasil" "config" ] [ "services" "yggdrasil" "settings" ]) ]; - options = with types; { + options = { services.yggdrasil = { - enable = mkEnableOption "the yggdrasil system service"; + enable = lib.mkEnableOption "the yggdrasil system service"; settings = mkOption { type = format.type; @@ -73,7 +75,7 @@ in }; group = mkOption { - type = types.nullOr types.str; + type = nullOr str; default = null; example = "wheel"; description = "Group to grant access to the Yggdrasil control socket. If `null`, only root can access the socket."; @@ -108,9 +110,9 @@ in ''; }; - package = mkPackageOption pkgs "yggdrasil" { }; + package = lib.mkPackageOption pkgs "yggdrasil" { }; - persistentKeys = mkEnableOption '' + persistentKeys = lib.mkEnableOption '' persistent keys. If enabled then keys will be generated once and Yggdrasil will retain the same IPv6 address when the service is restarted. Keys are stored at ${keysPath} @@ -232,6 +234,6 @@ in ); meta = { doc = ./yggdrasil.md; - maintainers = with lib.maintainers; [ gazally ehmry ]; + maintainers = with lib.maintainers; [ gazally ehmry nagy ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix index 668bccab2e..d439e0c2a5 100644 --- a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -339,7 +339,7 @@ in services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper; services.udev.packages = cfg.drivers; - # Allow asswordless printer admin for members of wheel group + # Allow passwordless printer admin for members of wheel group security.polkit.extraConfig = mkIf polkitEnabled '' polkit.addRule(function(action, subject) { if (action.id == "org.opensuse.cupspkhelper.mechanism.all-edit" && diff --git a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix index 5c259b7fa1..b3f38eba66 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix @@ -518,7 +518,7 @@ in libva-utils procps radeontop - ] ++ lib.optionals (!stdenv.isAarch64) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ # not available on aarch64-linux intel-gpu-tools ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/davis.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/davis.nix index d9b28020dc..621f2ff20e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/davis.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/davis.nix @@ -493,7 +493,7 @@ in }; "~* ^/.well-known/(caldav|carddav)$" = { extraConfig = '' - return 302 $http_x_forwarded_proto://$host/dav/; + return 302 https://$host/dav/; ''; }; "~ ^(.+\.php)(.*)$" = { @@ -505,7 +505,7 @@ in fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_param X-Forwarded-Proto $http_x_forwarded_proto; + fastcgi_param X-Forwarded-Proto https; fastcgi_param X-Forwarded-Port $http_x_forwarded_port; ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dependency-track.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dependency-track.nix new file mode 100644 index 0000000000..ba3dbee972 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dependency-track.nix @@ -0,0 +1,608 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.dependency-track; + + settingsFormat = pkgs.formats.javaProperties { }; + + frontendConfigFormat = pkgs.formats.json { }; + frontendConfigFile = frontendConfigFormat.generate "config.json" { + API_BASE_URL = cfg.frontend.baseUrl; + OIDC_ISSUER = cfg.oidc.issuer; + OIDC_CLIENT_ID = cfg.oidc.clientId; + OIDC_SCOPE = cfg.oidc.scope; + OIDC_FLOW = cfg.oidc.flow; + OIDC_LOGIN_BUTTON_TEXT = cfg.oidc.loginButtonText; + }; + + sslEnabled = + config.services.nginx.virtualHosts.${cfg.nginx.domain}.addSSL + || config.services.nginx.virtualHosts.${cfg.nginx.domain}.forceSSL + || config.services.nginx.virtualHosts.${cfg.nginx.domain}.onlySSL + || config.services.nginx.virtualHosts.${cfg.nginx.domain}.enableACME; + + assertStringPath = + optionName: value: + if lib.isPath value then + throw '' + services.dependency-track.${optionName}: + ${toString value} + is a Nix path, but should be a string, since Nix + paths are copied into the world-readable Nix store. + '' + else + value; + + filterNull = lib.filterAttrs (_: v: v != null); + + renderSettings = + settings: + lib.mapAttrs' ( + n: v: + lib.nameValuePair (lib.toUpper (lib.replaceStrings [ "." ] [ "_" ] n)) ( + if lib.isBool v then lib.boolToString v else v + ) + ) (filterNull settings); +in +{ + options.services.dependency-track = { + enable = lib.mkEnableOption "dependency-track"; + + package = lib.mkPackageOption pkgs "dependency-track" { }; + + logLevel = lib.mkOption { + type = lib.types.enum [ + "INFO" + "WARN" + "ERROR" + "DEBUG" + "TRACE" + ]; + default = "INFO"; + description = "Log level for dependency-track"; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + On which port dependency-track should listen for new HTTP connections. + ''; + }; + + javaArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "-Xmx4G" ]; + description = "Java options passed to JVM"; + }; + + database = { + type = lib.mkOption { + type = lib.types.enum [ + "h2" + "postgresql" + "manual" + ]; + default = "postgresql"; + description = '' + `h2` database is not recommended for a production setup. + `postgresql` this settings it recommended for production setups. + `manual` the module doesn't handle database settings. + ''; + }; + + createLocally = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether a database should be automatically created on the + local host. Set this to false if you plan on provisioning a + local database yourself. + ''; + }; + + databaseName = lib.mkOption { + type = lib.types.str; + default = "dependency-track"; + description = '' + Database name to use when connecting to an external or + manually provisioned database; has no effect when a local + database is automatically provisioned. + + To use this with a local database, set {option}`services.dependency-track.database.createLocally` + to `false` and create the database and user. + ''; + }; + + username = lib.mkOption { + type = lib.types.str; + default = "dependency-track"; + description = '' + Username to use when connecting to an external or manually + provisioned database; has no effect when a local database is + automatically provisioned. + + To use this with a local database, set {option}`services.dependency-track.database.createLocally` + to `false` and create the database and user. + ''; + }; + + passwordFile = lib.mkOption { + type = lib.types.path; + example = "/run/keys/db_password"; + apply = assertStringPath "passwordFile"; + description = '' + The path to a file containing the database password. + ''; + }; + }; + + ldap.bindPasswordFile = lib.mkOption { + type = lib.types.path; + example = "/run/keys/ldap_bind_password"; + apply = assertStringPath "bindPasswordFile"; + description = '' + The path to a file containing the LDAP bind password. + ''; + }; + + frontend = { + baseUrl = lib.mkOption { + type = lib.types.str; + default = lib.optionalString cfg.nginx.enable "${ + if sslEnabled then "https" else "http" + }://${cfg.nginx.domain}"; + defaultText = lib.literalExpression '' + lib.optionalString config.services.dependency-track.nginx.enable "''${ + if sslEnabled then "https" else "http" + }://''${config.services.dependency-track.nginx.domain}"; + ''; + description = '' + The base URL of the API server. + + NOTE: + * This URL must be reachable by the browsers of your users. + * The frontend container itself does NOT communicate with the API server directly, it just serves static files. + * When deploying to dedicated servers, please use the external IP or domain of the API server. + ''; + }; + }; + + oidc = { + enable = lib.mkEnableOption "oidc support"; + issuer = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + Defines the issuer URL to be used for OpenID Connect. + See alpine.oidc.issuer property of the API server. + ''; + }; + clientId = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + Defines the client ID for OpenID Connect. + ''; + }; + scope = lib.mkOption { + type = lib.types.str; + default = "openid profile email"; + description = '' + Defines the scopes to request for OpenID Connect. + See also: https://openid.net/specs/openid-connect-basic-1_0.html#Scopes + ''; + }; + flow = lib.mkOption { + type = lib.types.enum [ + "code" + "implicit" + ]; + default = "code"; + description = '' + Specifies the OpenID Connect flow to use. + Values other than "implicit" will result in the Code+PKCE flow to be used. + Usage of the implicit flow is strongly discouraged, but may be necessary when + the IdP of choice does not support the Code+PKCE flow. + See also: + - https://oauth.net/2/grant-types/implicit/ + - https://oauth.net/2/pkce/ + ''; + }; + loginButtonText = lib.mkOption { + type = lib.types.str; + default = "Login with OpenID Connect"; + description = '' + Defines the scopes to request for OpenID Connect. + See also: https://openid.net/specs/openid-connect-basic-1_0.html#Scopes + ''; + }; + usernameClaim = lib.mkOption { + type = lib.types.str; + default = "name"; + example = "preferred_username"; + description = '' + Defines the name of the claim that contains the username in the provider's userinfo endpoint. + Common claims are "name", "username", "preferred_username" or "nickname". + See also: https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse + ''; + }; + userProvisioning = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Specifies if mapped OpenID Connect accounts are automatically created upon successful + authentication. When a user logs in with a valid access token but an account has + not been previously provisioned, an authentication failure will be returned. + This allows admins to control specifically which OpenID Connect users can access the + system and which users cannot. When this value is set to true, a local OpenID Connect + user will be created and mapped to the OpenID Connect account automatically. This + automatic provisioning only affects authentication, not authorization. + ''; + }; + teamSynchronization = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + This option will ensure that team memberships for OpenID Connect users are dynamic and + synchronized with membership of OpenID Connect groups or assigned roles. When a team is + mapped to an OpenID Connect group, all local OpenID Connect users will automatically be + assigned to the team if they are a member of the group the team is mapped to. If the user + is later removed from the OpenID Connect group, they will also be removed from the team. This + option provides the ability to dynamically control user permissions via the identity provider. + Note that team synchronization is only performed during user provisioning and after successful + authentication. + ''; + }; + teams = { + claim = lib.mkOption { + type = lib.types.str; + default = "groups"; + description = '' + Defines the name of the claim that contains group memberships or role assignments in the provider's userinfo endpoint. + The claim must be an array of strings. Most public identity providers do not support group or role management. + When using a customizable / on-demand hosted identity provider, name, content, and inclusion in the userinfo endpoint + will most likely need to be configured. + ''; + }; + default = lib.mkOption { + type = lib.types.nullOr lib.types.commas; + default = null; + description = '' + Defines one or more team names that auto-provisioned OIDC users shall be added to. + Multiple team names may be provided as comma-separated list. + + Has no effect when {option}`services.dependency-track.oidc.userProvisioning`=false, + or {option}`services.dependency-track.oidc.teamSynchronization`=true. + ''; + }; + }; + }; + + nginx = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + example = false; + description = '' + Whether to set up an nginx virtual host. + ''; + }; + + domain = lib.mkOption { + type = lib.types.str; + example = "dtrack.example.com"; + description = '' + The domain name under which to set up the virtual host. + ''; + }; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + "alpine.data.directory" = lib.mkOption { + type = lib.types.path; + default = "/var/lib/dependency-track"; + description = '' + Defines the path to the data directory. This directory will hold logs, keys, + and any database or index files along with application-specific files or + directories. + ''; + }; + "alpine.database.mode" = lib.mkOption { + type = lib.types.enum [ + "server" + "embedded" + "external" + ]; + default = + if cfg.database.type == "h2" then + "embedded" + else if cfg.database.type == "postgresql" then + "external" + else + null; + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.type == "h2" then "embedded" + else if config.services.dependency-track.database.type == "postgresql" then "external" + else null + ''; + description = '' + Defines the database mode of operation. Valid choices are: + 'server', 'embedded', and 'external'. + In server mode, the database will listen for connections from remote hosts. + In embedded mode, the system will be more secure and slightly faster. + External mode should be used when utilizing an external database server + (i.e. mysql, postgresql, etc). + ''; + }; + "alpine.database.url" = lib.mkOption { + type = lib.types.str; + default = + if cfg.database.type == "h2" then + "jdbc:h2:/var/lib/dependency-track/db" + else if cfg.database.type == "postgresql" then + "jdbc:postgresql:${cfg.database.databaseName}?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/run/postgresql/.s.PGSQL.5432" + else + null; + + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.type == "h2" then "jdbc:h2:/var/lib/dependency-track/db" + else if config.services.dependency-track.database.type == "postgresql" then "jdbc:postgresql:''${config.services.dependency-track.database.name}?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/run/postgresql/.s.PGSQL.5432" + else null + ''; + description = "Specifies the JDBC URL to use when connecting to the database."; + }; + "alpine.database.driver" = lib.mkOption { + type = lib.types.enum [ + "org.h2.Driver" + "org.postgresql.Driver" + "com.microsoft.sqlserver.jdbc.SQLServerDriver" + "com.mysql.cj.jdbc.Driver" + ]; + default = + if cfg.database.type == "h2" then + "org.h2.Driver" + else if cfg.database.type == "postgresql" then + "org.postgresql.Driver" + else + null; + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.type == "h2" then "org.h2.Driver" + else if config.services.dependency-track.database.type == "postgresql" then "org.postgresql.Driver" + else null; + ''; + description = "Specifies the JDBC driver class to use."; + }; + "alpine.database.username" = lib.mkOption { + type = lib.types.str; + default = if cfg.database.createLocally then "dependency-track" else cfg.database.username; + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.createLocally then "dependency-track" + else config.services.dependency-track.database.username + ''; + description = "Specifies the username to use when authenticating to the database."; + }; + "alpine.ldap.enabled" = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Defines if LDAP will be used for user authentication. If enabled, + alpine.ldap.* properties should be set accordingly. + ''; + }; + "alpine.oidc.enabled" = lib.mkOption { + type = lib.types.bool; + default = cfg.oidc.enable; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.enable"; + description = '' + Defines if OpenID Connect will be used for user authentication. + If enabled, alpine.oidc.* properties should be set accordingly. + ''; + }; + "alpine.oidc.client.id" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.clientId; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.clientId"; + description = '' + Defines the client ID to be used for OpenID Connect. + The client ID should be the same as the one configured for the frontend, + and will only be used to validate ID tokens. + ''; + }; + "alpine.oidc.issuer" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.issuer; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.issuer"; + description = '' + Defines the issuer URL to be used for OpenID Connect. + This issuer MUST support provider configuration via the /.well-known/openid-configuration endpoint. + See also: + - https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata + - https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig + ''; + }; + "alpine.oidc.username.claim" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.usernameClaim; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.usernameClaim"; + description = '' + Defines the name of the claim that contains the username in the provider's userinfo endpoint. + Common claims are "name", "username", "preferred_username" or "nickname". + See also: https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse + ''; + }; + "alpine.oidc.user.provisioning" = lib.mkOption { + type = lib.types.bool; + default = cfg.oidc.userProvisioning; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.userProvisioning"; + description = '' + Specifies if mapped OpenID Connect accounts are automatically created upon successful + authentication. When a user logs in with a valid access token but an account has + not been previously provisioned, an authentication failure will be returned. + This allows admins to control specifically which OpenID Connect users can access the + system and which users cannot. When this value is set to true, a local OpenID Connect + user will be created and mapped to the OpenID Connect account automatically. This + automatic provisioning only affects authentication, not authorization. + ''; + }; + "alpine.oidc.team.synchronization" = lib.mkOption { + type = lib.types.bool; + default = cfg.oidc.teamSynchronization; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.teamSynchronization"; + description = '' + This option will ensure that team memberships for OpenID Connect users are dynamic and + synchronized with membership of OpenID Connect groups or assigned roles. When a team is + mapped to an OpenID Connect group, all local OpenID Connect users will automatically be + assigned to the team if they are a member of the group the team is mapped to. If the user + is later removed from the OpenID Connect group, they will also be removed from the team. This + option provides the ability to dynamically control user permissions via the identity provider. + Note that team synchronization is only performed during user provisioning and after successful + authentication. + ''; + }; + "alpine.oidc.teams.claim" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.teams.claim; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.teams.claim"; + description = '' + Defines the name of the claim that contains group memberships or role assignments in the provider's userinfo endpoint. + The claim must be an array of strings. Most public identity providers do not support group or role management. + When using a customizable / on-demand hosted identity provider, name, content, and inclusion in the userinfo endpoint + will most likely need to be configured. + ''; + }; + "alpine.oidc.teams.default" = lib.mkOption { + type = lib.types.nullOr lib.types.commas; + default = cfg.oidc.teams.default; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.teams.default"; + description = '' + Defines one or more team names that auto-provisioned OIDC users shall be added to. + Multiple team names may be provided as comma-separated list. + + Has no effect when {option}`services.dependency-track.oidc.userProvisioning`=false, + or {option}`services.dependency-track.oidc.teamSynchronization`=true. + ''; + }; + }; + }; + default = { }; + description = "See https://docs.dependencytrack.org/getting-started/configuration/#default-configuration for possible options"; + }; + }; + + config = lib.mkIf cfg.enable { + services.nginx = lib.mkIf cfg.nginx.enable { + enable = true; + recommendedGzipSettings = lib.mkDefault true; + recommendedOptimisation = lib.mkDefault true; + recommendedProxySettings = lib.mkDefault true; + recommendedTlsSettings = lib.mkDefault true; + upstreams.dependency-track.servers."localhost:${toString cfg.port}" = { }; + virtualHosts.${cfg.nginx.domain} = { + locations = { + "/".proxyPass = "http://dependency-track"; + "= /static/config.json".alias = frontendConfigFile; + }; + }; + }; + + systemd.services.dependency-track-postgresql-init = lib.mkIf cfg.database.createLocally { + after = [ "postgresql.service" ]; + before = [ "dependency-track.service" ]; + bindsTo = [ "postgresql.service" ]; + path = [ config.services.postgresql.package ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "postgres"; + Group = "postgres"; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; + PrivateTmp = true; + }; + script = '' + set -eou pipefail + shopt -s inherit_errexit + + # Read the password from the credentials directory and + # escape any single quotes by adding additional single + # quotes after them, following the rules laid out here: + # https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" + db_password="''${db_password//\'/\'\'}" + + echo "CREATE ROLE \"dependency-track\" WITH LOGIN PASSWORD '$db_password' CREATEDB" > /tmp/create_role.sql + psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='dependency-track'" | grep -q 1 || psql -tA --file="/tmp/create_role.sql" + psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'dependency-track'" | grep -q 1 || psql -tAc 'CREATE DATABASE "dependency-track" OWNER "dependency-track"' + ''; + }; + + services.postgresql.enable = lib.mkIf cfg.database.createLocally (lib.mkDefault true); + + systemd.services."dependency-track" = + let + databaseServices = + if cfg.database.createLocally then + [ + "dependency-track-postgresql-init.service" + "postgresql.service" + ] + else + [ ]; + in + { + description = "Dependency Track"; + wantedBy = [ "multi-user.target" ]; + requires = databaseServices; + after = databaseServices; + # provide settings via env vars to allow overriding default settings. + environment = { + HOME = "%S/dependency-track"; + } // renderSettings cfg.settings; + serviceConfig = { + User = "dependency-track"; + Group = "dependency-track"; + DynamicUser = true; + StateDirectory = "dependency-track"; + LoadCredential = + [ "db_password:${cfg.database.passwordFile}" ] + ++ lib.optional cfg.settings."alpine.ldap.enabled" + "ldap_bind_password:${cfg.ldap.bindPasswordFile}"; + }; + script = '' + set -eou pipefail + shopt -s inherit_errexit + + export ALPINE_DATABASE_PASSWORD_FILE="$CREDENTIALS_DIRECTORY/db_password" + ${lib.optionalString cfg.settings."alpine.ldap.enabled" '' + export ALPINE_LDAP_BIND_PASSWORD="$(<"$CREDENTIALS_DIRECTORY/ldap_bind_password")" + ''} + + exec ${lib.getExe pkgs.jre_headless} ${ + lib.escapeShellArgs ( + cfg.javaArgs + ++ [ + "-DdependencyTrack.logging.level=${cfg.logLevel}" + "-jar" + "${cfg.package}/share/dependency-track/dependency-track.jar" + "-port" + "${toString cfg.port}" + ] + ) + } + ''; + }; + }; + + meta = { + maintainers = lib.teams.cyberus.members; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix index 919d870b3a..36d79a4153 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -26,7 +26,7 @@ in (lib.mkRemovedOptionModule [ "services" "hedgedoc" "workDir" ] '' This option has been removed in favor of systemd managing the state directory. - If you have set this option without specifying `services.settings.uploadsDir`, + If you have set this option without specifying `services.hedgedoc.settings.uploadsPath`, please move these files to `/var/lib/hedgedoc/uploads`, or set the option to point at the correct location. '') diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix new file mode 100644 index 0000000000..1e46f3b855 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix @@ -0,0 +1,311 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.immich; + isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host; + isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host; + + commonServiceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = 3; + + # Hardening + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + PrivateUsers = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + }; + inherit (lib) + types + mkIf + mkOption + mkEnableOption + ; +in +{ + options.services.immich = { + enable = mkEnableOption "Immich"; + package = lib.mkPackageOption pkgs "immich" { }; + + mediaLocation = mkOption { + type = types.path; + default = "/var/lib/immich"; + description = "Directory used to store media files. If it is not the default, the directory has to be created manually such that the immich user is able to read and write to it."; + }; + environment = mkOption { + type = types.submodule { freeformType = types.attrsOf types.str; }; + default = { }; + example = { + IMMICH_LOG_LEVEL = "verbose"; + }; + description = '' + Extra configuration environment variables. Refer to the [documentation](https://immich.app/docs/install/environment-variables) for options tagged with 'server', 'api' or 'microservices'. + ''; + }; + secretsFile = mkOption { + type = types.nullOr ( + types.str + // { + # We don't want users to be able to pass a path literal here but + # it should look like a path. + check = it: lib.isString it && lib.types.path.check it; + } + ); + default = null; + example = "/run/secrets/immich"; + description = '' + Path of a file with extra environment variables to be loaded from disk. This file is not added to the nix store, so it can be used to pass secrets to immich. Refer to the [documentation](https://immich.app/docs/install/environment-variables) for options. + + To set a database password set this to a file containing: + ``` + DB_PASSWORD= + ``` + ''; + }; + host = mkOption { + type = types.str; + default = "localhost"; + description = "The host that immich will listen on."; + }; + port = mkOption { + type = types.port; + default = 3001; + description = "The port that immich will listen on."; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open the immich port in the firewall"; + }; + user = mkOption { + type = types.str; + default = "immich"; + description = "The user immich should run as."; + }; + group = mkOption { + type = types.str; + default = "immich"; + description = "The group immich should run as."; + }; + + machine-learning = { + enable = + mkEnableOption "immich's machine-learning functionality to detect faces and search for objects" + // { + default = true; + }; + environment = mkOption { + type = types.submodule { freeformType = types.attrsOf types.str; }; + default = { }; + example = { + MACHINE_LEARNING_MODEL_TTL = "600"; + }; + description = '' + Extra configuration environment variables. Refer to the [documentation](https://immich.app/docs/install/environment-variables) for options tagged with 'machine-learning'. + ''; + }; + }; + + database = { + enable = + mkEnableOption "the postgresql database for use with immich. See {option}`services.postgresql`" + // { + default = true; + }; + createDB = mkEnableOption "the automatic creation of the database for immich." // { + default = true; + }; + name = mkOption { + type = types.str; + default = "immich"; + description = "The name of the immich database."; + }; + host = mkOption { + type = types.str; + default = "/run/postgresql"; + example = "127.0.0.1"; + description = "Hostname or address of the postgresql server. If an absolute path is given here, it will be interpreted as a unix socket path."; + }; + user = mkOption { + type = types.str; + default = "immich"; + description = "The database user for immich."; + }; + }; + redis = { + enable = mkEnableOption "a redis cache for use with immich" // { + default = true; + }; + host = mkOption { + type = types.str; + default = config.services.redis.servers.immich.unixSocket; + defaultText = lib.literalExpression "config.services.redis.servers.immich.unixSocket"; + description = "The host that redis will listen on."; + }; + port = mkOption { + type = types.port; + default = 0; + description = "The port that redis will listen on. Set to zero to disable TCP."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !isPostgresUnixSocket -> cfg.secretsFile != null; + message = "A secrets file containing at least the database password must be provided when unix sockets are not used."; + } + ]; + + services.postgresql = mkIf cfg.database.enable { + enable = true; + ensureDatabases = mkIf cfg.database.createDB [ cfg.database.name ]; + ensureUsers = mkIf cfg.database.createDB [ + { + name = cfg.database.user; + ensureDBOwnership = true; + ensureClauses.login = true; + } + ]; + extraPlugins = ps: with ps; [ pgvecto-rs ]; + settings = { + shared_preload_libraries = [ "vectors.so" ]; + search_path = "\"$user\", public, vectors"; + }; + }; + systemd.services.postgresql.serviceConfig.ExecStartPost = + let + sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" '' + CREATE EXTENSION IF NOT EXISTS unaccent; + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + CREATE EXTENSION IF NOT EXISTS vectors; + CREATE EXTENSION IF NOT EXISTS cube; + CREATE EXTENSION IF NOT EXISTS earthdistance; + CREATE EXTENSION IF NOT EXISTS pg_trgm; + + ALTER SCHEMA public OWNER TO ${cfg.database.user}; + ALTER SCHEMA vectors OWNER TO ${cfg.database.user}; + GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user}; + + ALTER EXTENSION vectors UPDATE; + ''; + in + [ + '' + ${lib.getExe' config.services.postgresql.package "psql"} -d "${cfg.database.name}" -f "${sqlFile}" + '' + ]; + + services.redis.servers = mkIf cfg.redis.enable { + immich = { + enable = true; + user = cfg.user; + port = cfg.redis.port; + bind = mkIf (!isRedisUnixSocket) cfg.redis.host; + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + services.immich.environment = + let + postgresEnv = + if isPostgresUnixSocket then + { DB_URL = "socket://${cfg.database.host}?dbname=${cfg.database.name}"; } + else + { + DB_HOSTNAME = cfg.database.host; + DB_PORT = toString cfg.database.port; + DB_DATABASE_NAME = cfg.database.name; + DB_USERNAME = cfg.database.user; + }; + redisEnv = + if isRedisUnixSocket then + { REDIS_SOCKET = cfg.redis.host; } + else + { + REDIS_PORT = toString cfg.redis.port; + REDIS_HOSTNAME = cfg.redis.host; + }; + in + postgresEnv + // redisEnv + // { + HOST = cfg.host; + IMMICH_PORT = toString cfg.port; + IMMICH_MEDIA_LOCATION = cfg.mediaLocation; + IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003"; + }; + + services.immich.machine-learning.environment = { + MACHINE_LEARNING_WORKERS = "1"; + MACHINE_LEARNING_WORKER_TIMEOUT = "120"; + MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich"; + IMMICH_HOST = "localhost"; + IMMICH_PORT = "3003"; + }; + + systemd.services.immich-server = { + description = "Immich backend server (Self-hosted photo and video backup solution)"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + inherit (cfg) environment; + + serviceConfig = commonServiceConfig // { + ExecStart = lib.getExe cfg.package; + EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile; + StateDirectory = "immich"; + RuntimeDirectory = "immich"; + User = cfg.user; + Group = cfg.group; + }; + }; + + systemd.services.immich-machine-learning = mkIf cfg.machine-learning.enable { + description = "immich machine learning"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + inherit (cfg.machine-learning) environment; + serviceConfig = commonServiceConfig // { + ExecStart = lib.getExe cfg.package.machine-learning; + CacheDirectory = "immich"; + User = cfg.user; + Group = cfg.group; + }; + }; + + users.users = mkIf (cfg.user == "immich") { + immich = { + name = "immich"; + group = cfg.group; + isSystemUser = true; + }; + }; + users.groups = mkIf (cfg.group == "immich") { immich = { }; }; + + meta.maintainers = with lib.maintainers; [ jvanbruegge ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix index 2280d9165b..35af8c2648 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix @@ -294,6 +294,15 @@ in '') ]; + services.logrotate.settings.pretalx = { + files = "${cfg.settings.filesystem.logs}/*.log"; + su = "${cfg.user} ${cfg.group}"; + frequency = "weekly"; + rotate = "12"; + copytruncate = true; + compress = true; + }; + services = { nginx = lib.mkIf cfg.nginx.enable { enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix index d298caab5b..f521c49668 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix @@ -249,7 +249,7 @@ in }; host = mkOption { - type = with types; nullOr path; + type = with types; nullOr str; default = if cfg.settings.database.backend == "postgresql" then "/run/postgresql" else null; defaultText = literalExpression '' if config.services.pretix.settings..database.backend == "postgresql" then "/run/postgresql" @@ -403,6 +403,15 @@ in '') ]; + services.logrotate.settings.pretix = { + files = "${cfg.settings.pretix.logdir}/*.log"; + su = "${cfg.user} ${cfg.group}"; + frequency = "weekly"; + rotate = "12"; + copytruncate = true; + compress = true; + }; + services = { nginx = mkIf cfg.nginx.enable { enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/stirling-pdf.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/stirling-pdf.nix index ea7d7fbf54..48fe744b60 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/stirling-pdf.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/stirling-pdf.nix @@ -59,6 +59,7 @@ in pngquant tesseract python3Packages.weasyprint + ghostscript_headless ] ++ lib.optional (cfg.environment.INSTALL_BOOK_AND_ADVANCED_HTML_OPS or "false" == "true") calibre; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix index ea771c3588..38b5e2c52d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix @@ -75,13 +75,16 @@ let mkPhpValue = v: let isHasAttr = s: isAttrs v && hasAttr s v; + # "you're escaped" -> "'you\'re escaped'" + # https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single + toPhpString = s: "'${escape [ "'" "\\" ] s}'"; in - if isString v then escapeShellArg v + if isString v then toPhpString v # NOTE: If any value contains a , (comma) this will not get escaped - else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) + else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v) else if isInt v then toString v else if isBool v then boolToString v - else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))" + else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))" else if isHasAttr "_raw" then v._raw else abort "The Wordpress config value ${lib.generators.toPretty {} v} can not be encoded." ; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix index f6b693139a..ab647b11de 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix @@ -1,11 +1,11 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption optional; + inherit (lib.types) path bool listOf str port; cfg = config.services.darkhttpd; - args = concatStringsSep " " ([ + args = lib.concatStringsSep " " ([ cfg.rootDir "--port ${toString cfg.port}" "--addr ${cfg.address}" @@ -14,12 +14,12 @@ let ++ optional config.networking.enableIPv6 "--ipv6"); in { - options.services.darkhttpd = with types; { - enable = mkEnableOption "DarkHTTPd web server"; + options.services.darkhttpd = { + enable = lib.mkEnableOption "DarkHTTPd web server"; port = mkOption { default = 80; - type = types.port; + type = port; description = '' Port to listen on. Pass 0 to let the system choose any free port for you. diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix index 14361df2bb..e3cf92e179 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix @@ -7,8 +7,6 @@ let inherit (lib) optionals types - concatLists - mapAttrsToList mkOption ; @@ -17,16 +15,17 @@ let ++ optionals (cfg.socket != null) [ "--interface" cfg.socket ] ++ optionals (cfg.interface != null) [ "--interface" cfg.interface ] ++ [ "--signal" (toString cfg.signal) ] - ++ (concatLists (mapAttrsToList (_k: _v: [ "--client-option" "${_k}=${_v}" ]) cfg.clientOptions)) + ++ (lib.concatLists (lib.mapAttrsToList (_k: _v: [ "--client-option" "${_k}=${_v}" ]) cfg.clientOptions)) ++ [ "--terminal-type" cfg.terminalType ] ++ optionals cfg.checkOrigin [ "--check-origin" ] ++ optionals cfg.writeable [ "--writable" ] # the typo is correct ++ [ "--max-clients" (toString cfg.maxClients) ] ++ optionals (cfg.indexFile != null) [ "--index" cfg.indexFile ] ++ optionals cfg.enableIPv6 [ "--ipv6" ] - ++ optionals cfg.enableSSL [ "--ssl-cert" cfg.certFile - "--ssl-key" cfg.keyFile - "--ssl-ca" cfg.caFile ] + ++ optionals cfg.enableSSL [ "--ssl" + "--ssl-cert" cfg.certFile + "--ssl-key" cfg.keyFile ] + ++ optionals ( cfg.enableSSL && cfg.caFile != null ) [ "--ssl-ca" cfg.caFile ] ++ [ "--debug" (toString cfg.logLevel) ]; in @@ -197,8 +196,8 @@ in assertions = [ { assertion = cfg.enableSSL - -> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null; - message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specified."; } + -> cfg.certFile != null && cfg.keyFile != null; + message = "SSL is enabled for ttyd, but no certFile or keyFile has been specified."; } { assertion = cfg.writeable != null; message = "services.ttyd.writeable must be set"; } { assertion = ! (cfg.interface != null && cfg.socket != null); diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index ed0ece19f2..1b0a62c2e8 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -68,9 +68,19 @@ let else showWarnings config.warnings baseSystem; # Replace runtime dependencies - system = foldr ({ oldDependency, newDependency }: drv: - pkgs.replaceDependency { inherit oldDependency newDependency drv; } - ) baseSystemAssertWarn config.system.replaceRuntimeDependencies; + system = let inherit (config.system.replaceDependencies) replacements cutoffPackages; in + if replacements == [] then + # Avoid IFD if possible, by sidestepping replaceDependencies if no replacements are specified. + baseSystemAssertWarn + else + (pkgs.replaceDependencies.override { + replaceDirectDependencies = pkgs.replaceDirectDependencies.override { + nix = config.nix.package; + }; + }) { + drv = baseSystemAssertWarn; + inherit replacements cutoffPackages; + }; systemWithBuildDeps = system.overrideAttrs (o: { systemBuildClosure = pkgs.closureInfo { rootPaths = [ system.drvPath ]; }; @@ -87,6 +97,7 @@ in (mkRemovedOptionModule [ "nesting" "clone" ] "Use `specialisation.«name» = { inheritParentConfig = true; configuration = { ... }; }` instead.") (mkRemovedOptionModule [ "nesting" "children" ] "Use `specialisation.«name».configuration = { ... }` instead.") (mkRenamedOptionModule [ "system" "forbiddenDependenciesRegex" ] [ "system" "forbiddenDependenciesRegexes" ]) + (mkRenamedOptionModule [ "system" "replaceRuntimeDependencies" ] [ "system" "replaceDependencies" "replacements" ]) ]; options = { @@ -205,31 +216,47 @@ in ''; }; - system.replaceRuntimeDependencies = mkOption { - default = []; - example = lib.literalExpression "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]"; - type = types.listOf (types.submodule ( - { ... }: { - options.original = mkOption { - type = types.package; - description = "The original package to override."; - }; + system.replaceDependencies = { + replacements = mkOption { + default = []; + example = lib.literalExpression "[ ({ oldDependency = pkgs.openssl; newDependency = pkgs.callPackage /path/to/openssl { }; }) ]"; + type = types.listOf (types.submodule ( + { ... }: { + imports = [ + (mkRenamedOptionModule [ "original" ] [ "oldDependency" ]) + (mkRenamedOptionModule [ "replacement" ] [ "newDependency" ]) + ]; - options.replacement = mkOption { - type = types.package; - description = "The replacement package."; - }; - }) - ); - apply = map ({ original, replacement, ... }: { - oldDependency = original; - newDependency = replacement; - }); - description = '' - List of packages to override without doing a full rebuild. - The original derivation and replacement derivation must have the same - name length, and ideally should have close-to-identical directory layout. - ''; + options.oldDependency = mkOption { + type = types.package; + description = "The original package to override."; + }; + + options.newDependency = mkOption { + type = types.package; + description = "The replacement package."; + }; + }) + ); + apply = map ({ oldDependency, newDependency, ... }: { + inherit oldDependency newDependency; + }); + description = '' + List of packages to override without doing a full rebuild. + The original derivation and replacement derivation must have the same + name length, and ideally should have close-to-identical directory layout. + ''; + }; + + cutoffPackages = mkOption { + default = [ config.system.build.initialRamdisk ]; + defaultText = literalExpression "[ config.system.build.initialRamdisk ]"; + type = types.listOf types.package; + description = '' + Packages to which no replacements should be applied. + The initrd is matched by default, because its structure renders the replacement process ineffective and prone to breakage. + ''; + }; }; system.name = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index 65190e65d9..70b455871b 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -1088,6 +1088,8 @@ in storePaths = [ "${config.boot.initrd.systemd.package}/bin/systemd-cryptsetup" "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-cryptsetup-generator" + ] ++ lib.optionals config.boot.initrd.systemd.tpm2.enable [ + "${config.boot.initrd.systemd.package}/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index 082380216d..b3237aa7f0 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -327,7 +327,7 @@ let setHostId = optionalString (config.networking.hostId != null) '' hi="${config.networking.hostId}" - ${if pkgs.stdenv.isBigEndian then '' + ${if pkgs.stdenv.hostPlatform.isBigEndian then '' echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > /etc/hostid '' else '' echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > /etc/hostid diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index bb6fcc1d38..14019a518a 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -37,8 +37,6 @@ let "cryptsetup.target" "cryptsetup-pre.target" "remote-cryptsetup.target" - ] ++ optionals cfg.package.withTpm2Tss [ - "tpm2.target" ] ++ [ "sigpwr.target" "timers.target" @@ -679,7 +677,7 @@ in # Increase numeric PID range (set directly instead of copying a one-line file from systemd) # https://github.com/systemd/systemd/pull/12226 - boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.is64bit (lib.mkDefault 4194304); + boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.hostPlatform.is64bit (lib.mkDefault 4194304); services.logrotate.settings = { "/var/log/btmp" = mapAttrs (_: mkDefault) { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/dm-verity.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/dm-verity.nix new file mode 100644 index 0000000000..d800777558 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/dm-verity.nix @@ -0,0 +1,61 @@ +{ config, lib, ... }: + +let + cfg = config.boot.initrd.systemd.dmVerity; +in +{ + options = { + boot.initrd.systemd.dmVerity = { + enable = lib.mkEnableOption "dm-verity" // { + description = '' + Mount verity-protected block devices in the initrd. + + Enabling this option allows to use `systemd-veritysetup` and + `systemd-veritysetup-generator` in the initrd. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.boot.initrd.systemd.enable; + message = '' + 'boot.initrd.systemd.dmVerity.enable' requires 'boot.initrd.systemd.enable' to be enabled. + ''; + } + ]; + + boot.initrd = { + availableKernelModules = [ + "dm_mod" + "dm_verity" + ]; + + # dm-verity needs additional udev rules from LVM to work. + services.lvm.enable = true; + + # The additional targets and store paths allow users to integrate verity-protected devices + # through the systemd tooling. + systemd = { + additionalUpstreamUnits = [ + "veritysetup-pre.target" + "veritysetup.target" + "remote-veritysetup.target" + ]; + + storePaths = [ + "${config.boot.initrd.systemd.package}/lib/systemd/systemd-veritysetup" + "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-veritysetup-generator" + ]; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ + msanft + nikstur + willibutz + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index 2ccc964820..6cf358a4d4 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -38,6 +38,7 @@ let "kmod-static-nodes.service" "local-fs-pre.target" "local-fs.target" + "modprobe@.service" "multi-user.target" "paths.target" "poweroff.target" @@ -68,7 +69,6 @@ let "systemd-reboot.service" "systemd-sysctl.service" "timers.target" - "tpm2.target" "umount.target" "systemd-bsod.service" ] ++ cfg.additionalUpstreamUnits; @@ -349,15 +349,6 @@ in { visible = "shallow"; description = "Definition of slice configurations."; }; - - enableTpm2 = mkOption { - default = cfg.package.withTpm2Tss; - defaultText = "boot.initrd.systemd.package.withTpm2Tss"; - type = types.bool; - description = '' - Whether to enable TPM2 support in the initrd. - ''; - }; }; config = mkIf (config.boot.initrd.enable && cfg.enable) { @@ -394,9 +385,7 @@ in { # systemd needs this for some features "autofs" # systemd-cryptenroll - ] ++ lib.optional cfg.enableTpm2 "tpm-tis" - ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb" - ++ lib.optional cfg.package.withEfi "efivarfs"; + ] ++ lib.optional cfg.package.withEfi "efivarfs"; boot.kernelParams = [ "root=${config.boot.initrd.systemd.root}" @@ -495,10 +484,6 @@ in { # so NSS can look up usernames "${pkgs.glibc}/lib/libnss_files.so.2" - ] ++ optionals (cfg.package.withCryptsetup && cfg.enableTpm2) [ - # tpm2 support - "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so" - pkgs.tpm2-tss ] ++ optionals cfg.package.withCryptsetup [ # fido2 support "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysusers.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysusers.nix index 98f93f25c5..d0af52e0ae 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysusers.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysusers.nix @@ -68,14 +68,10 @@ in assertion = config.system.activationScripts.users == ""; message = "system.activationScripts.users has to be empty to use systemd-sysusers"; } - { - assertion = config.users.mutableUsers -> config.system.etc.overlay.enable; - message = "config.users.mutableUsers requires config.system.etc.overlay.enable."; - } ] ++ (lib.mapAttrsToList - (_username: opts: { + (username: opts: { assertion = !opts.isNormalUser; - message = "systemd-sysusers doesn't create normal users. You can currently only use it to create system users."; + message = "${username} is a normal user. systemd-sysusers doesn't create normal users, only system users."; }) userCfg.users) ++ lib.mapAttrsToList diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/tpm2.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/tpm2.nix new file mode 100644 index 0000000000..0870e35212 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/tpm2.nix @@ -0,0 +1,80 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + meta.maintainers = [ lib.maintainers.elvishjerricco ]; + + imports = [ + (lib.mkRenamedOptionModule + [ + "boot" + "initrd" + "systemd" + "enableTpm2" + ] + [ + "boot" + "initrd" + "systemd" + "tpm2" + "enable" + ] + ) + ]; + + options = { + systemd.tpm2.enable = lib.mkEnableOption "systemd TPM2 support" // { + default = config.systemd.package.withTpm2Tss; + defaultText = "systemd.package.withTpm2Tss"; + }; + + boot.initrd.systemd.tpm2.enable = lib.mkEnableOption "systemd initrd TPM2 support" // { + default = config.boot.initrd.systemd.package.withTpm2Tss; + defaultText = "boot.initrd.systemd.package.withTpm2Tss"; + }; + }; + + # TODO: pcrphase, pcrextend, pcrfs, pcrmachine + config = lib.mkMerge [ + # Stage 2 + ( + let + cfg = config.systemd; + in + lib.mkIf cfg.tpm2.enable { + systemd.additionalUpstreamSystemUnits = [ + "tpm2.target" + "systemd-tpm2-setup-early.service" + "systemd-tpm2-setup.service" + ]; + } + ) + + # Stage 1 + ( + let + cfg = config.boot.initrd.systemd; + in + lib.mkIf cfg.tpm2.enable { + boot.initrd.systemd.additionalUpstreamUnits = [ + "tpm2.target" + "systemd-tpm2-setup-early.service" + ]; + + boot.initrd.availableKernelModules = + [ "tpm-tis" ] + ++ lib.optional ( + !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7) + ) "tpm-crb"; + boot.initrd.systemd.storePaths = [ + pkgs.tpm2-tss + "${cfg.package}/lib/systemd/systemd-tpm2-setup" + "${cfg.package}/lib/systemd/system-generators/systemd-tpm2-generator" + ]; + } + ) + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix index 9b43d76e87..6c6352b041 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix @@ -26,13 +26,6 @@ assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"; message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6"; } - { - assertion = config.systemd.sysusers.enable -> (config.users.mutableUsers == config.system.etc.overlay.mutable); - message = '' - When using systemd-sysusers and mounting `/etc` via an overlay, users - can only be mutable when `/etc` is mutable and vice versa. - ''; - } ]; boot.initrd.availableKernelModules = [ "loop" "erofs" "overlay" ]; diff --git a/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix b/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix index 32a52041e5..c995016d85 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix @@ -168,7 +168,7 @@ in { assertions = [{ assertion = !((cfg.channel != null) && (cfg.flake != null)); message = '' - The options 'system.autoUpgrade.channels' and 'system.autoUpgrade.flake' cannot both be set. + The options 'system.autoUpgrade.channel' and 'system.autoUpgrade.flake' cannot both be set. ''; }]; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix index a81bec27bc..f5e205e26e 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix @@ -16,7 +16,7 @@ let lib.optionalAttrs (cfg.server.nproc != null) { nfsd.threads = cfg.server.nproc; } // lib.optionalAttrs (cfg.server.hostName != null) { - nfsd.host= cfg.hostName; + nfsd.host = cfg.server.hostName; } // lib.optionalAttrs (cfg.server.mountdPort != null) { mountd.port = cfg.server.mountdPort; } // lib.optionalAttrs (cfg.server.statdPort != null) { diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 7e3e24c727..c9ea31a85b 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -438,7 +438,7 @@ let hostidFile = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' hi="${cfg.hostId}" - ${if pkgs.stdenv.isBigEndian then '' + ${if pkgs.stdenv.hostPlatform.isBigEndian then '' echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out '' else '' echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix index d6d7759981..4f38bc0b94 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -244,7 +244,7 @@ in }; assertions = [ - { assertion = cfg.enableNvidia && pkgs.stdenv.isx86_64 -> config.hardware.graphics.enable32Bit or false; + { assertion = cfg.enableNvidia && pkgs.stdenv.hostPlatform.isx86_64 -> config.hardware.graphics.enable32Bit or false; message = "Option enableNvidia on x86_64 requires 32-bit support libraries"; }]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix index f4c904ff67..777e3b28f2 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix @@ -112,12 +112,11 @@ let environment = lib.mkMerge [ { + INCUS_EDK2_PATH = ovmf; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; PATH = lib.mkForce serverBinPath; } - (lib.mkIf (lib.versionOlder cfg.package.version "6.3.0") { INCUS_OVMF_PATH = ovmf; }) - (lib.mkIf (lib.versionAtLeast cfg.package.version "6.3.0") { INCUS_EDK2_PATH = ovmf; }) (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index b48f9e64c2..edefb4c227 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -1169,7 +1169,7 @@ in value.fsType = "9p"; value.neededForBoot = true; value.options = - [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" ] + [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" "x-systemd.requires=modprobe@9pnet_virtio.service" ] ++ lib.optional (tag == "nix-store") "cache=loose"; }; in lib.mkMerge [ diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix index db09710659..2cc82c9101 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix @@ -32,6 +32,10 @@ let runtimeEnv = { efiMountPoint = config.boot.loader.efi.efiSysMountPoint; }; + + # We disable SC2016 because we don't want to expand the regexes in the sed commands. + excludeShellChecks = [ "SC2016" ]; + text = builtins.readFile ./xen-boot-builder.sh; }; in @@ -601,7 +605,7 @@ in config = lib.modules.mkIf cfg.enable { assertions = [ { - assertion = pkgs.stdenv.isx86_64; + assertion = pkgs.stdenv.hostPlatform.isx86_64; message = "Xen is currently not supported on ${pkgs.stdenv.hostPlatform.system}."; } { diff --git a/third_party/nixpkgs/nixos/release.nix b/third_party/nixpkgs/nixos/release.nix index eeca73ea4c..8a8c45f8f8 100644 --- a/third_party/nixpkgs/nixos/release.nix +++ b/third_party/nixpkgs/nixos/release.nix @@ -49,7 +49,7 @@ let system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; # At creation time we do not have state yet, so just default to latest. - system.stateVersion = config.system.nixos.version; + system.stateVersion = config.system.nixos.release; }; makeModules = module: rest: [ configuration versionModule module rest ]; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index db24053e84..15efe3a06b 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -128,6 +128,7 @@ in { apcupsd = handleTest ./apcupsd.nix {}; apfs = runTest ./apfs.nix; appliance-repart-image = runTest ./appliance-repart-image.nix; + appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix; apparmor = handleTest ./apparmor.nix {}; archi = handleTest ./archi.nix {}; aria2 = handleTest ./aria2.nix {}; @@ -254,6 +255,7 @@ in { deepin = handleTest ./deepin.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {}; + dependency-track = handleTest ./dependency-track.nix {}; devpi-server = handleTest ./devpi-server.nix {}; dex-oidc = handleTest ./dex-oidc.nix {}; dhparams = handleTest ./dhparams.nix {}; @@ -453,6 +455,7 @@ in { icingaweb2 = handleTest ./icingaweb2.nix {}; ifm = handleTest ./ifm.nix {}; iftop = handleTest ./iftop.nix {}; + immich = handleTest ./web-apps/immich.nix {}; incron = handleTest ./incron.nix {}; incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; inherit (pkgs) incus; }); incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; }); @@ -785,6 +788,7 @@ in { plasma6 = handleTest ./plasma6.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; plausible = handleTest ./plausible.nix {}; + playwright-python = handleTest ./playwright-python.nix {}; please = handleTest ./please.nix {}; pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; plikd = handleTest ./plikd.nix {}; @@ -804,6 +808,7 @@ in { postgresql-jit = handleTest ./postgresql-jit.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {}; + postgresql-wal2json = handleTest ./postgresql-wal2json.nix {}; powerdns = handleTest ./powerdns.nix {}; powerdns-admin = handleTest ./powerdns-admin.nix {}; power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; @@ -852,6 +857,7 @@ in { redlib = handleTest ./redlib.nix {}; redmine = handleTest ./redmine.nix {}; renovate = handleTest ./renovate.nix {}; + replace-dependencies = handleTest ./replace-dependencies {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic-rest-server = handleTest ./restic-rest-server.nix {}; restic = handleTest ./restic.nix {}; @@ -1045,6 +1051,7 @@ in { txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; + turn-rs = handleTest ./turn-rs.nix {}; tuxguitar = handleTest ./tuxguitar.nix {}; twingate = runTest ./twingate.nix; typesense = handleTest ./typesense.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/appliance-repart-image-verity-store.nix b/third_party/nixpkgs/nixos/tests/appliance-repart-image-verity-store.nix new file mode 100644 index 0000000000..3834d0a468 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/appliance-repart-image-verity-store.nix @@ -0,0 +1,130 @@ +# similar to the appliance-repart-image test but with a dm-verity +# protected nix store and tmpfs as rootfs +{ lib, ... }: + +{ + name = "appliance-repart-image-verity-store"; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; + + nodes.machine = + { + config, + lib, + pkgs, + ... + }: + let + inherit (config.image.repart.verityStore) partitionIds; + in + { + imports = [ ../modules/image/repart.nix ]; + + virtualisation.fileSystems = lib.mkVMOverride { + "/" = { + fsType = "tmpfs"; + options = [ "mode=0755" ]; + }; + + "/usr" = { + device = "/dev/mapper/usr"; + # explicitly mount it read-only otherwise systemd-remount-fs will fail + options = [ "ro" ]; + fsType = config.image.repart.partitions.${partitionIds.store}.repartConfig.Format; + }; + + # bind-mount the store + "/nix/store" = { + device = "/usr/nix/store"; + options = [ "bind" ]; + }; + }; + + image.repart = { + verityStore = { + enable = true; + # by default the module works with systemd-boot, for simplicity this test directly boots the UKI + ukiPath = "/EFI/BOOT/BOOT${lib.toUpper config.nixpkgs.hostPlatform.efiArch}.EFI"; + }; + + name = "appliance-verity-store-image"; + + partitions = { + ${partitionIds.esp} = { + # the UKI is injected into this partition by the verityStore module + repartConfig = { + Type = "esp"; + Format = "vfat"; + SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; + }; + }; + ${partitionIds.store-verity}.repartConfig = { + Minimize = "best"; + }; + ${partitionIds.store}.repartConfig = { + Minimize = "best"; + }; + }; + }; + + virtualisation = { + directBoot.enable = false; + mountHostNixStore = false; + useEFIBoot = true; + }; + + boot = { + loader.grub.enable = false; + initrd.systemd.enable = true; + }; + + system.image = { + id = "nixos-appliance"; + version = "1"; + }; + + # don't create /usr/bin/env + # this would require some extra work on read-only /usr + # and it is not a strict necessity + system.activationScripts.usrbinenv = lib.mkForce ""; + }; + + testScript = + { nodes, ... }: # python + '' + import os + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + subprocess.run([ + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-b", + "${nodes.machine.system.build.finalImage}/${nodes.machine.image.repart.imageFile}", + "-F", + "raw", + tmp_disk_image.name, + ]) + + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + + machine.wait_for_unit("default.target") + + with subtest("Running with volatile root"): + machine.succeed("findmnt --kernel --type tmpfs /") + + with subtest("/nix/store is backed by dm-verity protected fs"): + verity_info = machine.succeed("dmsetup info --target verity usr") + assert "ACTIVE" in verity_info,f"unexpected verity info: {verity_info}" + + backing_device = machine.succeed("df --output=source /nix/store | tail -n1").strip() + assert "/dev/mapper/usr" == backing_device,"unexpected backing device: {backing_device}" + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/dependency-track.nix b/third_party/nixpkgs/nixos/tests/dependency-track.nix new file mode 100644 index 0000000000..ab0d788272 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dependency-track.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + let + dependencyTrackPort = 8081; + in + { + name = "dependency-track"; + meta = { + maintainers = pkgs.lib.teams.cyberus.members; + }; + + nodes = { + server = + { pkgs, ... }: + { + virtualisation = { + cores = 2; + diskSize = 4096; + }; + + environment.systemPackages = with pkgs; [ curl ]; + systemd.services.dependency-track = { + # source: https://github.com/DependencyTrack/dependency-track/blob/37e0ba59e8057c18a87a7a76e247a8f75677a56c/dev/scripts/data-nist-generate-dummy.sh + preStart = '' + set -euo pipefail + + NIST_DIR="$HOME/.dependency-track/nist" + + rm -rf "$NIST_DIR" + mkdir -p "$NIST_DIR" + + for feed in $(seq "2024" "2002"); do + touch "$NIST_DIR/nvdcve-1.1-$feed.json.gz" + echo "9999999999999" > "$NIST_DIR/nvdcve-1.1-$feed.json.gz.ts" + done + ''; + }; + services.dependency-track = { + enable = true; + port = dependencyTrackPort; + nginx.domain = "localhost"; + database.passwordFile = "${pkgs.writeText "dbPassword" ''hunter2'THE'''H''''E''}"; + }; + }; + }; + + testScript = '' + import json + + start_all() + + server.wait_for_unit("dependency-track.service") + server.wait_until_succeeds( + "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'" + ) + server.wait_for_open_port(${toString dependencyTrackPort}) + + with subtest("version api returns correct version"): + version = json.loads( + server.succeed("curl http://localhost/api/version") + ) + assert version["version"] == "${pkgs.dependency-track.version}" + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/filesender.nix b/third_party/nixpkgs/nixos/tests/filesender.nix index 9274ddbf7e..346e315956 100644 --- a/third_party/nixpkgs/nixos/tests/filesender.nix +++ b/third_party/nixpkgs/nixos/tests/filesender.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "filesender"; meta = { maintainers = with lib.maintainers; [ nhnn ]; - broken = pkgs.stdenv.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64 + broken = pkgs.stdenv.hostPlatform.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64 }; nodes.filesender = { ... }: let diff --git a/third_party/nixpkgs/nixos/tests/freetube.nix b/third_party/nixpkgs/nixos/tests/freetube.nix index c0beeeaae6..4b5b2ed343 100644 --- a/third_party/nixpkgs/nixos/tests/freetube.nix +++ b/third_party/nixpkgs/nixos/tests/freetube.nix @@ -24,7 +24,7 @@ let nodes = { "${name}" = machine; }; meta.maintainers = with pkgs.lib.maintainers; [ kirillrdy ]; # time-out on ofborg - meta.broken = pkgs.stdenv.isAarch64; + meta.broken = pkgs.stdenv.hostPlatform.isAarch64; enableOCR = true; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/gdk-pixbuf.nix b/third_party/nixpkgs/nixos/tests/installed-tests/gdk-pixbuf.nix index 110efdbf71..a86c20b0fb 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/gdk-pixbuf.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/gdk-pixbuf.nix @@ -6,7 +6,7 @@ makeInstalledTest { testConfig = { # Tests allocate a lot of memory trying to exploit a CVE # but qemu-system-i386 has a 2047M memory limit - virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096; + virtualisation.memorySize = if pkgs.stdenv.hostPlatform.isi686 then 2047 else 4096; }; testRunnerFlags = [ "--timeout" "1800" ]; diff --git a/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix b/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix index 5fe106453f..58b98b2a18 100644 --- a/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix +++ b/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix @@ -189,15 +189,13 @@ import ../make-test-python.nix ( m.start() m.wait_for_unit("k3s") - is_aarch64 = "${toString pkgs.stdenv.isAarch64}" == "1" + is_aarch64 = "${toString pkgs.stdenv.hostPlatform.isAarch64}" == "1" # wait for the agent to show up server.wait_until_succeeds("k3s kubectl get node agent") for m in machines: - # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - if not is_aarch64: - m.succeed("k3s check-config") + m.succeed("k3s check-config") m.succeed( "${pauseImage} | k3s ctr image import -" ) diff --git a/third_party/nixpkgs/nixos/tests/k3s/single-node.nix b/third_party/nixpkgs/nixos/tests/k3s/single-node.nix index 145bce3242..55a15324c8 100644 --- a/third_party/nixpkgs/nixos/tests/k3s/single-node.nix +++ b/third_party/nixpkgs/nixos/tests/k3s/single-node.nix @@ -76,44 +76,40 @@ import ../make-test-python.nix ( }; }; - testScript = - '' - start_all() + testScript = '' + start_all() - machine.wait_for_unit("k3s") - machine.succeed("kubectl cluster-info") - machine.fail("sudo -u noprivs kubectl cluster-info") - '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' - + '' + machine.wait_for_unit("k3s") + machine.succeed("kubectl cluster-info") + machine.fail("sudo -u noprivs kubectl cluster-info") + machine.succeed("k3s check-config") + machine.succeed( + "${pauseImage} | ctr image import -" + ) - machine.succeed( - "${pauseImage} | ctr image import -" - ) + # Also wait for our service account to show up; it takes a sec + machine.wait_until_succeeds("kubectl get serviceaccount default") + machine.succeed("kubectl apply -f ${testPodYaml}") + machine.succeed("kubectl wait --for 'condition=Ready' pod/test") + machine.succeed("kubectl delete -f ${testPodYaml}") - # Also wait for our service account to show up; it takes a sec - machine.wait_until_succeeds("kubectl get serviceaccount default") - machine.succeed("kubectl apply -f ${testPodYaml}") - machine.succeed("kubectl wait --for 'condition=Ready' pod/test") - machine.succeed("kubectl delete -f ${testPodYaml}") + # regression test for #176445 + machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") - # regression test for #176445 - machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") + with subtest("Run k3s-killall"): + # Call the killall script with a clean path to assert that + # all required commands are wrapped + output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") + assert "command not found" not in output, "killall script contains unknown command" - with subtest("Run k3s-killall"): - # Call the killall script with a clean path to assert that - # all required commands are wrapped - output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") - assert "command not found" not in output, "killall script contains unknown command" + # Check that killall cleaned up properly + machine.fail("systemctl is-active k3s.service") + machine.fail("systemctl list-units | grep containerd") + machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") + machine.fail("ip netns show | grep cni-") - # Check that killall cleaned up properly - machine.fail("systemctl is-active k3s.service") - machine.fail("systemctl list-units | grep containerd") - machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") - machine.fail("ip netns show | grep cni-") - - machine.shutdown() - ''; + machine.shutdown() + ''; meta.maintainers = lib.teams.k3s.members; } diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix index 3e2302810e..e5d3b36642 100644 --- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix +++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix @@ -25,7 +25,6 @@ let }) args); kernels = pkgs.linuxKernel.vanillaPackages // { inherit (pkgs.linuxKernel.packages) - linux_4_19_hardened linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened diff --git a/third_party/nixpkgs/nixos/tests/libvirtd.nix b/third_party/nixpkgs/nixos/tests/libvirtd.nix index 27ffaac3e6..0b068d5a2f 100644 --- a/third_party/nixpkgs/nixos/tests/libvirtd.nix +++ b/third_party/nixpkgs/nixos/tests/libvirtd.nix @@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = let nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system}; - virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; + virshShutdownCmd = if pkgs.stdenv.hostPlatform.isx86_64 then "shutdown" else "destroy"; in '' start_all() diff --git a/third_party/nixpkgs/nixos/tests/logrotate.nix b/third_party/nixpkgs/nixos/tests/logrotate.nix index f9c5e90609..8d5887abec 100644 --- a/third_party/nixpkgs/nixos/tests/logrotate.nix +++ b/third_party/nixpkgs/nixos/tests/logrotate.nix @@ -127,5 +127,7 @@ import ./make-test-python.nix ({ pkgs, ... }: rec { if info["ActiveState"] != "failed": raise Exception('logrotate-checkconf.service was not failed') + machine.log(machine.execute("systemd-analyze security logrotate.service | grep -v ✓")[1]) + ''; }) diff --git a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera.nix b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera.nix index 7455abbce5..65705afbf8 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera.nix @@ -1,8 +1,8 @@ { system ? builtins.currentSystem, - config ? {}, + config ? { }, pkgs ? import ../../.. { inherit system config; }, - lib ? pkgs.lib + lib ? pkgs.lib, }: let @@ -11,240 +11,263 @@ let makeTest = import ./../make-test-python.nix; # Common user configuration - makeGaleraTest = { - mariadbPackage, - name ? mkTestName mariadbPackage, - galeraPackage ? pkgs.mariadb-galera - }: makeTest { - name = "${name}-galera-mariabackup"; - meta = { - maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members; + makeGaleraTest = + { + mariadbPackage, + name ? mkTestName mariadbPackage, + galeraPackage ? pkgs.mariadb-galera, + }: + makeTest { + name = "${name}-galera-mariabackup"; + meta = { + maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members; + }; + + # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, + # and checking the table's presence on the other node. + nodes = + let + mkGaleraNode = + { + id, + method, + }: + let + address = "192.168.1.${toString id}"; + isFirstClusterNode = id == 1 || id == 4; + in + { + users = { + users.testuser = { + isSystemUser = true; + group = "testusers"; + }; + groups.testusers = { }; + }; + + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { + inherit address; + prefixLength = 24; + } + ]; + ipv6.addresses = lib.mkForce [ ]; + }; + extraHosts = lib.concatMapStringsSep "\n" (i: "192.168.1.${toString i} galera_0${toString i}") ( + lib.range 1 6 + ); + firewall.allowedTCPPorts = [ + 3306 + 4444 + 4567 + 4568 + ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + systemd.services.mysql = with pkgs; { + path = with pkgs; [ + bash + gawk + gnutar + gzip + inetutils + iproute2 + netcat + procps + pv + rsync + socat + stunnel + which + ]; + }; + services.mysql = { + enable = true; + package = mariadbPackage; + ensureDatabases = lib.mkIf isFirstClusterNode [ "testdb" ]; + ensureUsers = lib.mkIf isFirstClusterNode [ + { + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + } + ]; + initialScript = lib.mkIf isFirstClusterNode ( + pkgs.writeText "mariadb-init.sql" '' + GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; + FLUSH PRIVILEGES; + '' + ); + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "NONE"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${galeraPackage}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = + "gcomm://" + + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" + + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; + wsrep_cluster_name = "galera"; + wsrep_node_address = address; + wsrep_node_name = "galera_0${toString id}"; + wsrep_sst_method = method; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + in + { + galera_01 = mkGaleraNode { + id = 1; + method = "mariabackup"; + }; + + galera_02 = mkGaleraNode { + id = 2; + method = "mariabackup"; + }; + + galera_03 = mkGaleraNode { + id = 3; + method = "mariabackup"; + }; + + galera_04 = mkGaleraNode { + id = 4; + method = "rsync"; + }; + + galera_05 = mkGaleraNode { + id = 5; + method = "rsync"; + }; + + galera_06 = mkGaleraNode { + id = 6; + method = "rsync"; + }; + + }; + + testScript = '' + galera_01.start() + galera_01.wait_for_unit("mysql") + galera_01.wait_for_open_port(3306) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" + ) + galera_02.start() + galera_02.wait_for_unit("mysql") + galera_02.wait_for_open_port(3306) + galera_03.start() + galera_03.wait_for_unit("mysql") + galera_03.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_02.succeed("systemctl stop mysql") + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" + ) + galera_02.succeed("systemctl start mysql") + galera_02.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" + ) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") + galera_01.crash() + galera_02.crash() + galera_03.crash() + + galera_04.start() + galera_04.wait_for_unit("mysql") + galera_04.wait_for_open_port(3306) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" + ) + galera_05.start() + galera_05.wait_for_unit("mysql") + galera_05.wait_for_open_port(3306) + galera_06.start() + galera_06.wait_for_unit("mysql") + galera_06.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_05.succeed("systemctl stop mysql") + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" + ) + galera_05.succeed("systemctl start mysql") + galera_05.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" + ) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") + ''; }; - - # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, - # and checking the table's presence on the other node. - nodes = let - mkGaleraNode = { - id, - method - }: let - address = "192.168.1.${toString id}"; - isFirstClusterNode = id == 1 || id == 4; - in { - users = { - users.testuser = { - isSystemUser = true; - group = "testusers"; - }; - groups.testusers = { }; - }; - - networking = { - interfaces.eth1 = { - ipv4.addresses = [ - { inherit address; prefixLength = 24; } - ]; - }; - extraHosts = lib.concatMapStringsSep "\n" (i: "192.168.1.${toString i} galera_0${toString i}") (lib.range 1 6); - firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; - firewall.allowedUDPPorts = [ 4567 ]; - }; - systemd.services.mysql = with pkgs; { - path = with pkgs; [ - bash - gawk - gnutar - gzip - inetutils - iproute2 - netcat - procps - pv - rsync - socat - stunnel - which - ]; - }; - services.mysql = { - enable = true; - package = mariadbPackage; - ensureDatabases = lib.mkIf isFirstClusterNode [ "testdb" ]; - ensureUsers = lib.mkIf isFirstClusterNode [{ - name = "testuser"; - ensurePermissions = { - "testdb.*" = "ALL PRIVILEGES"; - }; - }]; - initialScript = lib.mkIf isFirstClusterNode (pkgs.writeText "mariadb-init.sql" '' - GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; - FLUSH PRIVILEGES; - ''); - settings = { - mysqld = { - bind_address = "0.0.0.0"; - }; - galera = { - wsrep_on = "ON"; - wsrep_debug = "NONE"; - wsrep_retry_autocommit = "3"; - wsrep_provider = "${galeraPackage}/lib/galera/libgalera_smm.so"; - wsrep_cluster_address = "gcomm://" - + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" - + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; - wsrep_cluster_name = "galera"; - wsrep_node_address = address; - wsrep_node_name = "galera_0${toString id}"; - wsrep_sst_method = method; - wsrep_sst_auth = "check_repl:check_pass"; - binlog_format = "ROW"; - enforce_storage_engine = "InnoDB"; - innodb_autoinc_lock_mode = "2"; - }; - }; - }; - }; - in { - galera_01 = mkGaleraNode { - id = 1; - method = "mariabackup"; - }; - - galera_02 = mkGaleraNode { - id = 2; - method = "mariabackup"; - }; - - galera_03 = mkGaleraNode { - id = 3; - method = "mariabackup"; - }; - - galera_04 = mkGaleraNode { - id = 4; - method = "rsync"; - }; - - galera_05 = mkGaleraNode { - id = 5; - method = "rsync"; - }; - - galera_06 = mkGaleraNode { - id = 6; - method = "rsync"; - }; - - }; - - testScript = '' - galera_01.start() - galera_01.wait_for_unit("mysql") - galera_01.wait_for_open_port(3306) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" - ) - galera_02.start() - galera_02.wait_for_unit("mysql") - galera_02.wait_for_open_port(3306) - galera_03.start() - galera_03.wait_for_unit("mysql") - galera_03.wait_for_open_port(3306) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" - ) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_02.succeed("systemctl stop mysql") - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" - ) - galera_02.succeed("systemctl start mysql") - galera_02.wait_for_open_port(3306) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" - ) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" - ) - galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") - galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") - galera_01.crash() - galera_02.crash() - galera_03.crash() - - galera_04.start() - galera_04.wait_for_unit("mysql") - galera_04.wait_for_open_port(3306) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" - ) - galera_05.start() - galera_05.wait_for_unit("mysql") - galera_05.wait_for_open_port(3306) - galera_06.start() - galera_06.wait_for_unit("mysql") - galera_06.wait_for_open_port(3306) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" - ) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_05.succeed("systemctl stop mysql") - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" - ) - galera_05.succeed("systemctl start mysql") - galera_05.wait_for_open_port(3306) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" - ) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" - ) - galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") - galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") - ''; - }; in - lib.mapAttrs (_: mariadbPackage: makeGaleraTest { inherit mariadbPackage; }) mariadbPackages +lib.mapAttrs (_: mariadbPackage: makeGaleraTest { inherit mariadbPackage; }) mariadbPackages diff --git a/third_party/nixpkgs/nixos/tests/mysql/mysql-autobackup.nix b/third_party/nixpkgs/nixos/tests/mysql/mysql-autobackup.nix index b49466db0a..80dbb47adc 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mysql-autobackup.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mysql-autobackup.nix @@ -1,8 +1,8 @@ { system ? builtins.currentSystem, - config ? {}, + config ? { }, pkgs ? import ../../.. { inherit system config; }, - lib ? pkgs.lib + lib ? pkgs.lib, }: let @@ -10,44 +10,52 @@ let makeTest = import ./../make-test-python.nix; - makeAutobackupTest = { - package, - name ? mkTestName package, - }: makeTest { - name = "${name}-automysqlbackup"; - meta.maintainers = [ lib.maintainers.aanderse ]; + makeAutobackupTest = + { + package, + name ? mkTestName package, + }: + makeTest { + name = "${name}-automysqlbackup"; + meta.maintainers = [ lib.maintainers.aanderse ]; - nodes.machine = { - services.mysql = { - inherit package; - enable = true; - initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + nodes.machine = { + services.mysql = { + inherit package; + enable = true; + initialDatabases = [ + { + name = "testdb"; + schema = ./testdb.sql; + } + ]; + }; + + services.automysqlbackup.enable = true; + automysqlbackup.settings.mysql_dump_port = ""; }; - services.automysqlbackup.enable = true; - }; + testScript = '' + start_all() - testScript = '' - start_all() + # Need to have mysql started so that it can be populated with data. + machine.wait_for_unit("mysql.service") - # Need to have mysql started so that it can be populated with data. - machine.wait_for_unit("mysql.service") + with subtest("Wait for testdb to be fully populated (5 rows)."): + machine.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) - with subtest("Wait for testdb to be fully populated (5 rows)."): - machine.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) + with subtest("Do a backup and wait for it to start"): + machine.start_job("automysqlbackup.service") + machine.wait_for_job("automysqlbackup.service") - with subtest("Do a backup and wait for it to start"): - machine.start_job("automysqlbackup.service") - machine.wait_for_job("automysqlbackup.service") - - with subtest("wait for backup file and check that data appears in backup"): - machine.wait_for_file("/var/backup/mysql/daily/testdb") - machine.succeed( - "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" - ) + with subtest("wait for backup file and check that data appears in backup"): + machine.wait_for_file("/var/backup/mysql/daily/testdb") + machine.succeed( + "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" + ) ''; - }; + }; in - lib.mapAttrs (_: package: makeAutobackupTest { inherit package; }) mariadbPackages +lib.mapAttrs (_: package: makeAutobackupTest { inherit package; }) mariadbPackages diff --git a/third_party/nixpkgs/nixos/tests/playwright-python.nix b/third_party/nixpkgs/nixos/tests/playwright-python.nix new file mode 100644 index 0000000000..0a5deecbb5 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/playwright-python.nix @@ -0,0 +1,58 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + { + name = "playwright-python"; + + meta = with pkgs.lib.maintainers; { + maintainers = [ phaer ]; + }; + + nodes.machine = + { pkgs, ... }: + { + environment.variables = { + NIX_MANUAL_DOCROOT = "file://${pkgs.nix.doc}/share/doc/nix/manual/index.html"; + PLAYWRIGHT_BROWSERS_PATH = pkgs.playwright-driver.browsers; + }; + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "test_playwright" + { + libraries = [ pkgs.python3Packages.playwright ]; + } + '' + import sys + from playwright.sync_api import sync_playwright + from playwright.sync_api import expect + + browsers = { + "chromium": ["--headless", "--disable-gpu"], + "firefox": [], + "webkit": [] + } + if len(sys.argv) != 3 or sys.argv[1] not in browsers.keys(): + print(f"usage: {sys.argv[0]} [{'|'.join(browsers.keys())}] ") + sys.exit(1) + browser_name = sys.argv[1] + url = sys.argv[2] + browser_args = browsers.get(browser_name) + print(f"Running test on {browser_name} {' '.join(browser_args)}") + with sync_playwright() as p: + browser = getattr(p, browser_name).launch(args=browser_args) + context = browser.new_context() + page = context.new_page() + page.goto(url) + expect(page.get_by_text("Nix Reference Manual")).to_be_visible() + '' + ) + ]; + }; + + testScript = '' + # FIXME: Webkit segfaults + for browser in ["firefox", "chromium"]: + with subtest(f"Render Nix Manual in {browser}"): + machine.succeed(f"test_playwright {browser} $NIX_MANUAL_DOCROOT") + ''; + + } +) diff --git a/third_party/nixpkgs/nixos/tests/postgresql-wal2json.nix b/third_party/nixpkgs/nixos/tests/postgresql-wal2json.nix new file mode 100644 index 0000000000..043ad48cbc --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql-wal2json.nix @@ -0,0 +1,60 @@ +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../.. { inherit system config; }, + postgresql ? null, +}: + +let + makeTest = import ./make-test-python.nix; + # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. + makeTestAttribute = name: { + inherit name; + value = makePostgresqlWal2jsonTest pkgs."${name}"; + }; + + makePostgresqlWal2jsonTest = + postgresqlPackage: + makeTest { + name = "postgresql-wal2json-${postgresqlPackage.name}"; + meta.maintainers = with pkgs.lib.maintainers; [ euank ]; + + nodes.machine = { + services.postgresql = { + package = postgresqlPackage; + enable = true; + extraPlugins = with postgresqlPackage.pkgs; [ wal2json ]; + settings = { + wal_level = "logical"; + max_replication_slots = "10"; + max_wal_senders = "10"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("postgresql") + machine.succeed( + "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example2.sql} postgres > /tmp/example2.out" + ) + machine.succeed( + "diff ${./postgresql/wal2json/example2.out} /tmp/example2.out" + ) + machine.succeed( + "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example3.sql} postgres > /tmp/example3.out" + ) + machine.succeed( + "diff ${./postgresql/wal2json/example3.out} /tmp/example3.out" + ) + ''; + }; + +in +# By default, create one test per postgresql version +if postgresql == null then + builtins.listToAttrs ( + map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs)) + ) +# but if postgresql is set, we're being made as a passthru test for a specific postgres + wal2json version, just run one +else + makePostgresqlWal2jsonTest postgresql diff --git a/third_party/nixpkgs/nixos/tests/postgresql/wal2json/LICENSE b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/LICENSE new file mode 100644 index 0000000000..e3e82163fc --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2013-2024, Euler Taveira de Oliveira +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +* Neither the name of the Euler Taveira de Oliveira nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/third_party/nixpkgs/nixos/tests/postgresql/wal2json/README.md b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/README.md new file mode 100644 index 0000000000..796bf810d7 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/README.md @@ -0,0 +1,11 @@ +Data in this folder taken from the wal2json README's examples [here](https://github.com/eulerto/wal2json/tree/75629c2e1e81a12350cc9d63782fc53252185d8d#sql-functions) + +They are used under the terms of the BSD-3 License, a copy of which is included +in this directory. + +These files have been lightly modified in order to make their output more reproducible. + +Changes: +- `\o /dev/null` has been added before commands that print LSNs since LSNs aren't reproducible +- `now()` has been replaced with a hardcoded timestamp string for reproducibility +- The test is run with `--quiet`, and the expected output has been trimmed accordingly diff --git a/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example2.out b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example2.out new file mode 100644 index 0000000000..0a089e1122 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example2.out @@ -0,0 +1,74 @@ +init +{ + "change": [ + { + "kind": "message", + "transactional": false, + "prefix": "wal2json", + "content": "this non-transactional message will be delivered even if you rollback the transaction" + } + ] +} +{ + "change": [ + { + "kind": "insert", + "schema": "public", + "table": "table2_with_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "character varying(30)", "timestamp without time zone"], + "columnvalues": [1, "Backup and Restore", "2018-03-27 12:05:29.914496"] + } + ,{ + "kind": "insert", + "schema": "public", + "table": "table2_with_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "character varying(30)", "timestamp without time zone"], + "columnvalues": [2, "Tuning", "2018-03-27 12:05:29.914496"] + } + ,{ + "kind": "insert", + "schema": "public", + "table": "table2_with_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "character varying(30)", "timestamp without time zone"], + "columnvalues": [3, "Replication", "2018-03-27 12:05:29.914496"] + } + ,{ + "kind": "message", + "transactional": true, + "prefix": "wal2json", + "content": "this message will be delivered" + } + ,{ + "kind": "delete", + "schema": "public", + "table": "table2_with_pk", + "oldkeys": { + "keynames": ["a", "c"], + "keytypes": ["integer", "timestamp without time zone"], + "keyvalues": [1, "2018-03-27 12:05:29.914496"] + } + } + ,{ + "kind": "delete", + "schema": "public", + "table": "table2_with_pk", + "oldkeys": { + "keynames": ["a", "c"], + "keytypes": ["integer", "timestamp without time zone"], + "keyvalues": [2, "2018-03-27 12:05:29.914496"] + } + } + ,{ + "kind": "insert", + "schema": "public", + "table": "table2_without_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "numeric(5,2)", "text"], + "columnvalues": [1, 2.34, "Tapir"] + } + ] +} +stop diff --git a/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example2.sql b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example2.sql new file mode 100644 index 0000000000..ec474381bb --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example2.sql @@ -0,0 +1,31 @@ +CREATE TABLE table2_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c)); +CREATE TABLE table2_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT); + +SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json'); + +BEGIN; +INSERT INTO table2_with_pk (b, c) VALUES('Backup and Restore', '2018-03-27 12:05:29.914496'); +INSERT INTO table2_with_pk (b, c) VALUES('Tuning', '2018-03-27 12:05:29.914496'); +INSERT INTO table2_with_pk (b, c) VALUES('Replication', '2018-03-27 12:05:29.914496'); + +-- Avoid printing wal LSNs since they're not reproducible, so harder to assert on +\o /dev/null +SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered'); +SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered'); +\o + +DELETE FROM table2_with_pk WHERE a < 3; +\o /dev/null +SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction'); +\o + +INSERT INTO table2_without_pk (b, c) VALUES(2.34, 'Tapir'); +-- it is not added to stream because there isn't a pk or a replica identity +UPDATE table2_without_pk SET c = 'Anta' WHERE c = 'Tapir'; +COMMIT; + +SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'pretty-print', '1', 'add-msg-prefixes', 'wal2json'); +SELECT 'stop' FROM pg_drop_replication_slot('test_slot'); + +DROP TABLE table2_with_pk; +DROP TABLE table2_without_pk; diff --git a/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example3.out b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example3.out new file mode 100644 index 0000000000..e20d2a8aef --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example3.out @@ -0,0 +1,12 @@ +init +{"action":"M","transactional":false,"prefix":"wal2json","content":"this non-transactional message will be delivered even if you rollback the transaction"} +{"action":"B"} +{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"character varying(30)","value":"Backup and Restore"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":2},{"name":"b","type":"character varying(30)","value":"Tuning"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":3},{"name":"b","type":"character varying(30)","value":"Replication"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"M","transactional":true,"prefix":"wal2json","content":"this message will be delivered"} +{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":1},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":2},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"I","schema":"public","table":"table3_without_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"numeric(5,2)","value":2.34},{"name":"c","type":"text","value":"Tapir"}]} +{"action":"C"} +stop diff --git a/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example3.sql b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example3.sql new file mode 100644 index 0000000000..6d94e261f5 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql/wal2json/example3.sql @@ -0,0 +1,26 @@ +CREATE TABLE table3_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c)); +CREATE TABLE table3_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT); + +SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json'); + +BEGIN; +INSERT INTO table3_with_pk (b, c) VALUES('Backup and Restore', '2019-12-29 04:58:34.806671'); +INSERT INTO table3_with_pk (b, c) VALUES('Tuning', '2019-12-29 04:58:34.806671'); +INSERT INTO table3_with_pk (b, c) VALUES('Replication', '2019-12-29 04:58:34.806671'); +\o /dev/null +SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered'); +SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered'); +DELETE FROM table3_with_pk WHERE a < 3; +SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction'); +\o + +INSERT INTO table3_without_pk (b, c) VALUES(2.34, 'Tapir'); +-- it is not added to stream because there isn't a pk or a replica identity +UPDATE table3_without_pk SET c = 'Anta' WHERE c = 'Tapir'; +COMMIT; + +SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'format-version', '2', 'add-msg-prefixes', 'wal2json'); +SELECT 'stop' FROM pg_drop_replication_slot('test_slot'); + +DROP TABLE table3_with_pk; +DROP TABLE table3_without_pk; diff --git a/third_party/nixpkgs/nixos/tests/pulseaudio.nix b/third_party/nixpkgs/nixos/tests/pulseaudio.nix index dc8e33ccd5..ccc33f28bc 100644 --- a/third_party/nixpkgs/nixos/tests/pulseaudio.nix +++ b/third_party/nixpkgs/nixos/tests/pulseaudio.nix @@ -40,7 +40,7 @@ let }; environment.systemPackages = [ testers.testPlay pkgs.pavucontrol ] - ++ lib.optional pkgs.stdenv.isx86_64 testers.testPlay32; + ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 testers.testPlay32; } // lib.optionalAttrs systemWide { users.users.alice.extraGroups = [ "pulse-access" ]; systemd.services.pulseaudio.wantedBy = [ "multi-user.target" ]; @@ -54,7 +54,7 @@ let machine.send_chars("testPlay \n") machine.wait_for_file("/tmp/testPlay_success") - ${lib.optionalString pkgs.stdenv.isx86_64 '' + ${lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 '' machine.send_chars("testPlay32 \n") machine.wait_for_file("/tmp/testPlay32_success") ''} diff --git a/third_party/nixpkgs/nixos/tests/replace-dependencies/default.nix b/third_party/nixpkgs/nixos/tests/replace-dependencies/default.nix new file mode 100644 index 0000000000..ce0013a868 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/replace-dependencies/default.nix @@ -0,0 +1,19 @@ +import ../make-test-python.nix ( + { pkgs, ... }: + { + name = "replace-dependencies"; + meta.maintainers = with pkgs.lib.maintainers; [ alois31 ]; + + nodes.machine = + { ... }: + { + nix.settings.experimental-features = [ "ca-derivations" ]; + system.extraDependencies = [ pkgs.stdenvNoCC ]; + }; + + testScript = '' + start_all() + machine.succeed("nix-build --option substitute false ${pkgs.path}/nixos/tests/replace-dependencies/guest.nix") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/replace-dependencies/guest.nix b/third_party/nixpkgs/nixos/tests/replace-dependencies/guest.nix new file mode 100644 index 0000000000..f022f17285 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/replace-dependencies/guest.nix @@ -0,0 +1,149 @@ +# This needs to be run in a NixOS test, because Hydra cannot do IFD. +let + pkgs = import ../../.. { }; + inherit (pkgs) + runCommand + writeShellScriptBin + replaceDependency + replaceDependencies + ; + inherit (pkgs.lib) escapeShellArg; + mkCheckOutput = + name: test: output: + runCommand name { } '' + actualOutput="$(${escapeShellArg "${test}/bin/test"})" + if [ "$(${escapeShellArg "${test}/bin/test"})" != ${escapeShellArg output} ]; then + echo >&2 "mismatched output: expected \""${escapeShellArg output}"\", got \"$actualOutput\"" + exit 1 + fi + touch "$out" + ''; + oldDependency = writeShellScriptBin "dependency" '' + echo "got old dependency" + ''; + oldDependency-ca = oldDependency.overrideAttrs { __contentAddressed = true; }; + newDependency = writeShellScriptBin "dependency" '' + echo "got new dependency" + ''; + newDependency-ca = newDependency.overrideAttrs { __contentAddressed = true; }; + basic = writeShellScriptBin "test" '' + ${oldDependency}/bin/dependency + ''; + basic-ca = writeShellScriptBin "test" '' + ${oldDependency-ca}/bin/dependency + ''; + transitive = writeShellScriptBin "test" '' + ${basic}/bin/test + ''; + weirdDependency = writeShellScriptBin "dependency" '' + echo "got weird dependency" + ${basic}/bin/test + ''; + oldDependency1 = writeShellScriptBin "dependency1" '' + echo "got old dependency 1" + ''; + newDependency1 = writeShellScriptBin "dependency1" '' + echo "got new dependency 1" + ''; + oldDependency2 = writeShellScriptBin "dependency2" '' + ${oldDependency1}/bin/dependency1 + echo "got old dependency 2" + ''; + newDependency2 = writeShellScriptBin "dependency2" '' + ${oldDependency1}/bin/dependency1 + echo "got new dependency 2" + ''; + deep = writeShellScriptBin "test" '' + ${oldDependency2}/bin/dependency2 + ''; +in +{ + replacedependency-basic = mkCheckOutput "replacedependency-basic" (replaceDependency { + drv = basic; + inherit oldDependency newDependency; + }) "got new dependency"; + + replacedependency-basic-old-ca = mkCheckOutput "replacedependency-basic" (replaceDependency { + drv = basic-ca; + oldDependency = oldDependency-ca; + inherit newDependency; + }) "got new dependency"; + + replacedependency-basic-new-ca = mkCheckOutput "replacedependency-basic" (replaceDependency { + drv = basic; + inherit oldDependency; + newDependency = newDependency-ca; + }) "got new dependency"; + + replacedependency-transitive = mkCheckOutput "replacedependency-transitive" (replaceDependency { + drv = transitive; + inherit oldDependency newDependency; + }) "got new dependency"; + + replacedependency-weird = + mkCheckOutput "replacedependency-weird" + (replaceDependency { + drv = basic; + inherit oldDependency; + newDependency = weirdDependency; + }) + '' + got weird dependency + got old dependency''; + + replacedependencies-precedence = mkCheckOutput "replacedependencies-precedence" (replaceDependencies + { + drv = basic; + replacements = [ { inherit oldDependency newDependency; } ]; + cutoffPackages = [ oldDependency ]; + } + ) "got new dependency"; + + replacedependencies-self = mkCheckOutput "replacedependencies-self" (replaceDependencies { + drv = basic; + replacements = [ + { + inherit oldDependency; + newDependency = oldDependency; + } + ]; + }) "got old dependency"; + + replacedependencies-deep-order1 = + mkCheckOutput "replacedependencies-deep-order1" + (replaceDependencies { + drv = deep; + replacements = [ + { + oldDependency = oldDependency1; + newDependency = newDependency1; + } + { + oldDependency = oldDependency2; + newDependency = newDependency2; + } + ]; + }) + '' + got new dependency 1 + got new dependency 2''; + + replacedependencies-deep-order2 = + mkCheckOutput "replacedependencies-deep-order2" + (replaceDependencies { + drv = deep; + replacements = [ + { + oldDependency = oldDependency2; + newDependency = newDependency2; + } + { + oldDependency = oldDependency1; + newDependency = newDependency1; + } + ]; + }) + '' + got new dependency 1 + got new dependency 2''; +} diff --git a/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/bootstrap.sh b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/bootstrap.sh new file mode 100644 index 0000000000..3e2f7da074 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/bootstrap.sh @@ -0,0 +1,73 @@ +set -euo pipefail + +mkdir /tmp/tutorial-scion-certs && cd /tmp/tutorial-scion-certs +mkdir AS{1..5} + +# Create voting and root keys and (self-signed) certificates for core ASes +pushd AS1 +scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key +scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 regular voting cert"}') regular-voting.pem regular-voting.key +scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 cp root cert"}') cp-root.pem cp-root.key +popd + +pushd AS2 +scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 cp root cert"}') cp-root.pem cp-root.key +popd + +pushd AS3 +scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key +scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 regular voting cert"}') regular-voting.pem regular-voting.key +popd + +# Create the TRC (Trust Root Configuration) +mkdir tmp +echo ' +isd = 42 +description = "Demo ISD 42" +serial_version = 1 +base_version = 1 +voting_quorum = 2 + +core_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] +authoritative_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] +cert_files = ["AS1/sensitive-voting.pem", "AS1/regular-voting.pem", "AS1/cp-root.pem", "AS2/cp-root.pem", "AS3/sensitive-voting.pem", "AS3/regular-voting.pem"] + +[validity] +not_before = '$(date +%s)' +validity = "365d"' \ +> trc-B1-S1-pld.tmpl + +scion-pki trc payload --out=tmp/ISD42-B1-S1.pld.der --template trc-B1-S1-pld.tmpl +rm trc-B1-S1-pld.tmpl + +# Sign and bundle the TRC +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-sensitive.trc +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-regular.trc +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-sensitive.trc +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-regular.trc + +scion-pki trc combine tmp/ISD42-B1-S1.AS{1,3}-{sensitive,regular}.trc --payload tmp/ISD42-B1-S1.pld.der --out ISD42-B1-S1.trc +rm tmp -r + +# Create CA key and certificate for issuing ASes +pushd AS1 +scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key +popd +pushd AS2 +scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key +popd + +# Create AS key and certificate chains +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 AS cert"}') AS1/cp-as.pem AS1/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 AS cert"}') AS2/cp-as.pem AS2/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 AS cert"}') AS3/cp-as.pem AS3/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:4", "common_name": "42-ffaa:1:4 AS cert"}') AS4/cp-as.pem AS4/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:5", "common_name": "42-ffaa:1:5 AS cert"}') AS5/cp-as.pem AS5/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle + +for i in {1..5} +do + mkdir -p $out/AS$i + cp AS$i/cp-as.{key,pem} $out/AS$i +done + +mv *.trc $out diff --git a/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/default.nix b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/default.nix index e060f9c312..55b2322ab0 100644 --- a/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/default.nix +++ b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/default.nix @@ -5,81 +5,8 @@ let buildInputs = [ pkgs.scion ]; - } '' - set -euo pipefail + } (builtins.readFile ./bootstrap.sh); - mkdir /tmp/tutorial-scion-certs && cd /tmp/tutorial-scion-certs - mkdir AS{1..5} - - # Create voting and root keys and (self-signed) certificates for core ASes - pushd AS1 - scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key - scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 regular voting cert"}') regular-voting.pem regular-voting.key - scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 cp root cert"}') cp-root.pem cp-root.key - popd - - pushd AS2 - scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 cp root cert"}') cp-root.pem cp-root.key - popd - - pushd AS3 - scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key - scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 regular voting cert"}') regular-voting.pem regular-voting.key - popd - - # Create the TRC (Trust Root Configuration) - mkdir tmp - echo ' - isd = 42 - description = "Demo ISD 42" - serial_version = 1 - base_version = 1 - voting_quorum = 2 - - core_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] - authoritative_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] - cert_files = ["AS1/sensitive-voting.pem", "AS1/regular-voting.pem", "AS1/cp-root.pem", "AS2/cp-root.pem", "AS3/sensitive-voting.pem", "AS3/regular-voting.pem"] - - [validity] - not_before = '$(date +%s)' - validity = "365d"' \ - > trc-B1-S1-pld.tmpl - - scion-pki trc payload --out=tmp/ISD42-B1-S1.pld.der --template trc-B1-S1-pld.tmpl - rm trc-B1-S1-pld.tmpl - - # Sign and bundle the TRC - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-sensitive.trc - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-regular.trc - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-sensitive.trc - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-regular.trc - - scion-pki trc combine tmp/ISD42-B1-S1.AS{1,3}-{sensitive,regular}.trc --payload tmp/ISD42-B1-S1.pld.der --out ISD42-B1-S1.trc - rm tmp -r - - # Create CA key and certificate for issuing ASes - pushd AS1 - scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key - popd - pushd AS2 - scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key - popd - - # Create AS key and certificate chains - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 AS cert"}') AS1/cp-as.pem AS1/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 AS cert"}') AS2/cp-as.pem AS2/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 AS cert"}') AS3/cp-as.pem AS3/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:4", "common_name": "42-ffaa:1:4 AS cert"}') AS4/cp-as.pem AS4/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:5", "common_name": "42-ffaa:1:5 AS cert"}') AS5/cp-as.pem AS5/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle - - for i in {1..5} - do - mkdir -p $out/AS$i - cp AS$i/cp-as.{key,pem} $out/AS$i - done - - mv *.trc $out - ''; imports = hostId: [ ({ services.scion = { @@ -121,9 +48,47 @@ in }; scion04 = { ... }: { imports = (imports 4); + networking.interfaces."lo".ipv4.addresses = [{ address = "172.16.1.1"; prefixLength = 32; }]; + services.scion.scion-ip-gateway = { + enable = true; + config = { + tunnel = { + src_ipv4 = "172.16.1.1"; + }; + }; + trafficConfig = { + ASes = { + "42-ffaa:1:5" = { + Nets = [ + "172.16.100.0/24" + ]; + }; + }; + ConfigVersion = 9001; + }; + }; }; scion05 = { ... }: { imports = (imports 5); + networking.interfaces."lo".ipv4.addresses = [{ address = "172.16.100.1"; prefixLength = 32; }]; + services.scion.scion-ip-gateway = { + enable = true; + config = { + tunnel = { + src_ipv4 = "172.16.100.1"; + }; + }; + trafficConfig = { + ASes = { + "42-ffaa:1:4" = { + Nets = [ + "172.16.1.0/24" + ]; + }; + }; + ConfigVersion = 9001; + }; + }; }; }; testScript = let @@ -131,25 +96,35 @@ in addresses="42-ffaa:1:1 42-ffaa:1:2 42-ffaa:1:3 42-ffaa:1:4 42-ffaa:1:5" timeout=100 wait_for_all() { + ret=0 for as in "$@" do scion showpaths $as --no-probe > /dev/null - return 1 + ret=$? + if [ "$ret" -ne "0" ]; then + break + fi done - return 0 + return $ret } ping_all() { + ret=0 for as in "$@" do scion ping "$as,127.0.0.1" -c 3 + ret=$? + if [ "$ret" -ne "0" ]; then + break + fi done - return 0 + return $ret } for i in $(seq 0 $timeout); do - wait_for_all $addresses && exit 0 - ping_all $addresses && exit 0 sleep 1 + wait_for_all $addresses || continue + ping_all $addresses && exit 0 done + exit 1 ''; in '' @@ -183,9 +158,16 @@ in # Wait for scion-control.service on all instances wait_for_unit("scion-control.service") + # Ensure cert is valid against TRC + succeed("scion-pki certificate verify --trc /etc/scion/certs/*.trc /etc/scion/crypto/as/*.pem >&2") + # Execute pingAll command on all instances succeed("${pingAll} >&2") + # Execute ICMP pings across scion-ip-gateway + scion04.succeed("ping -c 3 172.16.100.1 >&2") + scion05.succeed("ping -c 3 172.16.1.1 >&2") + # Restart all scion services and ping again to test robustness succeed("systemctl restart scion-* >&2") succeed("${pingAll} >&2") diff --git a/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology4.json b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology4.json index 03c507a4da..0526c1f1ed 100644 --- a/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology4.json +++ b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology4.json @@ -36,5 +36,11 @@ } } } + }, + "sigs": { + "sig-1": { + "ctrl_addr": "127.0.0.1:30256", + "data_addr": "127.0.0.1:30056" + } } } diff --git a/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology5.json b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology5.json index 6114c1f73c..1326bd3c29 100644 --- a/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology5.json +++ b/third_party/nixpkgs/nixos/tests/scion/freestanding-deployment/topology5.json @@ -36,5 +36,11 @@ } } } + }, + "sigs": { + "sig-1": { + "ctrl_addr": "127.0.0.1:30256", + "data_addr": "127.0.0.1:30056" + } } } diff --git a/third_party/nixpkgs/nixos/tests/stub-ld.nix b/third_party/nixpkgs/nixos/tests/stub-ld.nix index 72b0aebf3e..f34e082cfd 100644 --- a/third_party/nixpkgs/nixos/tests/stub-ld.nix +++ b/third_party/nixpkgs/nixos/tests/stub-ld.nix @@ -18,7 +18,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { libDir = pkgs.stdenv.hostPlatform.libDir; ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker); - check32 = pkgs.stdenv.isx86_64; + check32 = pkgs.stdenv.hostPlatform.isx86_64; pkgs32 = pkgs.pkgsi686Linux; libDir32 = pkgs32.stdenv.hostPlatform.libDir; diff --git a/third_party/nixpkgs/nixos/tests/sunshine.nix b/third_party/nixpkgs/nixos/tests/sunshine.nix index 7c7e86de20..a1207bfa49 100644 --- a/third_party/nixpkgs/nixos/tests/sunshine.nix +++ b/third_party/nixpkgs/nixos/tests/sunshine.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "sunshine"; meta = { # test is flaky on aarch64 - broken = pkgs.stdenv.isAarch64; + broken = pkgs.stdenv.hostPlatform.isAarch64; maintainers = [ lib.maintainers.devusb ]; }; diff --git a/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix b/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix index 555a8bb43b..40ea4905ec 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix @@ -16,7 +16,7 @@ let imports = [ ../modules/profiles/minimal.nix ]; - system.stateVersion = config.system.nixos.version; + system.stateVersion = config.system.nixos.release; }; containerSystem = (import ../lib/eval-config.nix { diff --git a/third_party/nixpkgs/nixos/tests/terminal-emulators.nix b/third_party/nixpkgs/nixos/tests/terminal-emulators.nix index 3cf99fe7fc..9195f619c8 100644 --- a/third_party/nixpkgs/nixos/tests/terminal-emulators.nix +++ b/third_party/nixpkgs/nixos/tests/terminal-emulators.nix @@ -62,6 +62,9 @@ let tests = { konsole.pkg = p: p.plasma5Packages.konsole; lomiri-terminal-app.pkg = p: p.lomiri.lomiri-terminal-app; + # after recent Mesa change, borked software rendering config under x86_64 icewm? + # BGR colour display on x86_64, RGB on aarch64 + lomiri-terminal-app.colourTest = false; lxterminal.pkg = p: p.lxterminal; @@ -117,6 +120,8 @@ let tests = { xfce4-terminal.pkg = p: p.xfce.xfce4-terminal; xterm.pkg = p: p.xterm; + + zutty.pkg = p: p.zutty; }; in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest { diff --git a/third_party/nixpkgs/nixos/tests/turn-rs.nix b/third_party/nixpkgs/nixos/tests/turn-rs.nix new file mode 100644 index 0000000000..750a141c22 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/turn-rs.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + { + name = "turn-rs"; + + nodes = { + server = { + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.1/24"; + }; + + services.turn-rs = { + enable = true; + secretFile = pkgs.writeText "secret" '' + USER_1_CREDS="foobar" + ''; + settings = { + turn = { + realm = "localhost"; + interfaces = [ + { + transport = "udp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + { + transport = "tcp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + ]; + }; + + auth.static_credentials.user1 = "$USER_1_CREDS"; + }; + }; + }; + }; + + testScript = # python + '' + import json + + start_all() + server.wait_for_unit('turn-rs.service') + server.wait_for_open_port(3000, "127.0.0.1") + + info = server.succeed('curl http://localhost:3000/info') + jsonInfo = json.loads(info) + assert len(jsonInfo['interfaces']) == 2, f'Interfaces doesn\'t contain two entries:\n{json.dumps(jsonInfo, indent=2)}' + + config = server.succeed('cat /run/turn-rs/config.toml') + assert 'foobar' in config, f'Secrets are not properly injected:\n{config}' + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/web-apps/immich.nix b/third_party/nixpkgs/nixos/tests/web-apps/immich.nix new file mode 100644 index 0000000000..f03b9290f7 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/web-apps/immich.nix @@ -0,0 +1,51 @@ +import ../make-test-python.nix ( + { ... }: + { + name = "immich-nixos"; + + nodes.machine = + { pkgs, ... }: + { + # These tests need a little more juice + virtualisation = { + cores = 2; + memorySize = 2048; + diskSize = 4096; + }; + + environment.systemPackages = with pkgs; [ immich-cli ]; + + services.immich = { + enable = true; + environment.IMMICH_LOG_LEVEL = "verbose"; + }; + }; + + testScript = '' + import json + + machine.wait_for_unit("immich-server.service") + + machine.wait_for_open_port(3001) # Server + machine.wait_for_open_port(3003) # Machine learning + machine.succeed("curl --fail http://localhost:3001/") + + machine.succeed(""" + curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:3001/api/auth/admin-sign-up + """) + res = machine.succeed(""" + curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:3001/api/auth/login + """) + token = json.loads(res)['accessToken'] + + res = machine.succeed(""" + curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:3001/api/api-keys + """ % token) + key = json.loads(res)['secret'] + + machine.succeed(f"immich login http://localhost:3001/api {key}") + res = machine.succeed("immich server-info") + print(res) + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/wine.nix b/third_party/nixpkgs/nixos/tests/wine.nix index 7cbe7ac94f..7fc98c23c0 100644 --- a/third_party/nixpkgs/nixos/tests/wine.nix +++ b/third_party/nixpkgs/nixos/tests/wine.nix @@ -43,7 +43,7 @@ let in listToAttrs ( map (makeWineTest "winePackages" [ hello32 ]) variants - ++ optionals pkgs.stdenv.is64bit + ++ optionals pkgs.stdenv.hostPlatform.is64bit (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) # This wayland combination times out after spending many hours. # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux diff --git a/third_party/nixpkgs/nixos/tests/wordpress.nix b/third_party/nixpkgs/nixos/tests/wordpress.nix index 592af9a094..a2cd480302 100644 --- a/third_party/nixpkgs/nixos/tests/wordpress.nix +++ b/third_party/nixpkgs/nixos/tests/wordpress.nix @@ -11,7 +11,7 @@ rec { }; nodes = lib.foldl (a: version: let - package = pkgs."wordpress${version}"; + package = pkgs."wordpress_${version}"; in a // { "wp${version}_httpd" = _: { services.httpd.adminAddr = "webmaster@site.local"; @@ -67,7 +67,7 @@ rec { networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; }) {} [ - "6_3" "6_4" + "6_5" "6_6" ]; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix index 71b9ba358f..7ca70864b8 100644 --- a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix @@ -21,6 +21,7 @@ let enable = true; radios.wlan0 = { band = "2g"; + channel = 6; countryCode = "US"; networks = { wlan0 = { @@ -123,14 +124,16 @@ in }; testScript = '' - config_file = "/etc/static/wpa_supplicant.conf" - with subtest("Daemon is running and accepting connections"): machine.wait_for_unit("wpa_supplicant.service") status = machine.wait_until_succeeds("wpa_cli status") assert "Failed to connect" not in status, \ "Failed to connect to the daemon" + # get the configuration file + cmdline = machine.succeed("cat /proc/$(pgrep wpa)/cmdline").split('\x00') + config_file = cmdline[cmdline.index("-c") + 1] + with subtest("WPA2 fallbacks have been generated"): assert int(machine.succeed(f"grep -c sae-only {config_file}")) == 1 assert int(machine.succeed(f"grep -c mixed-wpa {config_file}")) == 2 diff --git a/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix deleted file mode 100644 index 8ec6c3e6b1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, rustPlatform -, cargo -, desktop-file-utils -, appstream-glib -, meson -, ninja -, pkg-config -, reuse -, rustc -, m4 -, wrapGAppsHook4 -, glib -, gtk4 -, gst_all_1 -, libadwaita -, dbus -}: - -stdenv.mkDerivation rec { - pname = "amberol"; - version = "0.10.3"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = pname; - rev = version; - hash = "sha256-nAoUO0bGToNGD2W8qJmTegrETOJDdM04hI1jjiYkZXI="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-4ZoliqQ665KPDFl+1eBCE+1fZgr+FA7vesPstoRs0RU="; - }; - - postPatch = '' - patchShebangs build-aux - ''; - - nativeBuildInputs = [ - appstream-glib - desktop-file-utils - meson - ninja - pkg-config - reuse - m4 - wrapGAppsHook4 - rustPlatform.cargoSetupHook - cargo - rustc - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - dbus - ]; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/amberol"; - description = "Small and simple sound and music player"; - maintainers = with maintainers; [ linsui ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "amberol"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix index f34ff19ea0..2231031d04 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { taglib ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/ario/plugins/*.dylib; do ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so done diff --git a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix index 8318a4936e..45daafa88d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; buildInputs = [ libmpdclient yaml-cpp ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix index b5d52dce18..051a1494fd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ sndio ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) libbsd; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' makeFlagsArray+=("PREFIX=$out") '' + lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) '' + (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) '' makeFlagsArray+=(LDADD="-lsndio -lbsd") # Fix warning about implicit declaration of function 'strlcpy' diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index d8d7a5429f..85ceb93f48 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -62,23 +62,23 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-fjEUo0NY/ZOujtgpWTXHLaMjzAlel3xHY+erzxLi5kQ="; + hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; }; postPatch = '' mkdir src/private substituteInPlace scripts/build/macOS/fix_bundle.py \ --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { python3 makeWrapper wrapGAppsHook3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { portaudio wavpack wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # for portaudio at-spi2-core dbus @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { libsepol libuuid util-linux - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreAudioKit # for portaudio libpng @@ -176,13 +176,13 @@ stdenv.mkDerivation rec { # Replace audacity's wrapper, to: # - put it in the right place, it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram "$out/bin/audacity" \ "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_7 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/Audacity.app $out/Applications/ makeWrapper $out/Applications/Audacity.app/Contents/MacOS/Audacity $out/bin/audacity diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 4aab7dface..841570a619 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.2"; + version = "5.2.4"; src = fetchurl { url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256:0cnjwgjbpyrb4pd0841zbhy84ps7gkmq3j148ga826nrxnw082pi"; + hash = "sha256-/JEJthaFSdad5Hj5sdBQLLyDdp2Rp4ZAlhIA+RgwXRw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix index 654d22233a..74c7708a05 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "24.05"; + version = "24.09"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-ZUJI5utUtST+idlL7WKBIs850EpK98cnmO47g8/iZcI="; + hash = "sha256-vJxKtZ0rVjf0RJfTNRxpzps1F2k0hHuiPnd1OwpULhQ="; }; prePatch = '' @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { mainProgram = "Cardinal"; platforms = lib.platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix index 51f8144ae5..68016e4a16 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null; stdenv.mkDerivation (finalAttrs: { pname = "carla"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "falkTX"; repo = "carla"; rev = "v${finalAttrs.version}"; - hash = "sha256-H15T/z/IRfgWdqToTzq2eJ7q3n9Kj44IZXsd4uaipuU="; + hash = "sha256-FM/6TtNhDml1V9C5VisjLcZ3CzXsuwCZrsoz4yP3kI8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/cd-discid/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cd-discid/default.nix index e13a64e4bd..a30ebc8fbe 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cd-discid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cd-discid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; buildInputs = [] - ++ lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cdparanoia/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cdparanoia/default.nix index 4c861a1778..bdeb8eec89 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cdparanoia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cdparanoia/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon IOKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix b/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix index 6b975b3c6b..db42e60730 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison which ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools xcbuild ]; buildInputs = [ libsndfile ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; patches = [ ./darwin-limits.patch ]; makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; - buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ]; + buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-alsa") ]; meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix index 21dd14ddc7..48289d6d37 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix @@ -9,10 +9,11 @@ appimageTools.wrapType2 rec { sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI="; }; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix index db32f85485..bef7d46a53 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -1,15 +1,15 @@ { config, lib, stdenv, fetchFromGitHub, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox -, alsaSupport ? stdenv.isLinux, alsa-lib ? null +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib ? null # simple fallback for everyone else -, aoSupport ? !stdenv.isLinux, libao ? null +, aoSupport ? !stdenv.hostPlatform.isLinux, libao ? null , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null , ossSupport ? false, alsa-oss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null , sndioSupport ? false, sndio ? null -, mprisSupport ? stdenv.isLinux, systemd ? null +, mprisSupport ? stdenv.hostPlatform.isLinux, systemd ? null # TODO: add these #, artsSupport @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] ++ lib.flatten (lib.concatMap (a: a.deps) opts); prefixKey = "prefix="; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix index 5d3a62bd2a..117356bf94 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify -, gdk-pixbuf, libnotifySupport ? stdenv.isLinux, debug ? false }: +, gdk-pixbuf, libnotifySupport ? stdenv.hostPlatform.isLinux, debug ? false }: stdenv.mkDerivation rec { pname = "cmusfm"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix index ccaacf189f..c635910359 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix @@ -31,21 +31,21 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp - ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" + ++ lib.optional stdenv.hostPlatform.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" # Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate AudioUnit CoreAudio CoreMIDI portaudio - ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen curl tcltk fltk ]); - postInstall = lib.optional stdenv.isDarwin '' + postInstall = lib.optional stdenv.hostPlatform.isDarwin '' mkdir -p $out/Library/Frameworks ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/eartag/default.nix b/third_party/nixpkgs/pkgs/applications/audio/eartag/default.nix index 11bd27953f..d3df029580 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/eartag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/eartag/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection wrapGAppsHook4 blueprint-compiler - ] ++ lib.optional stdenv.isDarwin gtk4; # for gtk4-update-icon-cache + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk4; # for gtk4-update-icon-cache buildInputs = [ librsvg diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyaudiosync/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyaudiosync/default.nix index 0b910dfb57..38fe6b15d9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easyaudiosync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easyaudiosync/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapQtAppsHook - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ qtbase @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv "easyaudiosync.app" "Easy Audio Sync.app" cp -r "Easy Audio Sync.app" $out/Applications - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 easyaudiosync $out/bin/easyaudiosync for RES in 48 64 128 256; do diff --git a/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix b/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix index 84c8333d18..5be1594343 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "LV2 EQ plugins and more, with 64 bit processing"; longDescription = '' Up to 10-Bands parametric equalizer with mono and stereo versions. diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix index f0aebf4e4a..7eabadec04 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional sonicSupport sonic - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio AudioToolbox AudioUnit @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' touch ChangeLog '' + '' ./autogen.sh @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { --replace '../src/espeak-ng --compile' "${lib.getExe buildPackages.espeak-ng} --compile" ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng wrapProgram $out/bin/espeak-ng \ --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib diff --git a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix index 8b00ca2252..1b7372d5d9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.74.6"; + version = "2.75.7"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-2qgw7pauDZBvEb5iySNiq2Fq+T+qw+AjVTwxaSQ9Eko="; + sha256 = "sha256-j5Qg/H7aMBZ6A8gh6v6+ICxmCZ7ya2tVF2FjueVtvHo="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index ff81d76892..d02f87642f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; buildInputs = [ glib libsndfile libjack2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ]; cmakeFlags = [ "-Denable-framework=off" diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 072c038e14..84de022949 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreAudio CoreMIDI diff --git a/third_party/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix b/third_party/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix index b549b6ac4f..8279bfc6b3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix @@ -25,9 +25,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index de7301e502..5625f15e3a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = lib.teams.gnome.members; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index 243fa8fa1a..d0da4ce048 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { buildInputs = [ flac - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix b/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix index 4aa93b5f70..771bef2762 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; buildInputs = [ fftwFloat zlib wavpack wxGTK32 yaml-cpp ] - ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optionals (!jackaudioSupport) [ @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { "-DINSTALL_DEPEND=OFF" ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin,lib} mv $out/GrandOrgue.app $out/Applications/ for lib in $out/Applications/GrandOrgue.app/Contents/Frameworks/lib*; do diff --git a/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix index 65d925342b..d988983dca 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GStreamer based command line media player"; homepage = "https://space.twc.de/~stefan/gst123.php"; license = lib.licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix index 8ad62eb81a..49cd0a78ed 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; mainProgram = "hivelytracker"; maintainers = with maintainers; [ fgaz ]; - broken = stdenv.isDarwin; # TODO: try to use xcbuild + broken = stdenv.hostPlatform.isDarwin; # TODO: try to use xcbuild }; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix index e54828e3cd..4d20e7a66b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4.0"; pname = "jacktrip"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-p5NXGmWIzi8M177bPzMKfXMmyMgS1qZuWHdCtBBLeDA="; + hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix index 11fb94dc08..20c40d5d9d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Audio effect processor for PipeWire clients"; mainProgram = "jamesdsp"; homepage = "https://github.com/Audio4Linux/JDSP4Linux"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix index ddaa6721df..15d69211e1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { buildInputs = [ alsa-lib ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Jellyfin terminal client"; longDescription = '' Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and diff --git a/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix index 46ece80638..c6c274f60d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix @@ -5,7 +5,7 @@ , pkg-config , stdenv , openssl -, withALSA ? stdenv.isLinux +, withALSA ? stdenv.hostPlatform.isLinux , alsa-lib , alsa-plugins , withPortAudio ? false @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; - nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix index 0c7ea944a8..900839081e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; - buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [ + buildInputs = [ sqlite ] ++ (if stdenv.hostPlatform.isDarwin then [ libiconv Security SystemConfiguration @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "shell_completion" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "systemd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix index fad1d3f15c..754bf7865f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation { buildInputs = [ SDL ] - ++ lib.optional stdenv.isDarwin Foundation - ++ lib.optional stdenv.isLinux jack2; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation + ++ lib.optional stdenv.hostPlatform.isLinux jack2; patches = [ # Remove outdated (pre-64bit) checks that would fail on modern platforms @@ -32,15 +32,15 @@ stdenv.mkDerivation { preBuild = "cd projects"; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] - ++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] - ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "PLATFORM=DEB" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PLATFORM=OSX" ]; env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++ lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"); - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-framework Foundation"; - installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; + installPhase = let extension = if stdenv.hostPlatform.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; passthru.updateScript = unstableGitUpdater { @@ -69,7 +69,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "lgpt"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/master_me/default.nix b/third_party/nixpkgs/pkgs/applications/audio/master_me/default.nix index 6ed4a2efef..4d8a35588e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/master_me/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/master_me/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL python3 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] - ++ lib.optionals stdenv.isLinux [ libX11 libXext libXrandr ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXext libXrandr ]; enableParallelBuilding = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "automatic mastering plugin for live streaming, podcasts and internet radio"; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.all; - broken = stdenv.isDarwin; # error: no type or protocol named 'NSPasteboardType' + broken = stdenv.hostPlatform.isDarwin; # error: no type or protocol named 'NSPasteboardType' license = licenses.gpl3Plus; mainProgram = "master_me"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mbrola/voices.nix b/third_party/nixpkgs/pkgs/applications/audio/mbrola/voices.nix index 4244a9b62a..df4521acd6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mbrola/voices.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mbrola/voices.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - unstableGitUpdater, mbrola, languages ? [ ], }: diff --git a/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix index 9551e0dda3..2bffd43b7b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { meta = with lib; { inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; # test build fails, but the project is not maintained anymore + broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore description = "Cloud music integration for your desktop"; mainProgram = "MellowPlayer"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/midivisualizer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/midivisualizer/default.nix index 10a2a5de6a..54f13d3e62 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/midivisualizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/midivisualizer/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glfw ffmpeg-full - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { Kernel ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications $out/bin cp -r MIDIVisualizer.app $out/Applications/ ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/ diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix index f3cd335b47..25ab4f7c6b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; # not attempted + broken = stdenv.hostPlatform.isDarwin; # not attempted }; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/minidsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/minidsp/default.nix index 1ba98f0034..6691d3e950 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/minidsp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/minidsp/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = ["-p minidsp -p minidsp-daemon"]; buildInputs = - lib.optionals stdenv.isLinux [libusb1] - ++ lib.optionals stdenv.isDarwin [AppKit IOKit]; + lib.optionals stdenv.hostPlatform.isLinux [libusb1] + ++ lib.optionals stdenv.hostPlatform.isDarwin [AppKit IOKit]; - nativeBuildInputs = lib.optionals stdenv.isLinux [pkg-config]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [pkg-config]; meta = with lib; { description = "Control interface for some MiniDSP products"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix index 8ef52e90f7..90bc036103 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -132,7 +132,7 @@ mkDerivation rec { "-DINSTALL_USER_UDEV_RULES=OFF" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' rules="$src/res/linux/mixxx-usb-uaccess.rules" if [ ! -f "$rules" ]; then echo "$rules is missing, must update the Nix file." diff --git a/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix index a7ad6590aa..6039654d76 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix @@ -3,7 +3,7 @@ , ncurses, db , popt, libtool , libiconv, CoreServices # Sound sub-systems -, alsaSupport ? (!stdenv.isDarwin), alsa-lib +, alsaSupport ? (!stdenv.hostPlatform.isDarwin), alsa-lib , pulseSupport ? true, libpulseaudio , jackSupport ? true, libjack2 , ossSupport ? true @@ -80,7 +80,7 @@ stdenv.mkDerivation { # Misc ++ lib.optional curlSupport curl ++ lib.optional samplerateSupport libsamplerate - ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]; configureFlags = [ # Sound sub-systems diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix index ef604a6b41..12eab45c52 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { requests setuptools tornado - ] ++ lib.optional (!stdenv.isDarwin) dbus-python + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python ); propagatedNativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix index 1faeddb4d8..02711ab4e1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libvorbis - ] ++ lib.optional stdenv.isDarwin SDL; + ] ++ lib.optional stdenv.hostPlatform.isDarwin SDL; env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix index b0dcbfa18c..c58c6831ed 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmpdclient ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix index f7f44b6902..6f28bf98a1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -35,10 +35,10 @@ }: let - stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv # from Qt and the 11.0 SDK frameworks. - portaudio' = if stdenv.isDarwin then portaudio.override { + portaudio' = if stdenv.hostPlatform.isDarwin then portaudio.override { stdenv = stdenv'; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit @@ -94,10 +94,10 @@ in stdenv'.mkDerivation (finalAttrs: { qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. - "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" - ] ++ lib.optionals (stdenv.isLinux) [ + "--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 "--set-default QT_QPA_PLATFORM xcb" @@ -115,7 +115,7 @@ in stdenv'.mkDerivation (finalAttrs: { qttools pkg-config ninja - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998 # GTK3 is needed for file dialogs. Fixes crash with No GSettings schemas error. wrapGAppsHook3 @@ -141,17 +141,17 @@ in stdenv'.mkDerivation (finalAttrs: { qtsvg qtscxml qtnetworkauth - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib qtwayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; postInstall = '' # Remove unneeded bundled libraries and headers rm -r $out/{include,lib} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/mscore.app" "$out/Applications/mscore.app" mkdir -p $out/bin @@ -174,8 +174,8 @@ in stdenv'.mkDerivation (finalAttrs: { # so we disable it and explicitly use makeQtWrapper. # # TODO: check if something like this is also needed for macOS. - dontWrapQtApps = stdenv.isLinux; - postFixup = lib.optionalString stdenv.isLinux '' + dontWrapQtApps = stdenv.hostPlatform.isLinux; + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/libexec mv $out/bin/mscore $out/libexec makeQtWrapper $out/libexec/mscore $out/bin/mscore diff --git a/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix index ba235b5157..97d897d5fc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; preConfigure = '' substituteInPlace lib/utils.rs \ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+UVUejKCfjC6zdW315wmu7f3A5GmnoQ3rIk8SK6LIRI="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Automatic music sorter (based on ID3 tags)"; mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix index e2ecb813f5..fdc377118d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,53 +1,88 @@ -{ lib -, stdenv -, fetchurl -, boost -, libmpdclient -, ncurses -, pkg-config -, readline -, libiconv -, icu -, curl -, outputsSupport ? true # outputs screen -, visualizerSupport ? false, fftw # visualizer screen -, clockSupport ? true # clock screen -, taglibSupport ? true, taglib # tag editor +{ + lib, + stdenv, + fetchFromGitHub, + boost, + libmpdclient, + ncurses, + pkg-config, + readline, + libiconv, + icu, + curl, + autoconf, + automake, + libtool, + outputsSupport ? true, # outputs screen + visualizerSupport ? false, + fftw, # visualizer screen + clockSupport ? true, # clock screen + taglibSupport ? true, + taglib, # tag editor }: stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.9.2"; + version = "0.10"; - src = fetchurl { - url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs="; + src = fetchFromGitHub { + owner = "ncmpcpp"; + repo = "ncmpcpp"; + rev = "refs/tags/${version}"; + sha256 = "sha256-HRJQ+IOQ8xP1QkPlLI+VtDUWaI2m0Aw0fCDWHhgsOLY="; }; enableParallelBuilding = true; strictDeps = true; - configureFlags = [ "BOOST_LIB_SUFFIX=" ] - ++ lib.optional outputsSupport "--enable-outputs" - ++ lib.optional visualizerSupport "--enable-visualizer --with-fftw" - ++ lib.optional clockSupport "--enable-clock" - ++ lib.optional taglibSupport "--with-taglib"; + configureFlags = [ + "BOOST_LIB_SUFFIX=" + (lib.enableFeature outputsSupport "outputs") + (lib.enableFeature visualizerSupport "enable-visualizer") + (lib.withFeature visualizerSupport "fftw") + (lib.enableFeature clockSupport "clock") + (lib.withFeature taglibSupport "taglib") + ]; - nativeBuildInputs = [ pkg-config ] + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; + + buildInputs = [ + boost + libmpdclient + ncurses + readline + libiconv + icu + curl + ] ++ lib.optional visualizerSupport fftw ++ lib.optional taglibSupport taglib; - buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ] - ++ lib.optional visualizerSupport fftw - ++ lib.optional taglibSupport taglib; + preConfigure = + '' + ./autogen.sh + '' + + lib.optionalString stdenv.isDarwin '' + # std::result_of was removed in c++20 and unusable for clang16 + substituteInPlace ./configure \ + --replace-fail "std=c++20" "std=c++17" + ''; - meta = with lib; { + meta = { description = "Featureful ncurses based MPD client inspired by ncmpc"; - homepage = "https://rybczak.net/ncmpcpp/"; - changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ koral lovek323 ]; - platforms = platforms.all; + homepage = "https://rybczak.net/ncmpcpp/"; + changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + koral + lovek323 + ]; + platforms = lib.platforms.all; mainProgram = "ncmpcpp"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index 4053a1a88f..d2d428963b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -35,16 +35,16 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withClipboard python3; buildInputs = [ ncurses ] - ++ lib.optional stdenv.isLinux openssl + ++ lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optional withALSA alsa-lib ++ lib.optional withClipboard libxcb ++ lib.optional withCover ueberzug ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional (withMPRIS || withNotify) dbus - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DNCURSES_UNCTRL_H_incl"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl"; buildNoDefaultFeatures = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix b/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix index 0184934ff2..bf2c115758 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.7"; + version = "5.6.8"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-lroQYO+Ab7uPQmsrUFK6uWdCoGQp1klyfLw6eAxdzjg="; + hash = "sha256-hCVGi+++6CcTRMXeRKH8xRncm/Gl83GgU3aAIPI/yGU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/open-music-kontrollers/generic.nix b/third_party/nixpkgs/pkgs/applications/audio/open-music-kontrollers/generic.nix index 5c48f08dcd..4c4211e49f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/open-music-kontrollers/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ] ++ additionalBuildInputs; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = description; homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; license = licenses.artistic2; diff --git a/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix b/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix index d0e840b151..df53f4a496 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix @@ -39,7 +39,7 @@ buildDotnetModule rec { dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ]; # socket cannot bind to localhost on darwin for tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # net7.0 replacement needed until upstream bumps to dotnet 7 postPatch = '' @@ -54,9 +54,9 @@ buildDotnetModule rec { # need to make sure proprietary worldline resampler is copied postInstall = let - runtime = if (stdenv.isLinux && stdenv.isx86_64) then "linux-x64" - else if (stdenv.isLinux && stdenv.isAarch64) then "linux-arm64" - else if stdenv.isDarwin then "osx" + runtime = if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) then "linux-x64" + else if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then "linux-arm64" + else if stdenv.hostPlatform.isDarwin then "osx" else null; in lib.optionalString (runtime != null) '' cp runtimes/${runtime}/native/libworldline${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/OpenUtau/ diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix index 9bafacc2e3..9f306a3de1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildInputs = [ libogg ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fmang/opustags"; description = "Ogg Opus tags editor"; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ kmein ]; license = licenses.bsd3; mainProgram = "opustags"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix index a0b2972ca0..d7da9213bc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cmake makeBinaryWrapper pkg-config ]; buildInputs = [ libopus openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' wrapProgram $out/bin/parrot \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 50455328f3..a82007c375 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Time domain pitch tracker for Pure Data"; homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; license = lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix index dbcc99d7de..a9ea409685 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec { (with pythonPackages; [ pygobject3 pylast ]); meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Pandora Internet Radio player for GNOME"; mainProgram = "pithos"; homepage = "https://pithos.github.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix index b3f671adc4..4b5f0c4acd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/cth103/plugin-torture"; description = "Tool to test LADSPA and LV2 plugins"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix index 11feb31ff1..2a38222949 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/polyphone/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Soundfont editor for creating musical instruments"; mainProgram = "polyphone"; homepage = "https://www.polyphone-soundfonts.com/"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 505a3eee4d..16f9283282 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.19"; + version = "6.4.20"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-dK1rCfyTIASMGWEWQomdbazpI6faBvlrRpyGDuSoW5g="; + hash = "sha256-qal7eIKht0XkRDEsAfNkNDwmDYrr/cLQV4pMMWE+kFk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index d00a0e841b..0cbb64e6dc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib; + buildInputs = [ SDL2 ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; postInstall = '' install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.desktop" \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix index a335dabf4a..5d1b11c4ef 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { buildInputs = [ fftw libjack2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ]; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { "--enable-universal" "--enable-fftw" "--enable-jack" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-alsa" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-portaudio" "--without-local-portaudio" "--disable-jack-framework" diff --git a/third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix index 4f0ea94683..e2156b3910 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/jpcima/quadrafuzz"; description = "Multi-band fuzz distortion plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix index ee994b56ef..6577f33bab 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeCheckInputs = [ gtest ]; - doCheck = !stdenv.isAarch64; # single failure that I can't explain + doCheck = !stdenv.hostPlatform.isAarch64; # single failure that I can't explain preFixup = '' gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index da26c15705..ff8d32b907 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -15,14 +15,14 @@ , xdotool , which -, jackSupport ? stdenv.isLinux +, jackSupport ? stdenv.hostPlatform.isLinux , jackLibrary -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio }: let - url_for_platform = version: arch: if stdenv.isDarwin + url_for_platform = version: arch: if stdenv.hostPlatform.isDarwin then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg" else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; in @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-dIRZCUIfqnGTxBaLzczwzD6hA/PyAxPqfa+FfCRKdu0=" else { + hash = if stdenv.hostPlatform.isDarwin then "sha256-dIRZCUIfqnGTxBaLzczwzD6hA/PyAxPqfa+FfCRKdu0=" else { x86_64-linux = "sha256-aa2KcL8yZYG+Dki7J6U473E2BQgdACAIzRLtD9zuHV0="; aarch64-linux = "sha256-NECEEUKtTQajl0MZK8/NsbhcuyihHOo0Q5Y5UpAAgrM="; }.${stdenv.hostPlatform.system}; @@ -40,24 +40,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ which autoPatchelfHook xdg-utils # Required for desktop integration - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; - sourceRoot = lib.optionalString stdenv.isDarwin "Reaper.app"; + sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app"; buildInputs = [ stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 alsa-lib ]; - runtimeDependencies = lib.optionals stdenv.isLinux [ + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ gtk3 # libSwell needs libgdk-3.so.0 ] ++ lib.optional jackSupport jackLibrary @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p "$out/Applications/Reaper.app" cp -r * "$out/Applications/Reaper.app/" diff --git a/third_party/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix index 19fca6af98..fa62fcfa47 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.joelmo ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' + broken = stdenv.hostPlatform.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index bc6a406ba2..6147973f14 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--enable-dependency-tracking" ] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ SDL2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libXext ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; enableParallelBuilding = true; # Our Darwin SDL2 doesn't have a SDL2main to link against - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac \ --replace '-lSDL2main' '-lSDL2' ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix b/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix index 3c0b83d46c..cc09b21875 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, config, fetchFromGitHub, cmake, pkg-config -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio , jackSupport ? false, libjack2, soxr , pcapSupport ? false, libpcap }: diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix index d3314facb6..03813ff352 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://www.drpetter.se/project_sfxr.html"; description = "Videogame sound effect generator"; mainProgram = "sfxr"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix index ff58b64cee..821cda32e9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { asio avahi flac libogg libvorbis libopus aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ IOKit AudioToolbox ]; + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit AudioToolbox ]; - TARGET=lib.optionalString stdenv.isDarwin "MACOS"; + TARGET=lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix index ad935b09ed..8bb0bf1387 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftw gsl motif ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ CoreServices CoreMIDI ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices CoreMIDI ] ++ (with xorg; [ libXext libXft libXpm libXt ]); configureFlags = [ "--with-motif" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix index fc0c597736..d8a69ecd9a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath (finalAttrs.runtimeDependencies)}"; dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath - postPatch = lib.optionalString (stdenv.isLinux) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' # needs special setup on Linux, dunno if it can work on Darwin # Also, I get issues with linking without that, not sure why sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # The program does not provide any CMake install instructions - installPhase = lib.optionalString (stdenv.isLinux) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isLinux) '' runHook preInstall cd ../linux ./install.sh "$out" @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ PowerUser64 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sonobus"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix index 6c28d54045..bcca16089a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "http://openavproductions.com/sorcer/"; description = "Wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundtracker/default.nix index 02c4813e03..36f90e67a6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/soundtracker/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { goocanvas libxml2 libsndfile - ] ++ lib.optional stdenv.isLinux alsa-lib; + ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; meta = with lib; { description = "Music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix index 415bf352ca..a0c3d2d257 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Speech denoise lv2 plugin based on RNNoise library"; homepage = "https://github.com/lucianodato/speech-denoiser"; license = licenses.lgpl3; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix index dcce24d173..a3c51cfaab 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { pkg-config cmake rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; @@ -61,14 +61,14 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withSixel [ libsixel ] ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] - ++ lib.optionals (withAudioBackend == "rodio" && stdenv.isLinux) [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ] ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ] ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ] ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ] ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ] ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ] - ++ lib.optionals (stdenv.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit AudioUnit Cocoa @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withFuzzy [ "fzf" ]; # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionals (stdenv.isDarwin && withSixel) '' + postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) '' wrapProgram $out/bin/spotify_player \ --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix index 0fbf7c9438..cbe252bc2b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - postInstall = lib.optionalString stdenvNoCC.isDarwin '' + postInstall = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/spotify-qt.app $out/Applications ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix index 8304bdf3a1..bc643d4f1b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = "1.2.40.599.g606b7f29"; - src = if stdenv.isAarch64 then ( + src = if stdenv.hostPlatform.isAarch64 then ( fetchurl { url = "https://web.archive.org/web/20240622065234/https://download.scdn.co/SpotifyARM64.dmg"; hash = "sha256-mmjxKYmsX0rFlIU19JOfPbNgOhlcZs5slLUhDhlON1c="; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix index df6d762c65..fe49e68090 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -18,6 +18,6 @@ let mainProgram = "spotify"; }; -in if stdenv.isDarwin +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix (extraArgs // { inherit pname meta; }) else callPackage ./linux.nix (extraArgs // { inherit pname meta; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix b/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix index 6bef356172..f581ae1b1c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/jpcima/stone-phaser"; description = "Classic analog phaser effect, made with DPF and Faust"; maintainers = [ maintainers.magnetophon ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 9179ecccef..7fedaf3c2f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { taglib qtbase qtx11extras - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ libgpod libpulseaudio libselinux @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { pkg-config qttools wrapQtAppsHook - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ util-linux ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tagger/deps.nix b/third_party/nixpkgs/pkgs/applications/audio/tagger/deps.nix index 76ab54d970..231c388ebe 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tagger/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tagger/deps.nix @@ -28,10 +28,7 @@ (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; hash = "sha256-wZBTTSQNPll/5/sZPPxa6d0QBjwA8FLA2vFE/838VWs="; }) (fetchNuGet { pname = "MetaBrainz.MusicBrainz.CoverArt"; version = "6.0.0"; hash = "sha256-yN+godNeB6l8ihNupq9cNe+PaYaPTngHJzwkMH9ySbE="; }) (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; hash = "sha256-aJyLlVg6jKY2Van0hwAC5JEF/j+YtEq5ZFLkyI3scsY="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-wvudYblAZ5vOdQ/3Ssl24exAXRkhOG7KBZUjquLGo5o="; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; hash = "sha256-aew8/vRyzCc7MMNHziR8tsg66EFkJC+Snst3F+a3Ehc="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.6"; hash = "sha256-7kLTos2RiNJOmxg6NcM8QieifWMHgxHgd5e+DBNQI0Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-oAQI/uV0G/uEFp+2yAyhILZ6hr9t+oWh9TEY646Vphk="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; hash = "sha256-5rFBJ8Fkw7+11iCG9nMVhOqPCpyVIrbUzrFQhc/2eHw="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; }) (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.4"; hash = "sha256-us9K5RayuZGe2fkhk/c2Qw45gKmrfvyNBvHdcOnzWj0="; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix index 12a62f1afc..3ed875b668 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { setproctitle ] ++ lib.optional withDiscordRPC pypresence - ++ lib.optional stdenv.isLinux pulsectl; + ++ lib.optional stdenv.hostPlatform.isLinux pulsectl; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" diff --git a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix index 160a032fd6..0ef4ed7378 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config python3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { twolame wxGTK32 gtk3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ at-spi2-core dbus libepoxy diff --git a/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix index c6048ed1e7..c4a42aa383 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec { mpv-unwrapped openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreAudio CoreGraphics @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { IOKit MediaPlayer Security - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix b/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix index 4bec1952e0..22e1850286 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { ln -s $out/${startScript} $out/bin/virtual-ans ''; - startScript = if stdenv.isx86_32 then "START_LINUX_X86" - else if stdenv.isx86_64 then "START_LINUX_X86_64" - #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin + startScript = if stdenv.hostPlatform.isx86_32 then "START_LINUX_X86" + else if stdenv.hostPlatform.isx86_64 then "START_LINUX_X86_64" + #else if stdenv.hostPlatform.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}."; - linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" - else if stdenv.isx86_64 then "pixilang_linux_x86_64" + linuxExecutable = if stdenv.hostPlatform.isx86_32 then "pixilang_linux_x86" + else if stdenv.hostPlatform.isx86_64 then "pixilang_linux_x86_64" else ""; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix index 877f670d68..4325d934e8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Extra tools for Ogg-Vorbis audio codec"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/wavegain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/wavegain/default.nix index 93dd7bf6fb..49c66b07a9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/wavegain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/wavegain/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "ReplayGain for wave files"; homepage = "https://github.com/MestreLion/wavegain"; license = lib.licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix b/third_party/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix index 3234a719e3..4a802a324e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; homepage = "https://x42-plugins.com/x42/x42-avldrums"; maintainers = with maintainers; [ magnetophon orivej ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix index 8f83263d0a..1d31211ec8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Chris Colins' General User soundfont player LV2 plugin"; homepage = "https://x42-plugins.com/x42/x42-gmsynth"; maintainers = with maintainers; [ orivej ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix index efd5fb9caa..8abce73aff 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxmp ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio ]; meta = with lib; { description = "Extended module player"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix index 59d33a0051..046203416a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -27,30 +27,30 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ] - ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' cp -R ${electron.dist}/Electron.app Electron.app chmod -R u+w Electron.app '' + '' pnpm build ./node_modules/.bin/electron-builder \ --dir \ - -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} ''; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv pack/mac*/YouTube\ Music.app $out/Applications makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/lib/youtube-music" cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music" @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' makeWrapper ${electron}/bin/electron $out/bin/youtube-music \ --add-flags $out/share/lib/youtube-music/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix index e99ef4225c..28315b0a37 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix @@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Automated and intuitive digital audio workstation"; maintainers = with maintainers; [ tshaynik magnetophon yuu astavie PowerUser64 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; license = licenses.agpl3Plus; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix index 6f5512d4fa..59f0310263 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix @@ -16,7 +16,7 @@ , zlib # Optional dependencies -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib , dssiSupport ? false , dssi @@ -28,7 +28,7 @@ , ossSupport ? true , portaudioSupport ? true , portaudio -, sndioSupport ? stdenv.isOpenBSD +, sndioSupport ? stdenv.hostPlatform.isOpenBSD , sndio # Optional GUI dependencies @@ -122,7 +122,7 @@ in stdenv.mkDerivation rec { lib.optionals lashSupport [ "PortChecker" ] # Tests fail on aarch64 - ++ lib.optionals stdenv.isAarch64 [ "MessageTest" "UnisonTest" ]; + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "MessageTest" "UnisonTest" ]; in '' runHook preCheck ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' @@ -168,6 +168,6 @@ in stdenv.mkDerivation rec { # - ZynAddSubFX LV2 & VST plugin fail to compile (not setup to use ObjC version of pugl) # - TTL generation crashes (`pointer being freed was not allocated`) for all VST plugins using AbstractFX # - Zest UI fails to start on pulg_setup: Could not open display, aborting. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix index fdac36e492..1ffdeca5b3 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -1,25 +1,11 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, }: -let - python = python3.override { - packageOverrides = self: super: { - pyunifiprotect = super.pyunifiprotect.overridePythonAttrs { - version = "unstable-2024-06-08"; - src = fetchFromGitHub { - owner = "ep1cman"; - repo = "pyunifiprotect"; - rev = "d967bca2c65e0aa6a7363afb6367c3745c076747"; - hash = "sha256-gSAK/T9cjIiRC/WjwrdLP+LHzEEUsNbwpXClYqpnMio="; - }; - }; - }; - }; -in - -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; version = "0.11.0"; pyproject = true; @@ -31,18 +17,25 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-t4AgPFqKS6u9yITIkUUB19/SxVwR7X8Cc01oPx3M+E0="; }; + patches = [ + # Switch to using UIProtect library, https://github.com/ep1cman/unifi-protect-backup/pull/160 + (fetchpatch { + name = "switch-uiprotect.patch"; + url = "https://github.com/ep1cman/unifi-protect-backup/commit/ccf2cde27229ade5c70ebfa902f289bf1a439f64.patch"; + hash = "sha256-kogl/crvLE+7t9DLTuZqeW3/WB5/sytWDgbndoBw+RQ="; + }) + ]; + pythonRelaxDeps = [ "aiorun" "aiosqlite" "click" - "pyunifiprotect" + "uiprotect" ]; - nativeBuildInputs = with python.pkgs; [ - poetry-core - ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiocron aiolimiter aiorun @@ -52,12 +45,10 @@ python.pkgs.buildPythonApplication rec { click expiring-dict python-dateutil - pyunifiprotect + uiprotect ]; - nativeCheckInputs = with python.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; meta = with lib; { description = "Python tool to backup unifi event clips in realtime"; diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index b620459f3c..8bc6e71971 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix index 776aa155a2..ad40bbef75 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix @@ -38,9 +38,9 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; buildInputs = - lib.optional stdenv.isDarwin Security - ++ lib.optional (withGui && stdenv.isLinux) webkitgtk - ++ lib.optionals (withGui && stdenv.isDarwin) [ + lib.optional stdenv.hostPlatform.isDarwin Security + ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [ Cocoa WebKit ]; @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { "--skip=dns::client::tests::test_udp_client" ]; - postInstall = lib.optionalString (withGui && stdenv.isLinux) '' + postInstall = lib.optionalString (withGui && stdenv.hostPlatform.isLinux) '' wrapProgram $out/bin/alfis \ --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; @@ -66,6 +66,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ misuzu ]; platforms = lib.platforms.unix; mainProgram = "alfis"; - broken = withGui && stdenv.isDarwin; + broken = withGui && stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix index ef985a2806..3c48f930a6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: rec { sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg="; }; - buildInputs = lib.optionals stdenv.isLinux [ jemalloc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ jemalloc ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: rec { cp -r lib $out/ wrapProgram $out/bin/${pname} \ --set JAVA_HOME "${jre}" \ - --suffix ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} : ${lib.makeLibraryPath buildInputs} + --suffix ${if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} : ${lib.makeLibraryPath buildInputs} ''; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix index 8ead5982b8..75c782a7f4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -81,7 +81,7 @@ mkDerivation rec { homepage = "https://bitcoinabc.org/"; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.unix; mainProgram = "bitcoin-cli"; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix index c6838e0a0f..5c41ba65a6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -42,14 +42,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ lib.optionals withWallet [ sqlite ] - ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] + ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index 960ccf4183..e3eb1cf3bc 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ lib.optionals withWallet [ sqlite ] # building with db48 (for legacy descriptor wallet support) is broken on Darwin - ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] + ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png ''; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export MACOSX_DEPLOYMENT_TARGET=10.13 ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix index 287304855f..9f84685e8c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.08"; + version = "24.08.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-u4dkVcdduTBuRE615mPx66U8OFZSeMdL2fNJNoHbVxc="; + hash = "sha256-2ZKvhNuzGftKwSdmMkHOwE9UEI5Ewn5HHSyyZUcCwB4="; }; # when building on darwin we need cctools to provide the correct libtool # as libwally-core detects the host as darwin and tries to add the -static # option to libtool, also we have to add the modified gsed package. nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] - ++ lib.optionals stdenv.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib jq ]; # this causes some python trouble on a darwin host so we skip this step. # also we have to tell libwally-core to use sed instead of gsed. - postPatch = if !stdenv.isDarwin then '' + postPatch = if !stdenv.hostPlatform.isDarwin then '' patchShebangs \ tools/generate-wire.py \ tools/update-mocks.sh \ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # workaround for build issue, happens only x86_64-darwin, not aarch64-darwin # ccan/ccan/fdpass/fdpass.c:16:8: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant] # char buf[CMSG_SPACE(sizeof(fd))]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-Wno-error=gnu-folding-constant"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-Wno-error=gnu-folding-constant"; # The `clnrest` plugin requires a Python environment to run postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix index f89b340977..a31982666a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; passthru.updateScript = ./update.sh; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix index 90bc9195f9..01abe7c297 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { # fix "Killed: 9 test/test_bitcoin" # https://github.com/NixOS/nixpkgs/issues/179474 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "fortify" "stackprotector" ]; nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix index 6c39d9d212..b4673ca4cf 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix @@ -14,13 +14,12 @@ let in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png - - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix index e3acd14a5a..18861f0214 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png ''; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export MACOSX_DEPLOYMENT_TARGET=10.13 ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix index 2147f7cfc7..e433aa562c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf readline easyloggingpp - ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreData PCSC ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "-DReadline_ROOT_DIR=${readline.dev}" "-DReadline_INCLUDE_DIR=${readline.dev}/include/readline" "-DRandomX_ROOT_DIR=${randomx}" - ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" ++ lib.optional (!trezorSupport) "-DUSE_DEVICE_TREZOR=OFF"; outputs = [ "out" "source" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index ce40616c5e..cfd9193f08 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -16,13 +16,14 @@ in appimageTools.wrapType2 rec { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix index 83dd93effb..4d1a81d5da 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration @@ -121,7 +121,7 @@ rustPlatform.buildRustPackage rec { "--skip persist::test_persist_caches" "--skip service::tests::tests::test_dht_persistence" "--skip time::test::test_reinsertion_updates_timeout" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix index 8a3c6a2657..0f923fb8f6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq fmt miniupnpc glib protobuf util-linux libevent ] - ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -62,7 +62,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' Litecoin is a peer-to-peer Internet currency that enables instant payments diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix index 0ff6542b97..e015a5ceea 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix @@ -1,7 +1,23 @@ { buildGoModule , fetchFromGitHub , lib -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] +, tags ? [ + # `RELEASE_TAGS` from https://github.com/lightningnetwork/lnd/blob/master/make/release_flags.mk + "autopilotrpc" + "chainrpc" + "invoicesrpc" + "kvdb_etcd" + "kvdb_postgres" + "kvdb_sqlite" + "monitoring" + "neutrinorpc" + "peersrpc" + "signrpc" + "walletrpc" + "watchtowerrpc" + # Extra tags useful for testing + "routerrpc" + ] }: buildGoModule rec { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix index 8a842d507b..0c3ad55ab4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-qkYDzsl2Y4WEDDXs9cE/jIXm01jclkYUQbDGe1S0wYs="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Replace hardcoded g++ with c++ so clang can be used # on darwin substituteInPlace Makefile \ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix index 7a10693572..7e87695e78 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - ninja, pkg-config, boost, libsodium, @@ -83,7 +82,7 @@ stdenv.mkDerivation rec { unbound zeromq ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreData ] @@ -93,7 +92,7 @@ stdenv.mkDerivation rec { libusb1 protobuf_21 ] - ++ lib.optionals (trezorSupport && stdenv.isLinux) [ + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ]; @@ -105,7 +104,7 @@ stdenv.mkDerivation rec { "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" ] - ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF" + ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" ++ lib.optional trezorSupport [ "-DUSE_DEVICE_TREZOR=ON" # fix build on recent gcc versions diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index 7a8f5d4c26..7e8a5fe73d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { unbound zeromq ] - ++ lib.optionals stdenv.isDarwin [ qtmacextras ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ] ++ lib.optionals trezorSupport [ hidapi libusb1 protobuf_21 python3 ] - ++ lib.optionals (trezorSupport && stdenv.isLinux) [ + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix index 722402e704..473ee254d0 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix @@ -37,7 +37,7 @@ buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit ]; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix index cacb8f5f46..12e86358c9 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' An open source, decentralized privacy platform built for global person to person eCommerce. diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 546348d3c4..65e945d77d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -69,8 +69,8 @@ rustPlatform.buildRustPackage rec { # NOTE: jemalloc is used by default on Linux with unprefixed enabled buildInputs = [ openssl ] ++ - lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ - lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't # available for `rustc-wasm32` diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix index e4dc85f3c4..0cebbecc03 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { # buildAndTestSubdir = "cli"; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config rustPlatform.bindgenHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config rustPlatform.bindgenHook ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec { # ROCKSDB_INCLUDE_DIR="${rocksdb}/include"; # ROCKSDB_LIB_DIR="${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security curl ]; # some tests are flaky and some need network access # TODO finish filtering the tests to enable them - doCheck = !stdenv.isLinux; + doCheck = !stdenv.hostPlatform.isLinux; # checkFlags = [ # # tries to make a network access # "--skip=rpc::rpc::tests::test_send_transaction_large" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix index 0d664374ef..5b18f5fc4c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix @@ -75,8 +75,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config protobuf rustfmt perl rustPlatform.bindgenHook ]; buildInputs = - [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.isLinux [ udev ]) - ++ lib.optionals stdenv.isDarwin [ Security System Libsystem libcxx ]; + [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security System Libsystem libcxx ]; strictDeps = true; doCheck = false; @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = "1"; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions CPPFLAGS = "-isystem ${lib.getDev libcxx}/include/c++/v1"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix index c2e4fb0138..61299621e0 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix @@ -40,7 +40,7 @@ in rustfmt ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -69,7 +69,7 @@ in buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix index 517e18ff94..c4014a0127 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.08"; + version = "2024.09"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-OV/1//zIHebc3eLUxtUVV0TMuDdB25M7TT5y58x2Z68="; + hash = "sha256-IzDftvPwsKWEVn4R8QL6j1ceA26BksKSrlr0CkFZlrU="; fetchSubmodules = true; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { # The build fails on darwin as: # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fully decentralized layer-1 blockchain designed by Telegram"; homepage = "https://ton.org/"; changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix index 836532c00b..7ec9f8d83e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { readline unbound zeromq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index dbada09c1b..35a3bdb91e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { hash = "sha256-XGq/cYUo43FcpmRDO2YiNLCuEQLsTFLBFC4M1wM29l8="; }; - prePatch = lib.optionalString stdenv.isAarch64 '' + prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace .cargo/config.offline \ --replace "[target.aarch64-unknown-linux-gnu]" "" \ --replace "linker = \"aarch64-linux-gnu-gcc\"" "" @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { tl-expected utf8cpp zeromq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix index de14859c98..b4a55ece76 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ urandom ]; # many undefined functions - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "emptty"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix index f22cafbbce..80fbe56746 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix @@ -117,12 +117,12 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + postConfigure = lib.optionalString stdenv.hostPlatform.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ - ("--with-contrib-plugins=all,-FileManager" + lib.optionalString stdenv.isDarwin ",-NassiShneiderman") + ("--with-contrib-plugins=all,-FileManager" + lib.optionalString stdenv.hostPlatform.isDarwin ",-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix index d0ded7ae72..d809348b3f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses lua ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # fix paths prePatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/elvis/default.nix b/third_party/nixpkgs/pkgs/applications/editors/elvis/default.nix deleted file mode 100644 index 046aac459b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/elvis/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv, ncurses }: - -stdenv.mkDerivation rec { - pname = "elvis"; - version = "2.2_0"; - - src = fetchurl { - url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz"; - sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; - }; - - buildInputs = [ ncurses ]; - - patches = [ - (fetchpatch { - url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; - sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; - }) - ]; - - postPatch = '' - substituteInPlace configure \ - --replace '-lcurses' '-lncurses' - ''; - - preConfigure = '' - mkdir -p $out/share/man/man1 - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc - cp elvis ref elvtags elvfmt $out/bin - cp -R data/* $out/share/elvis - cp doc/* $out/share/elvis/doc - - mkdir -p $out/share/man/man1 - for a in doc/*.man; do - cp $a $out/share/man/man1/`basename $a .man`.1 - done - ''; - - configureFlags = [ "--ioctl=termios" ]; - - meta = { - homepage = "http://elvis.the-little-red-haired-girl.org/"; - description = "Vi clone for Unix and other operating systems"; - license = lib.licenses.free; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix index df04ceaf2c..faf06ca843 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -20,10 +20,6 @@ lib.makeScope pkgs.newScope (self: emacs28 = callPackage (self.sources.emacs28) inheritedArgs; - emacs28-gtk2 = self.emacs28.override { - withGTK2 = true; - }; - emacs28-gtk3 = self.emacs28.override { withGTK3 = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 77365da2b5..5981faab2d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -29,6 +29,8 @@ lib.packagesFromDirectoryRecursive { tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; }; + zstd = callPackage ./manual-packages/zstd { inherit (pkgs) zstd; }; + # From old emacsPackages (pre emacsPackagesNg) cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix new file mode 100644 index 0000000000..4dfe2484db --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix @@ -0,0 +1,37 @@ +{ + lib, + melpaBuild, + stdenv, + fetchFromGitHub, + zstd, +}: + +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in +melpaBuild { + pname = "zstd"; + version = "0-unstable-2020-06-03"; + + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-zstd"; + rev = "072b264e2cbd5c05be06a1208ebccc2dab44be39"; + hash = "sha256-p8bxefytTOSV6vIG8PAPBXfVKA2rfmWdRtVwjE42mAw="; + }; + + buildInputs = [ zstd ]; + + preBuild = '' + $CC -std=gnu99 -shared -o zstd-core${libExt} zstd-core.c -lzstd + ''; + + files = ''(:defaults "zstd-core${libExt}")''; + + meta = { + homepage = "https://github.com/syohex/emacs-zstd"; + description = "Zstd binding for Emacs Lisp"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ nagy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index a8285a4d79..e680e1f7e6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -133,6 +133,13 @@ let # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; + age = super.age.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace age.el \ + --replace-fail 'age-program (executable-find "age")' 'age-program "${lib.getExe pkgs.age}"' + ''; + }); + airline-themes = super.airline-themes.override { inherit (self.melpaPackages) powerline; }; @@ -246,7 +253,7 @@ let pkgs.zlib.dev pkgs.cairo.dev ] - ++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev + ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.stdenv.cc.libc.dev ) )} server/epdfinfo ''; @@ -296,7 +303,7 @@ let rm -rf $out/share/emacs/site-lisp/elpa/*/server ''; dontUseCmakeBuildDir = true; - doCheck = pkgs.stdenv.isLinux; + doCheck = pkgs.stdenv.hostPlatform.isLinux; buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); @@ -357,6 +364,20 @@ let forge = buildWithGit super.forge; + gnuplot = super.gnuplot.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace gnuplot.el \ + --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"' + ''; + }); + + gnuplot-mode = super.gnuplot-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace gnuplot-mode.el \ + --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"' + ''; + }); + magit = buildWithGit super.magit; magit-find-file = buildWithGit super.magit-find-file; @@ -539,6 +560,13 @@ let (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; }); + zig-mode = super.zig-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace zig-mode.el \ + --replace-fail 'zig-zig-bin "zig"' 'zig-zig-bin "${lib.getExe pkgs.zig}"' + ''; + }); + zmq = super.zmq.overrideAttrs (old: { stripDebugList = [ "share" ]; preBuild = '' @@ -674,7 +702,7 @@ let # Build a helper executable that interacts with the macOS Dictionary.app osx-dictionary = - if pkgs.stdenv.isDarwin + if pkgs.stdenv.hostPlatform.isDarwin then super.osx-dictionary.overrideAttrs (old: { buildInputs = old.buildInputs ++ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix index 26e5346e01..bdd80f8922 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix @@ -22,7 +22,6 @@ , gnutls , gpm , gsettings-desktop-schemas -, gtk2-x11 , gtk3 , gtk3-x11 , harfbuzz @@ -30,7 +29,6 @@ , jansson , libXaw , libXcursor -, libXft , libXi , libXpm , libgccjit @@ -69,35 +67,33 @@ , withAlsaLib ? false , withAthena ? false , withCsrc ? true -, withDbus ? stdenv.isLinux -, withGTK2 ? false +, withDbus ? stdenv.hostPlatform.isLinux , withGTK3 ? withPgtk && !noGui , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets) -, withGpm ? stdenv.isLinux +, withGpm ? stdenv.hostPlatform.isLinux , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) # Emacs 30+ has native JSON support , withJansson ? lib.versionOlder version "30" , withMailutils ? true , withMotif ? false -, withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) +, withNS ? stdenv.hostPlatform.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false -, withSelinux ? stdenv.isLinux +, withSelinux ? stdenv.hostPlatform.isLinux , withSQLite3 ? lib.versionAtLeast version "29" , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withToolkitScrollBars ? true , withTreeSitter ? lib.versionAtLeast version "29" , withWebP ? lib.versionAtLeast version "29" -, withX ? !(stdenv.isDarwin || noGui || withPgtk) +, withX ? !(stdenv.hostPlatform.isDarwin || noGui || withPgtk) , withXinput2 ? withX && lib.versionAtLeast version "29" -, withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) +, withXwidgets ? !stdenv.hostPlatform.isDarwin && !noGui && (withGTK3 || withPgtk) , withSmallJaDic ? false , withCompressInstall ? true # Options , siteStart ? ./site-start.el , toolkit ? ( - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" + if withGTK3 then "gtk3" else if withMotif then "motif" else if withAthena then "athena" else "lucid") @@ -118,16 +114,13 @@ , WebKit }: -assert (withGTK2 && !withNS && variant != "macport") -> withX; assert (withGTK3 && !withNS && variant != "macport") -> withX || withPgtk; -assert noGui -> !(withX || withGTK2 || withGTK3 || withNS || variant == "macport"); -assert withAcl -> stdenv.isLinux; -assert withAlsaLib -> stdenv.isLinux; -assert withGTK2 -> !(withGTK3 || withPgtk); -assert withGTK3 -> !withGTK2 || withPgtk; -assert withGpm -> stdenv.isLinux; -assert withNS -> stdenv.isDarwin && !(withX || variant == "macport"); +assert noGui -> !(withX || withGTK3 || withNS || variant == "macport"); +assert withAcl -> stdenv.hostPlatform.isLinux; +assert withAlsaLib -> stdenv.hostPlatform.isLinux; +assert withGpm -> stdenv.hostPlatform.isLinux; +assert withNS -> stdenv.hostPlatform.isDarwin && !(withX || variant == "macport"); assert withPgtk -> withGTK3 && !withX; assert withXwidgets -> !noGui && (withGTK3 || withPgtk); @@ -149,7 +142,6 @@ mkDerivation (finalAttrs: { else if variant == "macport" then "-macport" else if withPgtk then "-pgtk" else if withGTK3 then "-gtk3" - else if withGTK2 then "-gtk2" else ""); inherit version; @@ -237,13 +229,11 @@ mkDerivation (finalAttrs: { dbus ] ++ lib.optionals withSelinux [ libselinux - ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withGTK3) [ gsettings-desktop-schemas - ] ++ lib.optionals (stdenv.isLinux && withX) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withX) [ libotf m17n_lib - ] ++ lib.optionals (withX && withGTK2) [ - gtk2-x11 ] ++ lib.optionals (withX && withGTK3) [ gtk3-x11 ] ++ lib.optionals (withX && withMotif) [ @@ -285,7 +275,7 @@ mkDerivation (finalAttrs: { libXi ] ++ lib.optionals withXwidgets [ webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] ++ lib.optionals withNS [ librsvg @@ -342,7 +332,7 @@ mkDerivation (finalAttrs: { (lib.withFeature true "mac") (lib.withFeature true "xml2") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.withFeature withNS "ns") ] ++ [ @@ -409,7 +399,7 @@ mkDerivation (finalAttrs: { -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; - postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withX && toolkit == "lucid") '' patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix index 7a7d05df52..7a1edc7294 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { libgedit-gtksourceview libgedit-tepl libpeas - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/heh/default.nix b/third_party/nixpkgs/pkgs/applications/editors/heh/default.nix index bd7907f768..f89ee5a76a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/heh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/heh/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit ]); diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json index 667cc1ac5e..5f061d2be2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json @@ -11,10 +11,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "90c6ad146b55909ff4e09cf7290c51db2d3f94985e972133c81ad30c4654c74e", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1.tar.gz", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "1658fb15d41dfb804ab0ea3ed4781d4ae0f41d25cc9df17c3f536a565423aa5b", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -27,10 +27,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "7854a303ad5f3bb9300f515baaed34e4362c59c631b117ea49eaa81f75ef485d", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1.tar.gz", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "9b3dd8185f805d8d968f5a515dbe74d3672e0cd1b2cb052cf81382bd63ddb3b8", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -43,26 +43,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.2.1.1", - "sha256": "9305eb0c8985cf02a43c45002d7676323a84f5a4a544a0458468a49347e6ed57", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1.tar.gz", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "63314c4b3114e754b35f765a535dc92d7f66f6b3a767bd77aebd65b844add92c", + "url": "https://download.jetbrains.com/go/goland-2024.2.2.tar.gz", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "781cc03526d5811061c6ffd211942698b3d18ed2f055a04f384956686a7aa0a6", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "b996f6418cd4beb8d77f5f283c0a37108e33b3c822a7d398dfa15b73967595b2", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2.tar.gz", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "aa817431cfad5b814d356211e4826358c647a8a550938829aef9fb9eec61366d", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "4a8b6cee89e1baf9e252803c2e32e39ce923452d31807adfdedd836df7f96ef4", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2.tar.gz", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -84,18 +84,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "232ddc3c15b138264534820a40049ea4b0108647ba2972294616bc2a3f22234b", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "4f30b1f877a5909dcd181e95305ec43d17c36743583d7dcf0180e700d44a3407", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2.tar.gz", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "01802b2e4892a81c197cc1be08e036ea2c1dd84307a71337531b6cb2213e248a", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "06b2da14816eff2d3c090f6177ee300e5149ff537f2f0f5ff12b3f762aa191cf", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2.tar.gz", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -108,34 +108,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "246640c171b9e89c135360ae52b6720f1d18e591f9c16023b14b6597131833be", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1.tar.gz", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "649031bb8d51576a9bf082db466025e59871c7f87c001eefea520db3a875ba67", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2.tar.gz", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.2", - "sha256": "53c076815e257e917a5a3dba53a5990e079a83b69195d57a2c0c72fb61ae76e8", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.tar.gz", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "0ddc51d8585a4a64fc882043b8367caaabc86c688cf6e0880002de0892905f47", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1.tar.gz", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "a598c2686a6c8e4d6b19e1a0a54c78c2c77a772c35ef041244fece64940d8b93", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.tar.gz", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "c7bb12ff65a27dc76b81293e0e61b846b2ce9328bfeb8d75fe50ccf564e81078", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2.tar.gz", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", - "version": "2024.1 EAP", - "sha256": "7da1531fc7f1f3995957729b412bf43e5757b0029ffcdf858270e64ae30ee462", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.tar.gz", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "89d1f4bda404bb81c315600f6b673f89e2798066f68b661a904c9e30db45b4e8", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.tar.gz", + "build_number": "242.21870.138" } }, "aarch64-linux": { @@ -150,10 +150,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "2570ecc174498cd137d0df877ddc174a8dab51297851170a8438338361b1674c", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "35e089b8d8bf5f32c80022f394fe525b8aa37540d26c27e861db0df9e34716a4", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -166,10 +166,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "2d6e0ed778d9697f80ed38c2cb2976df179e5b24144dc42558fd3ca3ba7e54c9", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "e529c27d3c5eeabec02c7ff2e3c0a682d60b962923054cb9dca2e46bf1ec9104", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -182,26 +182,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.2.1.1", - "sha256": "92382b20b570621811bff7e92fe9ab4adae26e4656e60912810bbe1b073f8bb1", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1-aarch64.tar.gz", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "e8057ccf02fa369daa40e2ee7053cd8eb39f2bfd9405e7efdb0b5712b8c80cc4", + "url": "https://download.jetbrains.com/go/goland-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "de1b3e5af326131a4131dde5cfa219a98c7d1e9397083e99a1613b935b351247", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "53bc06be660138e2192d94383badd3cee743576970afe3b87402c453fa71ac35", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "12757b81db19b31311f356921961e3cbd34d1aec98d03865402a0053c6129228", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "3e5c44a444ec397298d6eeb8a7b6401c630999b636aecbaee1134f3f05aed06a", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -223,18 +223,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "1f4ba170363bfce4d434d2b39aa0ef645c2841ece58b0225243dc9136a37e378", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "4d5d7b9e075c92b12c570a16c933f10455c666bc2f9b05dfdcd5b1a0df6b8f61", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "76dd1747a5072d736129311c596ed6d5f4a628ebbbce136a5810b9ecee091953", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "288ae2742286c6235c6db4c6b1e17df629b1135428b07ee4de152877427657fb", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -247,34 +247,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "c45cead59007fc00b68e450724618534d4c8f649d72da8c1afadcc0aa6014ad0", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "6ca2c822bdcad8e039d59f1a0e376e4bba6b8d6a5c1caf73068c25c439bf420d", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.2", - "sha256": "6af71fbb8f8e1eb7ab2ddab7ecaf6ecca89eedf37d24ebbf1607c158328b7c96", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2-aarch64.tar.gz", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "a83845ff6a2ca43d0d7a2d386f6a5b1359a021bd05055334bcef804afc1a0ea8", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1-aarch64.tar.gz", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "7ad8a2a81f1d0cf3f4cc17eb988189133f9d3f250fe62aa31bff2d8a10e29ce1", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "6a515ada0410bf94ffed892863b0156acb41c170f78041a12bdd891cad9ea782", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", - "version": "2024.1 EAP", - "sha256": "2f8d90582f19eee4c1b83d9c61846baa7ec3f4e75dde10ba069712e9677b2a60", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.tar.gz", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "28a7504a29ba573632e300fbe845d3b2fe3f2c689a853abf83e32ae161e476da", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.tar.gz", + "build_number": "242.21870.138" } }, "x86_64-darwin": { @@ -289,10 +289,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.2.1", - "sha256": "b5eeedf09b62bba538e630e19f93d339639ec2a646da32b027d4bd66b7d54b7d", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1.dmg", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "35e1a0348353bc8c741c2dea429d0554c7d2a201e9c69b3bfc11c67accab2c52", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -305,10 +305,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.2.1", - "sha256": "fe47cf2258d935316f5c47fb68dbe68ea612a5b14668d4755c1580d3a32bda5c", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1.dmg", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "2afdedae414e62077580c88c76093ea608b49aa3e4c9c9f1ec8aef7d467a7285", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -321,26 +321,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.2.1.1", - "sha256": "44c84b628665b4778ae4981419b796f0eed3942d43a99b2f7692706452aef493", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1.dmg", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "d788731f83254780e612234265976cbdcbf7bb334aa2bd7c610795d7fb843948", + "url": "https://download.jetbrains.com/go/goland-2024.2.2.dmg", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.2.1", - "sha256": "3b6884d12979977530b642a473d4337e724340e0a8448b218e98d733fc35a166", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "993676b837c7c08069120210d64d1bf32f260b40698014f4a4d1bffa763dd830", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2.dmg", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.2.1", - "sha256": "f6c1b20855bd49764c7b039407ae8bb8b029a59cd7f280cccdea19309538910f", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "f2528d8f6f983cbfe16e51221a71009ac3a46e8971259bfeb67471253c0d93f0", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2.dmg", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -362,18 +362,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.2.1", - "sha256": "bfc1f6d282ef67b62385f48cc119743de15e2776ec8cbe0cfe938a51b89e54b4", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "a547dc4beddf883c834eef9fe6594c0a3afe55b58ac3901cd8c3b2fa75663392", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2.dmg", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.2.1", - "sha256": "d20348dfa6393719fc193c6f1fae96be3e52cd795f65eda021501267027e6c1d", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "7389b18bdc27939d5802f79c3acf72e06ac5ca99caed3232fad88191e54fa3db", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2.dmg", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -386,34 +386,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.2.1", - "sha256": "3bc2e6e43fae8f799c4a5d42a4c33d9ae13039b40e7c28bd010a77c5cb8e421f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1.dmg", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "91cd4a4d0f262096992a2e021249d49851fbdc3537c8e5daa323b0ff4c1eb3b3", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2.dmg", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.2", - "sha256": "80f995b53bf59dce729b8a6b13dff105c205b5f32b7e266135450975ac96ee7c", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.dmg", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "3bf77bbf2aa459d939567fa34291e30ae91ac9759eb40a229d3bc3ea326b7c5b", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1.dmg", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.2.1", - "sha256": "b2fd1750c80d3568906f9f4ab098584be836092bafb97eee3c79acc9a36d626f", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.dmg", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "0ed0beb4e4b29f6fcd265b6f9cafa193908b66cd5b38cc1c5d1231ef0894c253", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2.dmg", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", - "version": "2024.1 EAP", - "sha256": "fad7fbf6fec147556b53b75adb02f22df038822f4cb0662dd4748dcc1ffd0969", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.dmg", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "bcf989440a220fff70600d38333bc99feef0453779e60caae0d05d1168cfffb0", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.dmg", + "build_number": "242.21870.138" } }, "aarch64-darwin": { @@ -428,10 +428,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "40564665e759ef179dbf542abe8af57bb15f16c8d05d9c18c700ae81755e6516", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1-aarch64.dmg", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "428d557d4b5eb7687c7c8142b61591ef4fe7825891d91616019292280696180e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -444,10 +444,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "d64d0a1c53f06aecc16f24c3203c662576ad89dc5939e5bc94417a2991b23c63", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1-aarch64.dmg", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "3d153a2813dd5b1527a0e5c429a390cdcb7d921774c369818283a6706bb47375", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -460,26 +460,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.2.1.1", - "sha256": "0ba62dbed71550a9c1e1535f6a1d6dbfe826d0bf1f7da84e40d9dee9b8e358b8", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1-aarch64.dmg", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "a1adfa54a4055fbd833e6b161c848c64ff1ae13b72356eb8febd1c22ea6a5c45", + "url": "https://download.jetbrains.com/go/goland-2024.2.2-aarch64.dmg", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "b898426542106785d79fc1412191895f2096118b61633258b381426f5dbcec11", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1-aarch64.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "cb71c104ac76d0cba1e44cac61f1d463bb9d62fe139477966407e21bc30d8ea0", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2-aarch64.dmg", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "2546d5b396aaa2d80626175327b2d6f6f1d4494ececbd115b236b40bbb4aec45", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1-aarch64.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "27b777df1b2ba531d68ef30ebaaf11460a8ab055da8afcfb4886fce3d04d0227", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2-aarch64.dmg", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -501,18 +501,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "479cfd05514df177bca56cf3406a944ef6bbdbdffb78adddec024e7209a7452f", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1-aarch64.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "b8b65a88ea58106c60e69aed12b675dfc99db62069fa632ad0a63baa33580e7a", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2-aarch64.dmg", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "0f50296747f198383154747da4dae6f2a6cd6cc51dba077ee5dbceac062e197b", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1-aarch64.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "8ac248d41defa9aef0726d42130b66e237758a3f8e4030f2e3b48904b6e903c8", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2-aarch64.dmg", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -525,34 +525,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "feca00900fc89e03c92a12d2643e927daa47eb026db2bf635b058c5e292a45a4", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1-aarch64.dmg", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "38aabad86bb7357592fdc378e0ee1ff96651dffef09b3f9b29ccf42d183b04ec", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2-aarch64.dmg", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.2", - "sha256": "1f8e9a3d53eed9a7b292db588d1f75822c363172117c6e69a30fd369907c2bf9", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2-aarch64.dmg", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "9d3cac1b51163deda1367fee69d9449aa7c2ff3ca8634bb0590fb33f8c9878d6", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1-aarch64.dmg", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "744e7c654c3c0bafbea85b2fc48a581cd2ad44e2384f481e3183eb835262150a", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1-aarch64.dmg", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "3aeebdd0832092fbadd0706eb9576cc3df13c1fee2af97971a7f35d28c88b8d7", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2-aarch64.dmg", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", - "version": "2024.1 EAP", - "sha256": "dc1d01915ff31d14828b668b71cfc92529d389af122adca06d785f7cc3a9d784", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.dmg", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "cb815cfe2fa9fd69675a31cb870ccf5037ac429a954cb950141074668f250014", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.dmg", + "build_number": "242.21870.138" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 8188a82c2c..0e3241a039 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -39,7 +39,7 @@ let products = versions.${system} or (throw "Unsupported system: ${system}"); - package = if stdenv.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; + package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; mkJetBrainsProductCore = callPackage package { inherit vmopts; }; mkMeta = meta: fromSource: { inherit (meta) homepage longDescription; @@ -47,7 +47,7 @@ let maintainers = map (x: lib.maintainers."${x}") meta.maintainers; license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree; sourceProvenance = if fromSource then [ lib.sourceTypes.fromSource ] else - (if stdenv.isDarwin then [ lib.sourceTypes.binaryNativeCode ] else [ lib.sourceTypes.binaryBytecode ]); + (if stdenv.hostPlatform.isDarwin then [ lib.sourceTypes.binaryNativeCode ] else [ lib.sourceTypes.binaryBytecode ]); }; mkJetBrainsProduct = @@ -85,7 +85,7 @@ let }); buildPycharm = args: - (mkJetBrainsProduct args).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs stdenv.isLinux { + (mkJetBrainsProduct args).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs stdenv.hostPlatform.isLinux { buildInputs = with python3.pkgs; (previousAttrs.buildInputs or []) ++ [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" @@ -106,7 +106,7 @@ rec { clion = (mkJetBrainsProduct { pname = "clion"; - extraBuildInputs = lib.optionals (stdenv.isLinux) [ + extraBuildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ fontconfig python3 stdenv.cc.cc @@ -114,13 +114,13 @@ rec { libxcrypt-legacy lttng-ust_2_12 musl - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/clion @@ -131,7 +131,7 @@ rec { ) ''; - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/clion @@ -175,7 +175,7 @@ rec { extraBuildInputs = [ libgcc stdenv.cc.cc ]; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.hostPlatform.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv @@ -186,7 +186,7 @@ rec { idea-community-src = buildIdea { pname = "idea-community"; extraBuildInputs = [ stdenv.cc.cc ]; fromSource = true; }; - idea-community = if stdenv.isDarwin || stdenv.isAarch64 then idea-community-bin else idea-community-src; + idea-community = if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64 then idea-community-bin else idea-community-src; idea-ultimate = buildIdea { pname = "idea-ultimate"; extraBuildInputs = [ stdenv.cc.cc lldb musl ]; }; @@ -198,7 +198,7 @@ rec { pycharm-community-src = buildPycharm { pname = "pycharm-community"; fromSource = true; }; - pycharm-community = if stdenv.isDarwin then pycharm-community-bin else pycharm-community-src; + pycharm-community = if stdenv.hostPlatform.isDarwin then pycharm-community-bin else pycharm-community-src; pycharm-professional = buildPycharm { pname = "pycharm-professional"; extraBuildInputs = [ musl ]; }; @@ -211,14 +211,14 @@ rec { libxcrypt lttng-ust_2_12 musl - ]++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ]++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/rider @@ -240,20 +240,20 @@ rec { rust-rover = (mkJetBrainsProduct { pname = "rust-rover"; - extraBuildInputs = lib.optionals (stdenv.isLinux) [ + extraBuildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ python3 openssl libxcrypt-legacy fontconfig xorg.libX11 libGL - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/rust-rover diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json index a65ae16ddd..1a42322b95 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.21829.154": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.21829.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.21829.210": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/631/595102/python-242.21829.142.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/631/605042/python-242.22855.74.zip" }, "name": "python" }, @@ -46,7 +46,7 @@ "idea-ultimate" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/1347/595821/scala-intellij-bin-2024.2.25.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/1347/595821/scala-intellij-bin-2024.2.25.zip" }, "name": "scala" }, @@ -68,16 +68,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.21829.154": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.21829.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.21829.210": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -99,16 +99,16 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": null, - "242.21829.149": null, - "242.21829.150": null, - "242.21829.153": null, "242.21829.154": null, "242.21829.162": null, - "242.21829.173": null, - "242.21829.198": null, "242.21829.210": null, - "242.21829.220": null + "242.21829.233": null, + "242.22855.74": null, + "242.22855.75": null, + "242.22855.77": null, + "242.22855.79": null, + "242.22855.85": null, + "242.22855.92": null }, "name": "kotlin" }, @@ -130,16 +130,16 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", "242.21829.154": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", "242.21829.162": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", "242.21829.210": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip" }, "name": "ini" }, @@ -161,16 +161,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.21829.154": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.21829.162": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.21829.210": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -180,8 +180,8 @@ "phpstorm" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip" + "242.21829.154": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -191,8 +191,8 @@ "phpstorm" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip" + "242.21829.154": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip" }, "name": "php-annotations" }, @@ -209,14 +209,14 @@ "webstorm" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", "242.21829.162": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", "242.21829.210": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip" }, "name": "python-community-edition" }, @@ -238,16 +238,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.21829.154": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.21829.162": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.21829.210": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" }, "name": "asciidoc" }, @@ -268,15 +268,15 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": null, - "242.21829.149": null, - "242.21829.150": null, - "242.21829.153": null, "242.21829.154": null, "242.21829.162": null, - "242.21829.173": null, "242.21829.210": null, - "242.21829.220": null + "242.22855.74": null, + "242.22855.75": null, + "242.22855.77": null, + "242.22855.79": null, + "242.22855.85": null, + "242.22855.92": null }, "name": "-deprecated-rust" }, @@ -297,15 +297,15 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": null, - "242.21829.149": null, - "242.21829.150": null, - "242.21829.153": null, "242.21829.154": null, "242.21829.162": null, - "242.21829.173": null, "242.21829.210": null, - "242.21829.220": null + "242.22855.74": null, + "242.22855.75": null, + "242.22855.77": null, + "242.22855.79": null, + "242.22855.85": null, + "242.22855.92": null }, "name": "-deprecated-rust-beta" }, @@ -319,10 +319,10 @@ "ruby-mine" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip" }, "name": "ide-features-trainer" }, @@ -344,16 +344,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.21829.154": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.21829.162": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.21829.210": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip" }, "name": "nixidea" }, @@ -363,8 +363,8 @@ "idea-ultimate" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/9568/602850/go-plugin-242.22855.36.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/9568/602850/go-plugin-242.22855.36.zip" }, "name": "go" }, @@ -386,16 +386,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.21829.154": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.21829.162": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.21829.210": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" }, "name": "csv-editor" }, @@ -416,17 +416,17 @@ "webstorm" ], "builds": { - "241.18034.1093": "https://plugins.jetbrains.com/files/11349/599319/aws-toolkit-jetbrains-standalone-3.27-241.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.162": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.210": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip", + "242.21829.154": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.21829.210": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.21829.233": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip" }, "name": "aws-toolkit" }, @@ -448,16 +448,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.21829.154": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.21829.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.21829.210": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" }, "name": "vscode-keymap" }, @@ -479,16 +479,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.21829.154": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.21829.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.21829.210": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" }, "name": "eclipse-keymap" }, @@ -510,16 +510,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "242.21829.154": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "242.21829.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "242.21829.210": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip" }, "name": "visual-studio-keymap" }, @@ -541,16 +541,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", "242.21829.154": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", "242.21829.162": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", "242.21829.210": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip" }, "name": "protocol-buffers" }, @@ -572,16 +572,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.142": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.149": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.150": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.153": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.21829.154": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.21829.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.173": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.198": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.21829.210": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.220": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "242.21829.233": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.74": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.75": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.77": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.79": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.85": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -602,17 +602,17 @@ "webstorm" ], "builds": { - "241.18034.1093": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.162": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.210": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.154": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.210": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.233": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip" }, "name": "github-copilot" }, @@ -634,16 +634,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.21829.154": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.21829.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.21829.210": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -665,16 +665,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.21829.154": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.21829.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.21829.210": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" }, "name": "mermaid" }, @@ -685,9 +685,9 @@ "rust-rover" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip" }, "name": "rust" } @@ -695,8 +695,8 @@ "files": { "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=", "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=", - "https://plugins.jetbrains.com/files/11349/599319/aws-toolkit-jetbrains-standalone-3.27-241.zip": "sha256-vuIy/D4SfC/da1/jk7eMTutzd78hLvpYxayKCFgW82o=", - "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip": "sha256-x4s8KTIsaFGAs0u9JEa9wYsuFl3BEtIdxKnyXi0rT9Q=", + "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip": "sha256-rMgAPGqgERLKmMNafg17h//WR9Z+etkawd/OdDse4eI=", + "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip": "sha256-bIj7qOW4CBCwNiBK700Zh90Ijy2I+78rwN5zhUeMwuw=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=", "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=", @@ -708,21 +708,23 @@ "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip": "sha256-Y6xplTjA9bmhwLS9clcu/4znltSgDsga8Na5BmOWX5E=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", - "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip": "sha256-e8HxsXEmIg+jG10xjgipohmW8ioMLF8oJwAjsfoV/7M=", + "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip": "sha256-uL4rU//ylp54t6GZu+29fYtR6OOpnUcqeOb9O4ihc/g=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=", - "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip": "sha256-FOk15tRjpx/nkqyBfsnAg/NuX7dXvBhUEfTujp7ZZ1E=", - "https://plugins.jetbrains.com/files/631/595102/python-242.21829.142.zip": "sha256-dj4iIATUB3PqS0d07VHeYB7jFGWVi5c/kChBUoqk9mI=", + "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip": "sha256-Xyk+BH3LOdMcX6wty93MlRlGHzF0JRscDBV433mQ+Hw=", + "https://plugins.jetbrains.com/files/631/605042/python-242.22855.74.zip": "sha256-N+tuECdbVGJa6O5ZkSuxalo8akQnPYYCj6HvSm5Jx4o=", "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip": "sha256-J6v5zHD7n1uqp3p2TptZpkPbGtkdFZdNCA+Xw4aHKDE=", + "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip": "sha256-3/tYDIubSx7/xV+u96UXIiJBBm3BMhKmarzOYSU1q0k=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", - "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip": "sha256-2E3Hk8JdhZH+JFHF725Z9vGncx6HSKgd+LYlCpmh1KY=", + "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip": "sha256-kRqgAW0bYEWLTCC6q2hhPmDwnOx3kiuqPhriZWizxTw=", "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip": "sha256-DwQNhbNO1zk75lcf35spNnzo0u103UAhXignhO+grek=", + "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip": "sha256-As1MgvssBg+45DLRtNbirT5HyXPcabzt3ulKYBIiWj8=", "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=", "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip": "sha256-pL+j0K6U0DZibnmcIE6kY9Kj/+5g8akuHeuppuZiEII=", "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip": "sha256-j5/LgTrFJ4OEIlocX4jcjgYzHlBId1nh1NfE2qLc1HQ=", - "https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip": "sha256-FPwS5+ERGgGhIgHTZYzlKox3FpNbJoq288ZSviqQlR0=" + "https://plugins.jetbrains.com/files/9568/602850/go-plugin-242.22855.36.zip": "sha256-cDdxT0iKe11d1lM+oj6xiODMuwxwip//vH09V9ZTqBo=" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index dcd6554c79..574938eef0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -27,7 +27,7 @@ buildInputs = [ delve ]; buildPhase = let - arch = (if stdenv.isLinux then "linux" else "mac") + (if stdenv.isAarch64 then "arm" else ""); + arch = (if stdenv.hostPlatform.isLinux then "linux" else "mac") + (if stdenv.hostPlatform.isAarch64 then "arm" else ""); in '' runHook preBuild ln -sf ${delve}/bin/dlv lib/dlv/${arch}/dlv diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix index 943a7e49e9..4158fc3dff 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix @@ -1,11 +1,6 @@ { callPackage -, clangStdenv , cling , fetchurl -, lib -, llvmPackages_13 -, makeWrapper -, runCommand , stdenv }: diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index ec1def8469..b944569ff4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -68,9 +68,7 @@ clangStdenv.mkDerivation rec { zlib ]; - cmakeFlags = lib.optionals debug [ - "-DCMAKE_BUILD_TYPE=Debug" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; postPatch = '' substituteInPlace src/xmagics/executable.cpp \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter/default.nix index 57122d173a..08c3398236 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter/default.nix @@ -9,7 +9,7 @@ let jupyterPath = (jupyter-kernel.create { inherit definitions; }); jupyter-notebook = (python3.buildEnv.override { extraLibs = [ python3.pkgs.notebook ]; - makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; + makeWrapperArgs = ["--prefix JUPYTER_PATH : ${jupyterPath}"]; }).overrideAttrs(oldAttrs: { meta = oldAttrs.meta // { mainProgram = "jupyter-notebook"; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix index 8de4d1882b..68ff13a021 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix @@ -25,7 +25,7 @@ , xorg }: let - rpathLibs = lib.optionals stdenv.isLinux [ + rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ libGL libxkbcommon xorg.libX11 @@ -89,9 +89,9 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security CoreServices @@ -100,7 +100,7 @@ rustPlatform.buildRustPackage rec { AppKit ]; - postInstall = if stdenv.isLinux then '' + postInstall = if stdenv.hostPlatform.isLinux then '' install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop @@ -125,6 +125,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ elliot ]; mainProgram = "lapce"; # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL" - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix index 02e225a5ff..5d4031b064 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image lua # no v8 due to missing libplatform and libbase - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_WEBP_SUPPORT=ON" ]; - hardeningDisable = lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; # Install mime icons. Note that the mimetype is still "x-aseprite" postInstall = '' @@ -116,6 +116,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/LibreSprite/LibreSprite/issues/308 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix index 55fce51ac9..ac13fc3bf5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { lua5_4 pcre2 SDL2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix b/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix index bd8a4b0c64..db4d65de79 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "CONFIG+=mfwebengine" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir "$out"/Applications mv app/mindforger.app "$out"/Applications/ ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/nedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nedit/default.nix index 374c5ee28c..d329220409 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nedit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ motif libXpm libXt ]; # the linux config works fine on darwin too! - buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; + buildFlags = lib.optional (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) "linux"; env.NIX_CFLAGS_COMPILE = "-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/build-neovim-plugin.nix index 9d9778c1fe..6f9bda5b10 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -11,13 +11,15 @@ in # function to create vim plugin from lua packages that are already packaged in # luaPackages { - # the lua attribute name that matches this vim plugin. Both should be equal - # in the majority of cases but we make it possible to have different attribute names - luaAttr ? (normalizeName attrs.pname) + # the lua derivation to convert into a neovim plugin + luaAttr ? (lua.pkgs.${normalizeName attrs.pname}) , ... }@attrs: let - originalLuaDrv = lua.pkgs.${luaAttr}; + originalLuaDrv = if (lib.typeOf luaAttr == "string") then + lib.warn "luaAttr as string is deprecated since September 2024. Pass a lua derivation directly ( e.g., `buildNeovimPlugin { luaAttr = lua.pkgs.plenary-nvim; }`)" lua.pkgs.${normalizeName luaAttr} + else luaAttr; + luaDrv = originalLuaDrv.overrideAttrs (oa: { version = attrs.version or oa.version; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix index 1cf02746f9..7869885d1b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \ --prefix PATH : "${neovim}/bin" \ --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share" ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons" diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix index 9152d93c15..14d682e14e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix @@ -1,4 +1,13 @@ -# run tests by building `neovim.tests` +/* +run tests with `nix-build -A neovim.tests` + +The attrset exposes both the wrapped neovim and the associated test for easier debugging + +Here are some common neovim flags used in the tests: +-e runs neovim in `:h Ex-mode` which returns an exit code != 0 when hitting an error +-i NONE gets rid of shada warnings + +*/ { vimUtils, writeText, neovim, vimPlugins , neovimUtils, wrapNeovimUnstable , neovim-unwrapped @@ -43,7 +52,7 @@ let ''; }; - nvim-with-luasnip = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { + nvim-with-luasnip = wrapNeovim2 "-with-luasnip" (makeNeovimConfig { plugins = [ { plugin = vimPlugins.luasnip; @@ -65,15 +74,6 @@ let sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; }; - # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex - # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin - # we save b:did_ftplugin's value in a `plugin_was_loaded_too_late` file - texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} '' - mkdir -p $out/ftplugin - echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' >> $out/ftplugin/tex.vim - echo ':q!' >> $out/ftplugin/tex.vim - '') // { pname = "test-ftplugin"; }; - # neovim-drv must be a wrapped neovim runTest = neovim-drv: buildCommand: runCommandLocal "test-${neovim-drv.name}" ({ @@ -81,18 +81,21 @@ let meta.platforms = neovim-drv.meta.platforms; }) ('' source ${nmt}/bash-lib/assertions.sh - vimrc="${writeText "init.vim" neovim-drv.initRc}" - luarc="${writeText "init.lua" neovim-drv.luaRcContent}" + vimrc="${writeText "test-${neovim-drv.name}-init.vim" neovim-drv.initRc}" + luarc="${writeText "test-${neovim-drv.name}-init.lua" neovim-drv.luaRcContent}" luarcGeneric="$out/patched.lua" vimrcGeneric="$out/patched.vim" mkdir $out + export HOME=$TMPDIR ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$luarc" > "$luarcGeneric" '' + buildCommand); in - pkgs.recurseIntoAttrs ( -rec { + pkgs.recurseIntoAttrs (rec { + + inherit nmt; + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; ### neovim tests @@ -138,11 +141,21 @@ rec { }; run_nvim_with_plug = runTest nvim_with_plug '' - export HOME=$TMPDIR - ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! -e + ${nvim_with_plug}/bin/nvim -V3log.txt -i NONE -c 'color base16-tomorrow-night' +quit! -e ''; - nvim_with_ftplugin = neovim.override { + nvim_with_ftplugin = let + # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex + # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin + # we save b:did_ftplugin's value in a `plugin_was_loaded_too_late` file + texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} '' + mkdir -p $out/ftplugin + echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' >> $out/ftplugin/tex.vim + echo ':q!' >> $out/ftplugin/tex.vim + '') // { pname = "test-ftplugin"; }; + in + + neovim.override { extraName = "-with-ftplugin"; configure.packages.plugins = { start = [ @@ -154,13 +167,14 @@ rec { # regression test that ftplugin files from plugins are loaded before the ftplugin # files from $VIMRUNTIME run_nvim_with_ftplugin = runTest nvim_with_ftplugin '' - export HOME=$TMPDIR echo '\documentclass{article}' > main.tex - ${nvim_with_ftplugin}/bin/nvim main.tex -c "set ft?" -c quit + ${nvim_with_ftplugin}/bin/nvim -i NONE -V3log.txt main.tex -c "set ft?" -c quit ls -l $TMPDIR - # if the file exists, then our plugin has been loaded instead of neovim's - [ ! -f plugin_was_loaded_too_late ] + # check the saved value b:did_ftplugin then our plugin has been loaded instead of neovim's + result="$(cat plugin_was_loaded_too_late)" + echo $result + [ "$result" = 0 ] ''; @@ -191,8 +205,8 @@ rec { ]; }; }; + checkHelpLuaPackages = runTest nvim_with_gitsigns_plugin '' - export HOME=$TMPDIR ${nvim_with_gitsigns_plugin}/bin/nvim -i NONE -c 'help gitsigns' +quitall! -e ''; @@ -220,8 +234,8 @@ rec { checkAliases = runTest nvim_with_aliases '' folder=${nvim_with_aliases}/bin - assertFileExists "$folder/vi" - assertFileExists "$folder/vim" + assertFileIsExecutable "$folder/vi" + assertFileIsExecutable "$folder/vim" ''; # having no RC generated should autodisable init.vim wrapping @@ -247,8 +261,7 @@ rec { }); nvim_with_lua_packages = runTest nvimWithLuaPackages '' - export HOME=$TMPDIR - ${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es + ${nvimWithLuaPackages}/bin/nvim -V3log.txt -i NONE --noplugin +quitall! -e ''; # nixpkgs should install optional packages in the opt folder @@ -286,7 +299,6 @@ rec { }; run_nvim_with_opt_plugin = runTest nvim_with_opt_plugin '' - export HOME=$TMPDIR ${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e ''; @@ -296,9 +308,8 @@ rec { # for instance luasnip has a dependency on jsregexp can_require_transitive_deps = runTest nvim-with-luasnip '' - export HOME=$TMPDIR cat ${nvim-with-luasnip}/bin/nvim - ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e + ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall! ''; }) diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 02d6ad85b3..8bcd1b5ebb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -2,10 +2,8 @@ , writeText , nodePackages , python3 -, python3Packages , callPackage , neovimUtils -, vimUtils , perl , lndir }: @@ -107,7 +105,7 @@ let luaRcContent = rcContent; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim-unwrapped}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace-warn 'Name=Neovim' 'Name=Neovim wrapper' diff --git a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix index 45004d4702..2a20691351 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { --replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' "" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/bin $out/Applications rm -fr $out/share ''; @@ -38,7 +38,7 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.sebtm ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "NotepadNext"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix index 2001ba2497..c5ef872bff 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Berkeley Vi Editor"; license = licenses.free; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index b50d505e2d..a5d3981863 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -1,5 +1,5 @@ { lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell -, runCommand, unstick, quartus-prime-lite +, runCommand, unstick, quartus-prime-lite, libfaketime, pkgsi686Linux , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; } @@ -85,15 +85,28 @@ in buildFHSEnv rec { progs_wrapped=() for prog in ''${progs_to_wrap[@]}; do relname="''${prog#"${unwrapped}/"}" + bname="$(basename "$relname")" wrapped="$out/$relname" progs_wrapped+=("$wrapped") mkdir -p "$(dirname "$wrapped")" echo "#!${runtimeShell}" >> "$wrapped" + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=1 case "$relname" in questa_fse/*) echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped" + # Any use of LD_PRELOAD breaks Questa, so disable the + # SOURCE_DATE_EPOCH code path. + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0 ;; esac + # SOURCE_DATE_EPOCH blocklist for programs that are known to hang/break + # with fixed/static clock. + case "$bname" in + jtagd|quartus_pgm|quartus) + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0 + ;; + esac + echo "export NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" >> "$wrapped" echo "exec $wrapper $prog \"\$@\"" >> "$wrapped" done @@ -116,6 +129,17 @@ in buildFHSEnv rec { if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi + + # Implement the SOURCE_DATE_EPOCH specification for reproducible builds + # (https://reproducible-builds.org/specs/source-date-epoch). + # Require opt-in with NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 for now, in case + # the blocklist is incomplete. + if [ -n "$SOURCE_DATE_EPOCH" ] && [ "$NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD" = 1 ] && [ "$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" = 1 ]; then + export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libfaketime pkgsi686Linux.libfaketime ]}''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_PRELOAD=libfaketime.so.1''${LD_PRELOAD:+:$LD_PRELOAD} + export FAKETIME_FMT="%s" + export FAKETIME="$SOURCE_DATE_EPOCH" + fi '' + extraProfile; # Run the wrappers directly, instead of going via bash. @@ -126,6 +150,7 @@ in buildFHSEnv rec { tests = { buildSof = runCommand "quartus-prime-lite-test-build-sof" { nativeBuildInputs = [ quartus-prime-lite ]; + env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1"; } '' cat >mydesign.vhd < "$out" ''; - questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" {} '' - "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v" - touch "$out" - ''; + questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" + { env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1"; + } + '' + "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v" + touch "$out" + ''; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix index 1991b2a7bc..946a56917d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Simple XML editor based on qt libraries"; homepage = "https://sourceforge.net/projects/qxmledit"; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix index 55e737a780..f6f1bf2b28 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config which zip ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ botan3 capstone jansson libunistring wxGTK32 ] ++ (with lua53Packages; [ lua busted ]) ++ (with perlPackages; [ perl TemplateToolkit ]) - ++ lib.optionals stdenv.isLinux [ gtk3 ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ]; makeFlags = [ "prefix=${placeholder "out"}" "BOTAN_PKG=botan-3" "CXXSTD=-std=c++20" - ] ++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 4d606904e2..55998bcbe3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -212,7 +212,7 @@ in ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); inherit description; homepage = "https://www.rstudio.com/"; license = lib.licenses.agpl3Only; diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix index 6c9a43779f..a57fc8d7de 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $out/sublime/sublime_text mkdir -p $out/share/icons diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix index ad89c80fc8..7eff7d9bf4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix @@ -65,7 +65,7 @@ let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done @@ -92,7 +92,7 @@ let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -101,7 +101,7 @@ let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix index 730f9c10b8..b594633ea3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix @@ -88,7 +88,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix index cf19ea5a8c..92d162cdc3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -21,7 +21,7 @@ let pname = "texmacs"; - version = "2.1.2"; + version = "2.1.4"; common = callPackage ./common.nix { inherit extraFonts chineseFonts japaneseFonts koreanFonts; tex = texliveSmall; @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - hash = "sha256-Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM="; + hash = "sha256-h6aSLuDdrAtVzOnNVPqMEWX9WLDHtkCjPy9JXWnBgYY="; }; postPatch = common.postPatch + '' @@ -58,18 +58,18 @@ stdenv.mkDerivation { sqlite git python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "TEXMACS_GUI" "Qt") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "./TeXmacs.app/Contents/Resources") ]; env.NIX_LDFLAGS = "-lz"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv TeXmacs.app $out/Applications/ makeWrapper $out/Applications/TeXmacs.app/Contents/MacOS/TeXmacs $out/bin/texmacs @@ -87,7 +87,7 @@ stdenv.mkDerivation { ]) ]; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapQtApp $out/bin/texmacs ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index f0bed0eb38..728ff5525e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { qttools quazip zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/bin/texstudio.app" "$out/Applications" rm -d "$out/bin" diff --git a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix index 4ddd4c9cb6..a20bc426b3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { qttools ] ++ lib.optional withLua lua ++ lib.optional withPython python3 - ++ lib.optional stdenv.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; cmakeFlags = [ "-DQT_DEFAULT_MAJOR_VERSION=6" diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix index 060c30a171..54f0f154ab 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix @@ -38,7 +38,7 @@ crystal.buildCrystalPackage rec { ''; nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ gtk4 libadwaita vte-gtk4 libgit2 gtksourceview5 editorconfig-core-c ]; buildTargets = [ "all" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix index 663dc5b688..5183ee5d39 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix @@ -11,7 +11,7 @@ , features ? "huge" # One of tiny, small, normal, big or huge , wrapPythonDrv ? false -, guiSupport ? config.vim.gui or (if stdenv.isDarwin then "gtk2" else "gtk3") +, guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3") , luaSupport ? config.vim.lua or true , perlSupport ? config.vim.perl or false # Perl interpreter , pythonSupport ? config.vim.python or true # Python interpreter @@ -104,7 +104,7 @@ in stdenv.mkDerivation { "vim_cv_memmove_handles_overlap=yes" ] ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ lib.optionals luaSupport [ "--with-lua-prefix=${lua}" @@ -163,7 +163,7 @@ in stdenv.mkDerivation { ++ lib.optional sodiumSupport libsodium; # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; preConfigure = lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim @@ -176,7 +176,7 @@ in stdenv.mkDerivation { postInstall = '' ln -s $out/bin/vim $out/bin/vi - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix index 0572977f20..f3218a0f2e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -47,7 +47,7 @@ let [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix index e557cd7eff..fd821bbec9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { callPackage, config, lib, vimUtils, vim, darwin, llvmPackages +, neovim-unwrapped , neovimUtils -, luaPackages }: let @@ -27,7 +27,7 @@ let overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; inherit buildVimPlugin; - inherit llvmPackages luaPackages; + inherit llvmPackages; }; aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: {}; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json index 4a5214db0b..05678e6136 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json @@ -7,10 +7,6 @@ "date": "2021-12-07", "new": "cmp-tmux" }, - "taskwarrior": { - "date": "2024-08-13", - "new": "taskwarrior3 or taskwarrior2" - }, "fern-vim": { "date": "2024-05-12", "new": "vim-fern" @@ -67,6 +63,10 @@ "date": "2024-05-12", "new": "vim-suda" }, + "taskwarrior": { + "date": "2024-08-13", + "new": "taskwarrior3 or taskwarrior2" + }, "vim-fsharp": { "date": "2024-03-16", "new": "zarchive-vim-fsharp" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 9968cc9e3f..a474cdd1ac 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,24 +65,24 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-09-06"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "9e7010bd33808e31d3f729b5e18a772d8e84f704"; - sha256 = "1srs6hrbqkil9s0ckcwgi5gj5mawcgah43yc0rr9lalx5m9my1md"; + rev = "2352cd3e7e980cd73594be05f96b2dc4c0dd4a74"; + sha256 = "0pwrrm2p2bdxsd622smvx5q6ppsi590s5vyqzrs6yzkb7n2pnik6"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-09-04"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "c1ae5b36b7f6dad31d176bf7bcffef36c7cac731"; - sha256 = "1907pq0x7pcs6b6xnq4yzlblazklhlg0fpc2dy6ckdhz4n77gc34"; + rev = "299d0acdb9b697fd951df81a5d67e3f5cb6ed4f9"; + sha256 = "1z7gwpy14h1icsxfz67nzj56fn2gwxa0bf49rw24kfwnr1zbw75r"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-08-31"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "3dbace941ee935c89c73fd774267043d12f57fe2"; - sha256 = "0dgkvjkd9g0dr8mcp7l5n162h5kds86hlyhk1q2jj1y7iwfv7wbs"; + rev = "a1c3ec4cd43fe61e3b614237a46ac92771191c81"; + sha256 = "1d7iqdfyqg09m0mxixz4lya669ys4gvplls8x3k4a7c2rad93gp3"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-09-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "71ac24712da87ac127fd4d9656d61274909e938a"; - sha256 = "0ddjaiy7rmrz1cj5qpbch1md2f3rv3r9sydmh9yvgj7ali81nazf"; + rev = "74f3042368b547d481fc08464e9f42c5ddc79b15"; + sha256 = "1qkhydsdzn9909yvyx1mqam91habdsbfxda0fwnnvv1437a214sg"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-09-09"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b546852f7a477276805b01f84ac79c28a962c55b"; - sha256 = "1pfm1c8nrjyfwvgzdd23qgnxmxyp3ngaqk5a4wvxk9xglmbghzn3"; + rev = "efa0466f9f7971256ad5da010832180fc7d8996b"; + sha256 = "0lncv6w1bk7n3azibvdn6jnqif94mqsfs7rxfs9cqyvnpqkrda53"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -401,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-08-15"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "0aa951d7e9f526e6f974d679b181f28854935851"; - sha256 = "0vws21psgl9807czshdqkl9218jkbv7gdkflaxp8kwvp0x4d3chq"; + rev = "533c40395c2073340a613f9569b4d20ab84d498a"; + sha256 = "0750hgh193avdwlnm4k9sa2rg27vsirrn79dda48hbiss1x8sn69"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -473,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-08-27"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "b6e8c64d96b02d60b3751d6a51af7dc958054f8f"; - sha256 = "1jkwcsh2hwsrax7p3dzp349i6sa3iqkpbmajzfcsbzllknax5sd5"; + rev = "63ab13e95141c252c545f9a6c7144ced6790d68f"; + sha256 = "0v7xb149q9wvmd7arin397415bl6rrscgipwcb46wmjm08qzwjyp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -558,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-09-10"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "fa75fd0286788c6c5a65ec46aafbfaf7b7826b74"; - sha256 = "05c8s4rviin0n33nvk1ccxvidvmp0vq5kjrk3bv406wzqfd2iab0"; + rev = "140f48fb068d21c02e753c63f7443649e55576f0"; + sha256 = "0ba4xd4jqn34vm5n2327awmxv2xz060mfi6zzwja89z5jrkzna7d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -605,6 +605,18 @@ final: prev: meta.homepage = "https://github.com/aduros/ai.vim/"; }; + aider-nvim = buildVimPlugin { + pname = "aider.nvim"; + version = "2023-10-22"; + src = fetchFromGitHub { + owner = "joshuavial"; + repo = "aider.nvim"; + rev = "74a01227271d0ea211f2edafa82028b22d4c2022"; + sha256 = "jkco90IF948LuRILP3Bog3GelUGOQzsEw2jP4f9Ghbw="; + }; + meta.homepage = "https://github.com/joshuavial/aider.nvim/"; + }; + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; version = "2023-09-01"; @@ -727,24 +739,24 @@ final: prev: arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2024-08-27"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "fb8e2cf548f625f6e36cb44d3e65600656924234"; - sha256 = "1sqfnm6izcyap0vg4abnsmjs19dg0x2gzd2icp4bd5h8wps8i9xv"; + rev = "5952360b09a6bcc01718d0d00655d3c17ee51783"; + sha256 = "1cglfx99qc2phylydqph4md02kfsi8rzq5dk1iny8b4sghq46zd6"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; }; astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-09-06"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "037c3dbd161d6744d274243dd71314b2964753b2"; - sha256 = "0pq9kv9xcxp3w1md301c7xlqp79517vji9nddwfpyabca5d7vanv"; + rev = "bc7e4407b553019a54dca4f8c4276d45ab349be8"; + sha256 = "1rcf3s1dhqfl4svvcx5kydfpynd01d8ac6c76phca6qph4622cmv"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -847,12 +859,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-08-07"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "d6ba5dc77dfab73ebeeea16e4f6fbd65400e6905"; - sha256 = "0985s0k0zg0picg5fwzwwlhki61ixsj1zih055h7d0zw1ffkg3k9"; + rev = "09b8117fe607941c0abff39b194074e40a3dee88"; + sha256 = "1ipq20nk1npx5krpjs2rf6fda9sc1lxr69pnm8afbjhfj1c7sqhj"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -943,12 +955,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-09-02"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "a90aa7730efa60fdcc7e00497a8f36d94a6da709"; - sha256 = "1s78iq68s7y8grmxkrjbg6fczi60yzlkji0gh48gavkqrgf5yszx"; + rev = "0caedb838e3cace2eaf52696ec7c8b6000f9ee30"; + sha256 = "1hrw70npsbikk38f58wz2sipsmhx4jn5g0s4k0l7vbl98ghvh7vk"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1064,24 +1076,24 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-08-15"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "02230fc2461e916d9e2a44b5f3487376d9ca3042"; - sha256 = "0h76b42jzzqi18ni66hnaqbm3zi74dr7a4c0mcdg2bhaz2qfhhvf"; + rev = "c245d90c490c681470389e28782b161491bec97c"; + sha256 = "1nycgf8lrvjsswr0z60kbi6s1c14fgzmichmyymm4100ywyp4k6s"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-09-02"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "31b6951c53a59bccfa91bf3984ed1510a940c836"; - sha256 = "0dlkjbnaq787b9ajm9dwf1kg1fyip8jcc5fmmg88r8wk43zfkvms"; + rev = "a3ebfe0c382fc5393b3c0cef96d58c6c49492562"; + sha256 = "1ig2s8zglqkca934ikij17jbblfrzpsrfbjsxs46a3rdgf51pr18"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1124,12 +1136,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-09-06"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "9b81403ef6e29a70bffb7990a0f3dbe5f6095047"; - sha256 = "0vd9s7sah7fjbg1wqjpwpfmf4jsg36wxxlmdlj116jkgg7xijdjq"; + rev = "82d71bc6def6a752cbf5fbd0e496aea5f088d940"; + sha256 = "065zg8m7mlhv68145yf7ar3afj3p6q959b0jrb6j93lkvfrhdzwj"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1592,12 +1604,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-06-25"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "4be3c229fe932043fd83ad52fdf0ba9af7297789"; - sha256 = "12cyls7vsz852b2x8vhs7qwi20kcml4z7zc5b6zaamw2h74an6sm"; + rev = "f1f917b584127b673c25138233cebf1d61a19f35"; + sha256 = "1f7rg7ya307bpjnj7ymsj9q9m0pqhd3dql269hn1a3klpgh853f8"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1616,12 +1628,12 @@ final: prev: cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2024-09-11"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "5bf7e0e1d41b20ffbf68b54da2d9e391abb291ad"; - sha256 = "0a4znnm03y25pby6hxq45n9p3msbb9380kg5y6ag7pj84shppbzg"; + rev = "4424e71bde8acc522ab68a122fa54b14dff3d408"; + sha256 = "0zljcdghyqwhkalir0fcy2q1zp3866qr9j2z9cj8v8z1b54rlax3"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; @@ -2071,12 +2083,12 @@ final: prev: cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; - version = "2024-08-29"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "0f4bf271a8f1eb2c5add4dab712c67aa1f9ca7bd"; - sha256 = "0x1i6zw7qdjj2g164l8899iir519fw5j46nrc97jdfayax3crs4h"; + rev = "c0167cdc86c15e782c5461ee62aebee89231c2ed"; + sha256 = "0z0p8n3nmykn05d7p0kcxir5w2wybkjf6dibinaq8zcjxxsgmcc3"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -2179,12 +2191,12 @@ final: prev: cmp_yanky = buildVimPlugin { pname = "cmp_yanky"; - version = "2023-11-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "cmp_yanky"; - rev = "c3d089186ccead26eba01023502f3eeadd7a92d2"; - sha256 = "sha256-jWNoKzY0x5GPFP7JsQi4nqgg1YFJV4DqxwJRqsg6KaQ="; + rev = "c9cc4824327096ca9c78c275c722a42fd89062c9"; + sha256 = "0d9xmqj30lpgd6bgrkdnwvh3gg6l1hzn8mcxcxhgjk8fy1hl63nq"; }; meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/"; }; @@ -2311,36 +2323,36 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-09-06"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "937667b2cadc7905e6b9ba18ecf84694cf227567"; - sha256 = "12jj92akg681cgd9wyfzh3bd5fjh1wk5x5j4g2nlhvdybipz82kj"; + rev = "f74f999ec5b383dc7a67c0298051ec2be2b17cab"; + sha256 = "07cncgm5lryls213a8zxadkaxpl4j02a5hyxb9c21kwsqff66hzh"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-09-04"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "fc5a68d6273715f13a1257f02a63d668604d9f27"; - sha256 = "12jvq2qgh8g6dfdds1d7p3rs8v27lnqa6crd7mr5dbmh563m3cdg"; + rev = "dfe75c688a8ee9c3d192c51b6e7d315a3ca37d74"; + sha256 = "0fh0ksd18b4zxbqsdnblvz852r4fm42ilpj33mnj2wmj4z43hpyb"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; codesnap-nvim = buildVimPlugin { pname = "codesnap.nvim"; - version = "2024-07-30"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; - rev = "c2924bf6c9a2c2c03318fae9b7fe0706412b9d9c"; - sha256 = "0xvixdcplkmysxfrlfz3sjkhzh4bswgk86jvrpvhq1c4kvyg53lp"; + rev = "6400480aa6cc366cbd931146c429aaa64680dab9"; + sha256 = "1kdqh5vn837pxygz141n01zw08apcxi39xzdn5a0zhddimqn16z1"; }; meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; }; @@ -2503,12 +2515,12 @@ final: prev: competitest-nvim = buildVimPlugin { pname = "competitest.nvim"; - version = "2024-01-23"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "xeluxee"; repo = "competitest.nvim"; - rev = "c3cb0e2b0916a879c4d3dcb5737e6c046dd0afc5"; - sha256 = "16mycxnxa425rnl1xdk740ng6mg693ywzx5wsa56xr8nvxkms700"; + rev = "4ef440c20eec0be407f455f5db4bfad4acb2641e"; + sha256 = "1s8akxwws2z2kvw6xw8qpmfdv5bryblfwbw32jri83dk6iijkir6"; }; meta.homepage = "https://github.com/xeluxee/competitest.nvim/"; }; @@ -2527,12 +2539,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-08-14"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "e889774c7f2fefad60f8e6638d324223b07d2624"; - sha256 = "18lq9szxgrwhb8378pd6bmgsz744pm3aby5vnrw2g2324xdq46wx"; + rev = "ba9c511ff106d3ce077f679cac1c3ac8260700dc"; + sha256 = "0jcmbfq5i7vxr9rzb5k1sd4wh85h1q5sllmdzxcphc8ymw25abj9"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2611,12 +2623,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-09-10"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "936f2413e6c57185cd873623a29a0685bce4b423"; - sha256 = "049g7jhbvv4awpjg4vcbqw1d4k9bapn2nsvsnajhqmn65qhsif8q"; + rev = "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c"; + sha256 = "0r6isycbgi6n55c5sn5kqbs35i11ib4yym2awxpgr1w1bvxhcs01"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2672,12 +2684,12 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-09-10"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "f9e2c140643bd4519a4517a78a51f6ae8b8b2a95"; - sha256 = "14v1mh453wjdgip68js3aynilj0rddgkr1avnvi38ihw51mi707i"; + rev = "1a237cf50372830a61d92b0adf00d3b23882e0e1"; + sha256 = "0cjsygqvv2k8lrngln70x1ilb7fmsp812yayxvg3qhc7krc5cz4h"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2732,12 +2744,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-09-01"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "0b4015f9c18fb17e58891e645a652040e6f3e98d"; - sha256 = "1aw5wlgsn9ni11l8rafmqbcrnw76s2l172sjz8m0kssq14giz823"; + rev = "1c93db92bac10609fe42dcf1b7962a9b037852b4"; + sha256 = "0799y1nj1271r93nnd1p0j77bwv0w0l03q2a6j0amdslswqfa9cn"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2780,12 +2792,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-09-02"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b3b9ac6ed9618955b24bf9adede7530ef608495b"; - sha256 = "09qkny8m9awn8yp0bw1i6vyh5g4aaa59cch4mpvyn4nlwav91k0d"; + rev = "5a24e3ba60e28e0cfde540696630b3c5a4db6dfd"; + sha256 = "1aqigachc35j42656a229jdvyb7rihcrw2sxw2alljh165gnbapk"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2804,12 +2816,12 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-06-10"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "5a474b06743bb20a90191994457f5e62f444976b"; - sha256 = "0h98968hhd6zs3j6kpsycvgcvwkfp6bffr5114yr9i9j6s0hxcs9"; + rev = "15f885e1a92cc8abd3ba28c5984d9e5920f1603c"; + sha256 = "1xjvpzsifh6k9vvkrfgynngafcjg8nln1r3480bbl7sd1dmwm9lq"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; @@ -2864,24 +2876,24 @@ final: prev: ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; - version = "2023-07-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "7c972cb19c8544c681ca345c64ec39e04f4651cc"; - sha256 = "15li2j26xxa90z6ci675whljym2sc6br6jxs2x4in5m1gv3qj36x"; + rev = "31be4c36b713a9637c7b530ee52127000a05ea39"; + sha256 = "19jz2vbj4m95w4zdgbmx2c5prmflz3wpg3rf9glcfwi2j5zz1ynx"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-08-29"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "10d79f367abd585626aca5099907df67e4dfd7a6"; - sha256 = "1whnza3f63z7yj2n35ywdbx9pa70hp9v0qwx5p08iracqs1gga4q"; + rev = "57fc3af9a8adcf1655fa4e70164bddd2ed898f60"; + sha256 = "1dq7n30h1qqyipgickpcjwc4jzixdhb8bqsqpp16maq2rnjwd9xr"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2948,24 +2960,24 @@ final: prev: ddc-filter-sorter_rank = buildVimPlugin { pname = "ddc-filter-sorter_rank"; - version = "2024-09-03"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-filter-sorter_rank"; - rev = "5566bcca71d244d5ac8d5eb97b3db3661e5d00c9"; - sha256 = "007bfn6305d6jzbvnq4b0lza2chapi99qwvj8x41m9pfahb6ay6w"; + rev = "98d1beaa3a94c7a1198c1d6b0440bd9bde7be212"; + sha256 = "18y3bkifvww8g9jx650mazxjvdbng6264x39wlz8lqdmxv8k95ry"; }; meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; }; ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; - version = "2024-09-04"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-lsp"; - rev = "0c9ddf4281b67de629d37ac9e1f9e160f919543e"; - sha256 = "1sh4i2a4fgqy9qrfq2wvw9aah358pvbxqbfcapmw890rrlsrb5fn"; + rev = "23b69013f2948c80b3938165a0cb414f58e26ada"; + sha256 = "0h5f3i5v647ah1bxcwx6ap18qhb6b36jwi2mk89clnww6anaghh7"; }; meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; }; @@ -2996,12 +3008,12 @@ final: prev: ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2024-09-03"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "479dd6bb0edabd73f886fe913eed46b369517885"; - sha256 = "14zzj1dxxggsm6p1yxgyaqhi7rfxyk0a8zd3hpam0796xn8zbf6z"; + rev = "657e2365d2865e5774c095556098fb2a9aeace4a"; + sha256 = "1w78jigzv6g6nh9c38vhsm8q4h5d7kxb50rx0dbm090jjc0dxxwl"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; }; @@ -3116,24 +3128,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-08-29"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "f32f02817729129abb3e093fc21e5160512a5673"; - sha256 = "0qp5if2qj12sh4k8fsrpih3qcy665j3gml4sk1pxnpqgl3m5kdg9"; + rev = "f9ab988c870023c4f5542b3f17de3250bbfe43cc"; + sha256 = "1njkxiscmymn3akxfxn9m5r2hrvcq2ygccnh7p77n2v3hcmh0dn0"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-09-03"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "338fe1c899c3fd50b1647777ee27a36b369c99fe"; - sha256 = "09flzd2h0nb56wli301b3gjflj4l48328f89fc8zff00glzyp1wf"; + rev = "e0123ab93325e20a0bdc1105d9879fd2afa6c0ee"; + sha256 = "0wjzr537lx6xydlfnhan3psaqhimzld3130mmcwqnvhb8grm8sps"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3406,12 +3418,12 @@ final: prev: diagram-nvim = buildVimPlugin { pname = "diagram.nvim"; - version = "2024-08-30"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "3rd"; repo = "diagram.nvim"; - rev = "d19b9bb2ca162facc242c357c2802b8cfab6b55c"; - sha256 = "0scgbhjcq0ivlys0a813gwcvw2ckkykyhhjqni6l81gghcc9qgjr"; + rev = "7e86bc292982db1a77ffb2a85912199476ea2712"; + sha256 = "1axcm67ggmrvipqdwhg3vqsa7nwfhx6s1g7xfkzymxichl6n1dm4"; }; meta.homepage = "https://github.com/3rd/diagram.nvim/"; }; @@ -3514,28 +3526,40 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-08-16"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "c5775a888adbc50652cb370073fcfec963eca93e"; - sha256 = "0bcqpympldi4dfjfgaamk6xb5s7fxah7aa2l1jd6mz9v2b9ajgg9"; + rev = "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2"; + sha256 = "04zjfisknbdaaydv9qhfr2lw53rgb02irar13br82ji81j2dilhj"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-08-23"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "6156e07759fd8c7cbf764414f583aa7e47470368"; - sha256 = "181iq7dkrc2i7gdzglwavfc7havyjgd6r59aclnwkrlx54v34243"; + rev = "b7b0cd2670cfab298afc955f2531206218736766"; + sha256 = "1drcvhayc3knwm1cfmsx43ywfzyvs8g5vniy2sci8xg86vypbqmn"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; + earthly-vim = buildVimPlugin { + pname = "earthly.vim"; + version = "2024-04-02"; + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly.vim"; + rev = "cb0440a357a09fb9234ece56a6b09e04d25c1b1d"; + sha256 = "038g9sjik2jn5la06k7i5xfnzc28faibskn2fikgrxwlx240c8wv"; + }; + meta.homepage = "https://github.com/earthly/earthly.vim/"; + }; + echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; version = "2022-11-27"; @@ -3997,12 +4021,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-08-30"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "ea1d398f543a54ba95357c3b8bb9d6f68eaec36c"; - sha256 = "1kk62xsl8bv682w70x5szc2x2507rdv99mia1lzi9ii3xkdgsydn"; + rev = "6610090a4e68d10fd73b68450004dafd26e7cc34"; + sha256 = "066wrrg4nwrgm1r9zc1g2i4rzqrqdbfcsh3kcqnz088j9r5kngi0"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; @@ -4057,12 +4081,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-07-15"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4"; - sha256 = "1jkm5hxgpa0l6qmr0mspykcndl4nh50lk13q4b7rv3byfryv40ck"; + rev = "00ba9dd3df89509f95437b8d595553707c46d5ea"; + sha256 = "0nc6pflj81qldg4yjywzww4md0315kdj0jv8sbcfi8m7kdbjwfy9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -4165,12 +4189,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-09-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "985e1002b5dc70f8196ea0605bbfffc8c8407e31"; - sha256 = "13g5y187hvl3x3i8w926p9mhmg64f8xb2y32vismq5wlfx0mny6k"; + rev = "cf4f7e095f679856fa8fe74e1539fb60fa552bdd"; + sha256 = "04vsj928wm4q73v9jmp3ari5g2hl8m1bk03hm9bxlb879w95vjhb"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4249,12 +4273,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-07-28"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "50543e3993f4b996eea01ff5ccc8fe2a354c5388"; - sha256 = "1bn45k9w3g93srmr7dwymq90av5zx1zr21kki7fq3xpc5c9vmrwf"; + rev = "8c56e864d448e84e0162872c381dd2715824dce2"; + sha256 = "12l8pgm523r6cgfj73f9hzyq69205p8in8jvs6x9j7fwcv5y5jil"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -4369,12 +4393,12 @@ final: prev: glance-nvim = buildVimPlugin { pname = "glance.nvim"; - version = "2024-03-31"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "51059bcf21016387b6233c89eed220cf47fca752"; - sha256 = "189si3pw3cri28lfkfs7p79wrkrnm043shx8k8frirpgsjz9slv6"; + rev = "cdf1ec8136cfbdf73edbe1163097223c763a84b7"; + sha256 = "0x2aiiy5h3wbg42gw6ahn1070ci6hzi6dv9g2ldk8h7xgbk1dc42"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -4405,12 +4429,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-09-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "73fd2b1d9f990b607610abc45a09af3f1600b731"; - sha256 = "00j8ci437ccw3z97m25i243ya6gmx194c31w5bamx0g25d87zd8i"; + rev = "2aa81c62bd58bb013f7b472297c2e8038de827d3"; + sha256 = "1bfgi8nkxsy0f86j2lqaijivp9mj0svwc5dgdlrmdclf10m3lxlw"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4525,12 +4549,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-09-09"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "76d86580f71bd2f07d4264c782ab8d1c12302e13"; - sha256 = "0zn847nfzh1ps9b1czsg1xmhdygvjg7dgq3wa5b6l7frv75lhwhk"; + rev = "27a502037da8657a8b2ab7e31a6439d7b7063af5"; + sha256 = "1dz5mcfnl2crsj8h4q69p6qs9n4vlz7rl7pxhs88xh5di1kp58r2"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4669,12 +4693,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-09-03"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9e51b9c63b5489261018cae552769573fc413436"; - sha256 = "07mjqkmnpc0kyiq2c1z5hlz8if3shn03qb2nqgqbhxrw2l5m1g4d"; + rev = "c096f5e6c8501b3b695e7e36642005f4de3a9a8e"; + sha256 = "0b07i9iawn3386kv04zv7q52ibkx8ag4w4aymd14gz313d4mmwwy"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4728,12 +4752,12 @@ final: prev: haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-06-24"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "e430927cb222718e14ac32116011b5e3df39ab51"; - sha256 = "1drsis1521x31r389j9d2gxcclbc9cfg6f0w3qgbz7yd4cyxmxnm"; + rev = "efc74b75345151c8348a16f3e9f508b5bb7c3c92"; + sha256 = "1w347krahhqwycg04f58c3j1iba8fa61ih9jyy7rniksmfm01dz0"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; @@ -4776,24 +4800,24 @@ final: prev: headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "2024-09-09"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "c19bbff5ad47b35c4bbdae92fd810ec5f111f658"; - sha256 = "0khywlfh5ly337f5d2yzfgnjqchd6bhd7vbxh22s5aigrvvs8vpw"; + rev = "bf17c96a836ea27c0a7a2650ba385a7783ed322e"; + sha256 = "1y3hffh9kb5x35a0bjggjjgyhna14nvx5rzghj1hx0yrf9b1hrid"; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2024-05-21"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "0d797435e54645a5f98bad7ad6046aac1ef95c1e"; - sha256 = "0payyx0j0s4wgk5xvczdnjqkj5nymlhw4f7hcw3sl9m334vnxshb"; + rev = "7a79753c1a42c3f52e89a6c42429e7f871e560cd"; + sha256 = "065llk3pbmyrgapa2k835rcf2k7s7b8qfx94jcbqg8v30r6s6ah3"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4921,12 +4945,12 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-09-08"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "4656a6492e2fc9105027bf4d4c37bb6733fc5520"; - sha256 = "12q1730jz11qjv7plkjyi5h4j8vm2l9bsacivbapzizz4fqffp3n"; + rev = "8ffe314cc7d762983dc3690d8dab30342483548a"; + sha256 = "1azkh04zs6g6n0fpxb6qydk45iqllkngvxn2xkyxbjyk3zb5jls0"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -5029,12 +5053,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-08-05"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "4007cddc4cfc1b5ddd49744a38362e7b0432b3a0"; - sha256 = "00mhip2nzs64pcy39spaj76zdghb7nv24zlbljh7m89z9cvj9565"; + rev = "f95cb9cca3a05033d5e94cfd760a48ec9a7d4719"; + sha256 = "0dhcgc79481p2v3k4mkw63l0ny5dybhppir6xlvq2mvgawwdh3nm"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -5512,12 +5536,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-08-31"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d"; - sha256 = "1rwhgm71qa2wn4iighxn5i76zv6p2hqdjfw989algihymw560i58"; + rev = "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb"; + sha256 = "0xgc39xir6i0z4i9hm8sp2ldfzza630rz1bk9vwh277v64cvgnq2"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5548,12 +5572,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-09-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "47578d6a4008f4bf09803fa7bc0a4152f60ed62f"; - sha256 = "18l0xryljwq83gllasbf3d0cnayh27ga7bh2h9i2f35sbl9bri6z"; + rev = "3476b940c4344c83db6350fae5c56c5911ffe7da"; + sha256 = "0hd47a4is10zpn3ggmkr7g63q0r0gpm5x832nm56v9wid73x3f69"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5596,12 +5620,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-09-09"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "1d6f4447da56f254c02550ebcb41955c0c1df795"; - sha256 = "1isr8n56y1lrkq2zdi8zcv4ydd60ixpixwz8zjqb9wcf1v8f5xj7"; + rev = "38510be22198cded0ffc535d54368e2ee3b3accd"; + sha256 = "1g1lapjfs4v9xs69zscr3v5vrpvycbjnp0mpc84pwbridvihw3pq"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5752,12 +5776,12 @@ final: prev: limelight-vim = buildVimPlugin { pname = "limelight.vim"; - version = "2024-04-30"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "785c1e17fe90c587ebca88920baa3146cd6e30fa"; - sha256 = "0r97jh94r09a1c2vap7ybdn5kqpm24xwfsl9fxhvfhj6mlf1n2hm"; + rev = "0c8cc7f503a775c505dc9c67f1f5041ab4d5f1fd"; + sha256 = "0qdll4x01912ldlv9ixh5z4zn8fddybc9mv53c8dx2advkglb6cg"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -5848,12 +5872,12 @@ final: prev: live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; - version = "2024-09-09"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "smjonas"; repo = "live-command.nvim"; - rev = "79f89a2e3472e69fe00d4df50605e323d30f2d09"; - sha256 = "0716nd7fwfx83s8j5jgfqk93sjnb294ndy13bk37k9sqlq1bxsvk"; + rev = "b0723697bf60d89ede953c4a5fedce3157784c15"; + sha256 = "08fmcj5r1l80bi6gqsm8g6px4zfqr9sq4kck89y5rfs99j6janyk"; }; meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; @@ -5979,12 +6003,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2024-06-15"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "a38da0a61c172bb59e34befc12efe48359884793"; - sha256 = "1p6fznwg6pxr39x08lf9qhjkcvfysd58k1as6d4lwibkav7rfkki"; + rev = "fc38521ea4d9ec8dbd4c2819ba8126cea743943b"; + sha256 = "0ag79vvjz1dqyw9358ijdkckr1rqshxkpk5fl0kww1vl3pfwv9jv"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -6002,7 +6026,7 @@ final: prev: }; lspkind-nvim = buildVimPlugin { - pname = "lspkind-nvim"; + pname = "lspkind.nvim"; version = "2024-07-25"; src = fetchFromGitHub { owner = "onsails"; @@ -6063,12 +6087,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-08-28"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "45db5addf8d0a201e1cf247cae4cdce605ad3768"; - sha256 = "1lkh9lqs4k8m1s8nhwhilnmp1jmchq9asywvrsjaq8fjkbnnh8gr"; + rev = "e808bee352d1a6fcf902ca1a71cee76e60e24071"; + sha256 = "1yf50bwcg94bprbczcki7c1n318m6ar99m8h1yrmn6m0w4cbvf8r"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -6305,12 +6329,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2024-08-27"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "36d02139979f840a170de8c19a72beaae2ef1741"; - sha256 = "0dmn5cy5p967kj5vkqc7cxflz5dfhw35hirs3pil04wqns43khh5"; + rev = "706a33f0a883fae9ec00ad648586792248a0575e"; + sha256 = "14jbkr4j4s2kg4b0bp0d2whjrj633dlhglqzg672aiyagcrbw7bm"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -6365,84 +6389,84 @@ final: prev: mini-git = buildVimPlugin { pname = "mini-git"; - version = "2024-08-10"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini-git"; - rev = "25651b097bedf519421f9744cdc91a693dfa463a"; - sha256 = "0535awbbl8hxyi41iwj5w44jajvjiys28z2qgs1fczsgwbpwx6z1"; + rev = "f75ae3855f595e55e1a8a96521ffa01012632b28"; + sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg"; }; meta.homepage = "https://github.com/echasnovski/mini-git/"; }; mini-ai = buildVimPlugin { pname = "mini.ai"; - version = "2024-08-06"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.ai"; - rev = "a9b992b13d22a8db8df6beac25afa59a10b5584d"; - sha256 = "12a9xyd3gj9qvll1fj4kv4cdv4jz1sfaxp176c73f2hlv4w4p6ri"; + rev = "40e380a589d07ec2c856940c6422aafe5d949a0d"; + sha256 = "0nm4sx5r7k9px46v3v7krrj8qnpxbqz15bxqk60f2pjds67vpv4y"; }; meta.homepage = "https://github.com/echasnovski/mini.ai/"; }; mini-align = buildVimPlugin { pname = "mini.align"; - version = "2024-07-01"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.align"; - rev = "b54d88b16bfac62ca6b3d699566135639a3ca4fa"; - sha256 = "1llrq86hbx299zbzfr04yrylrf5cqgpzanhiahb0mq3y5z0fpvcx"; + rev = "26111a737494bc39576ad67b52bbc2638ca23553"; + sha256 = "1cx3xavcgna5x05mzjc254cv3cwhjckmg1j38vqn4dw9naadb6pb"; }; meta.homepage = "https://github.com/echasnovski/mini.align/"; }; mini-animate = buildVimPlugin { pname = "mini.animate"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.animate"; - rev = "320fb35460238c436407cd779f63abad98e84870"; - sha256 = "1ksaln0r5lm5w4rxccbb4b3yz0ycgv67brbcnbkz2aifva1pza9y"; + rev = "d33ddf0eefee6338bbd95805c4595c1b34e6bfe2"; + sha256 = "1fn5vsz5m3v63gmg1i03zi9qbmlbbjgm24k3j9lmwlin75cnxizh"; }; meta.homepage = "https://github.com/echasnovski/mini.animate/"; }; mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "2024-08-16"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.base16"; - rev = "b434a7c03f1c3581bed8c17dbc512168920de5c6"; - sha256 = "04lfciwlmrdzn58c49yshva6xyr46f4imnp4dh408cvdnw0j5yqv"; + rev = "aaa564b9c6d34466d542494393ab51efc99b9d0b"; + sha256 = "1sj97196vi3qkfkxpdr4ajd3li42pvzmd1zpcr0ggab05rnpawrq"; }; meta.homepage = "https://github.com/echasnovski/mini.base16/"; }; mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.basics"; - rev = "1af88d68b9d9c8cbf0dde9bd7ad510b93eafd9aa"; - sha256 = "0iynhxwc029lg62c3xfydpnnin2gnr4sbrxja4dj02j544y2kyss"; + rev = "7d4c6982be471e902c034bea6b3fe348058196d9"; + sha256 = "039jdbjjp713rh0yaa503khwxz6dya28h6arksyj52mfmzajnwrq"; }; meta.homepage = "https://github.com/echasnovski/mini.basics/"; }; mini-bracketed = buildVimPlugin { pname = "mini.bracketed"; - version = "2024-08-13"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.bracketed"; - rev = "072d50801d8d4aaeb4b9765fa35c61639e0cff6b"; - sha256 = "047hcwcp8lms3zhvbckq2cqs9ir9g4z3i0lmf1qrd807aqih7fxp"; + rev = "833d66df6e0588222312a963780c6ec42ed7437d"; + sha256 = "00zlyj75y36g3kb15bxk2xf9hrnc7xc7nb7qx13vpbl8mp6wwbb2"; }; meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; }; @@ -6461,12 +6485,12 @@ final: prev: mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.clue"; - rev = "847376b3a044129348cea9eedb841106379e0796"; - sha256 = "19bzb4hawll898dr4w53jhy9h56dnf4c3cjisqlyjh3qgl0h588s"; + rev = "8e329f586a7cfd06085859066a4b60965fc4ecce"; + sha256 = "0s6n4bd5naq50pdyl3ibmk0788823iii6gapqqcnqkvsyi39rp5g"; }; meta.homepage = "https://github.com/echasnovski/mini.clue/"; }; @@ -6497,48 +6521,48 @@ final: prev: mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2024-07-30"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.completion"; - rev = "ad99bbe569aa5ceb70c2ff4c36368f94a89496c5"; - sha256 = "0w9hgf4fq8plbns1fnq283s2difg9np8k8888fryd97yd3nys4pd"; + rev = "2b877876ec7c77973a512083e2aa3f13c61c2abe"; + sha256 = "1ryp0qjb82p93afk5rvsrzv6rajr70z9d32n5wxvm6hz2nryzzx3"; }; meta.homepage = "https://github.com/echasnovski/mini.completion/"; }; mini-cursorword = buildVimPlugin { pname = "mini.cursorword"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.cursorword"; - rev = "7a9f1ec73c52124abc39f0309d332ababefc68b2"; - sha256 = "1wwwila2k8yap1k6v2ndzqylaw49pw1wk1l011pi12hcaimixba5"; + rev = "7d1b38a17834acbbc4feff8e42aedc4ed0c6ff06"; + sha256 = "0vqr4hkzq13ap6giyyp8asn5g6nnm406piq1a07a5nmkfxiskp9v"; }; meta.homepage = "https://github.com/echasnovski/mini.cursorword/"; }; mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "2024-08-10"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.deps"; - rev = "dbee3da96d3cf68ff311d8f324a9b236a08ad429"; - sha256 = "1plgz5fssa4yczr32h230kn65dldi729sjrlxp4x9307n3s80zk1"; + rev = "203dd6d947e3415711c732530a82f9c3f2f046a4"; + sha256 = "1xydh3l41hifwmns6aqnrch545h1hqsq4a7mgk915wzp1g843qfs"; }; meta.homepage = "https://github.com/echasnovski/mini.deps/"; }; mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "2024-07-11"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.diff"; - rev = "d58f9cb13400aedc5b5a0ef70fcdf31871ba2ee6"; - sha256 = "09qg43c3qwk0csqlvy9c7s3l9anp4pg0jrrzv8idvii3za2zrwsq"; + rev = "24d46798be8a358d38d3adc92c7ebcbb2d6f67e0"; + sha256 = "0hbr36s75aa6qhr0lhsqk6fwswd919ixd0jlrfj6paiynh00331r"; }; meta.homepage = "https://github.com/echasnovski/mini.diff/"; }; @@ -6557,24 +6581,24 @@ final: prev: mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "2024-08-17"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.extra"; - rev = "05ddb1e3056c5ab541477a38d2c61d96d19fd299"; - sha256 = "0z0lsgsmjchc0arspzm04p5vfd5mdc3lyx4d4qibsxq5i0834r6y"; + rev = "4a6ff25b188c318b99f24c2241465f61bbe0e235"; + sha256 = "1bnqlydmsk6jn5aqp8xgp7m7w26h70sbbdj5583n0maarnxylvhs"; }; meta.homepage = "https://github.com/echasnovski/mini.extra/"; }; mini-files = buildVimPlugin { pname = "mini.files"; - version = "2024-08-17"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.files"; - rev = "170d0dd321ca377cb427fb5576d4d75601c1c2da"; - sha256 = "14p5syc4w43mgp522zj6hwpri4a49zkq36in3sifmr6h8bwhx87g"; + rev = "a3a9cce82115a69dba161ac45bda16f4e606f73b"; + sha256 = "0zzbcfn0bsqky0f2mwzv816fkgxg49aygj7qfp1qq5252c7x32n6"; }; meta.homepage = "https://github.com/echasnovski/mini.files/"; }; @@ -6593,96 +6617,96 @@ final: prev: mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; - version = "2024-07-23"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hipatterns"; - rev = "1811b0661721285fc83494d2e687d538fb3ddac8"; - sha256 = "0b8sswy6533rifxgfy52mssdbxrds8p0xxp8981q97pp0z64k2yq"; + rev = "fdad87bf545aec5210ca9a2c49fddf6284d72d1e"; + sha256 = "1avz4g22x5wc5q1cnppnfxays5wrf7iqjyhn3hsb93zb2895wack"; }; meta.homepage = "https://github.com/echasnovski/mini.hipatterns/"; }; mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2024-08-16"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hues"; - rev = "0e46bdc04d3df4185097ecff08ad208868572b98"; - sha256 = "0s71n5mh49jvkzwamm7hnrrq39qlhhnpdg6l2x87mnyq5c0f8cvs"; + rev = "221260589ab28c29af444a0809248a1369f733ca"; + sha256 = "1pi6wmvhbr89xgj2vhmy1rwlb5znwc20nr9c66c40lbabzvxa815"; }; meta.homepage = "https://github.com/echasnovski/mini.hues/"; }; mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "2024-07-30"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.icons"; - rev = "fe63fe080e76d80713557e5f0c65bc15b14b152d"; - sha256 = "0z6jmrn5gf6c51dlnc7qwab8xg1dv1f5d5vmkmy8x2d6iapnlyqv"; + rev = "2d89252993fec829b24720097a687412d10f6c85"; + sha256 = "1qg06xia1sm67b10sf6vdhmma9xmwkj7hzlk5dyfg25a7xmf2107"; }; meta.homepage = "https://github.com/echasnovski/mini.icons/"; }; mini-indentscope = buildVimPlugin { pname = "mini.indentscope"; - version = "2024-08-12"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.indentscope"; - rev = "d2e7b5f0260789c325f92ab3421ff9884ea01842"; - sha256 = "1w49n9nv32h70wf8ahya9xj1hfcxnx3bqxwpkhhz8ck95c84mmaa"; + rev = "da9af64649e114aa79480c238fd23f6524bc0903"; + sha256 = "1pbhic4q9ikbdgmmvlhpil4aykpf0ryx7dckb36q3xc0ai2gwc6g"; }; meta.homepage = "https://github.com/echasnovski/mini.indentscope/"; }; mini-jump = buildVimPlugin { pname = "mini.jump"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.jump"; - rev = "795f26e6640589382c277cffa494bda0a127bef4"; - sha256 = "0s51zsy0cm9bldxzzk5hnvqhccv9nh53qd07dlijd5403vsx77wa"; + rev = "cd429d8d631a2fa766e60b72ee6fbff78afa3fda"; + sha256 = "1qxddzdnkhzj8dx7wrm3abf5h161l3drvbfpw4638vx3bz5v504q"; }; meta.homepage = "https://github.com/echasnovski/mini.jump/"; }; mini-jump2d = buildVimPlugin { pname = "mini.jump2d"; - version = "2024-07-18"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.jump2d"; - rev = "f39cc3eed3163799730166ac9cf382d44ce7159f"; - sha256 = "1bz2ymhvib10mb5cc8410yssi7k72hqs80n708p0dm3lyy3lw83w"; + rev = "b0963aa2ec80b4b1ed1c7f93d9c969bb3f4b65b6"; + sha256 = "1r0vqpa803yqmb0s1phpm1lf5xm94qsrmjc8gghdspxpk5iszv4d"; }; meta.homepage = "https://github.com/echasnovski/mini.jump2d/"; }; mini-map = buildVimPlugin { pname = "mini.map"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.map"; - rev = "290c3da965196d64f87050a076de9787a136e57a"; - sha256 = "09i26nh398i098lqsqajkjpr94762x54vnqlkcvbg5ak1fx3rajr"; + rev = "4c58e755d75f9999abcd3b3c6e934734b6a8b098"; + sha256 = "1407jgrzk0pvnhsssm3hdgjw3vd1n182adgh8c5h4b46dzvrvgvl"; }; meta.homepage = "https://github.com/echasnovski/mini.map/"; }; mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "2024-08-18"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.misc"; - rev = "e51fa9430a4e18679d8b913ed2441182b5da2176"; - sha256 = "0r5kz4835srl8vgq8bhfx6qsqap6cbxnyk7247m5qy1j1hqdgchx"; + rev = "428da688126b320194a944233f9f8dfc46669307"; + sha256 = "1iiv5v3n7aynsk75bdp6b098n6ny6fg5iccdkw6psg0gyni6fq0r"; }; meta.homepage = "https://github.com/echasnovski/mini.misc/"; }; @@ -6701,72 +6725,72 @@ final: prev: mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.notify"; - rev = "a6101a5fa7eff7bdfbfc887ad9a331305729f0ec"; - sha256 = "1xkls37g2a6wfiyhhgaw0hzdrj602j1iv55b1a1l3pcj81w9p23l"; + rev = "1c901d62581439f3d17382a5bf7001a282d6468b"; + sha256 = "1vi3nsclkx9myglb0mxizhmzil02pglh96jf4291cblkgycs6zil"; }; meta.homepage = "https://github.com/echasnovski/mini.notify/"; }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-09-10"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f0d6e89515c6b055c20d257da717bd30211532f1"; - sha256 = "0g10yf5xvqf1i40d9hl0698bfm901x3hs82lkl5wnzahb5vv5kpn"; + rev = "e50cf9de614500a20e47cfc50e30a100042f91c3"; + sha256 = "1jsll8d3s1glah9ig6041ikpvhcpncd671v8cn55gsacazj46g4h"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; mini-operators = buildVimPlugin { pname = "mini.operators"; - version = "2024-07-01"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.operators"; - rev = "7d30c0bc5baaa1f0d3a63dd18b35c8581bc164f4"; - sha256 = "0zghwk8rs7n9sgpssb2fbyrm8vnynwqa6ins2mshsirvmrbkz30z"; + rev = "35b12f54bd5acb860f4297fd6d12fd07b1b065e2"; + sha256 = "1h3kf7ri8ip8as7kcb86q5lq56v7iqz731g4pyn020ymyxmyp75n"; }; meta.homepage = "https://github.com/echasnovski/mini.operators/"; }; mini-pairs = buildVimPlugin { pname = "mini.pairs"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pairs"; - rev = "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51"; - sha256 = "1016q19ndmzmbdaxi40w6wskhf91nc5qzbza6hyvcxdfpd81rl6q"; + rev = "e543c760edc5e746e5b6cbd02c066c17ead3ef16"; + sha256 = "0169nsad89ndv9js4zx3si28df8nk5qpjzvfkrks1yyh7k31fwdv"; }; meta.homepage = "https://github.com/echasnovski/mini.pairs/"; }; mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "2024-08-17"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pick"; - rev = "2f0bdb96a3a1ef2a31a731e03b51fa97074df0d2"; - sha256 = "0ypz1zj3xpfwhx712i6dcwklmjriqbbg0kcq3zih1c3sz5la708m"; + rev = "b87f4d4e75673f6e7b918408017833424ecaa245"; + sha256 = "09gyw1l5np515ldr9rlap01qaazvggg16im43ma7bws0i9nfkwd9"; }; meta.homepage = "https://github.com/echasnovski/mini.pick/"; }; mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "2024-08-10"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.sessions"; - rev = "3c80dcf01d9901ff3e4a40328bee8a44c65718b2"; - sha256 = "07kjgr31yd1kjlxhkaq3dy879s40c5zj89zjlxpspw0x49m167f8"; + rev = "62f2e3823f98673fcf1b79322cc06d8a1f453d30"; + sha256 = "1js9ma0i7a4lil6h4bzbxjx6s63hj4z7qy5ixf737x34ba5d0ipr"; }; meta.homepage = "https://github.com/echasnovski/mini.sessions/"; }; @@ -6785,84 +6809,84 @@ final: prev: mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "2024-07-02"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.starter"; - rev = "394994b2bec10a997c69575825d5c444957b9ff9"; - sha256 = "003fas6clkpql54w3lfqd088cy5cvd2iisl88adv54p3bfasppsp"; + rev = "3e0af795938ee800846708bed92fbe4e8583141a"; + sha256 = "15353wihsk5fzfajidsqyrqpa6sy251kprzwd486v5wr1ww99nax"; }; meta.homepage = "https://github.com/echasnovski/mini.starter/"; }; mini-statusline = buildVimPlugin { pname = "mini.statusline"; - version = "2024-08-12"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.statusline"; - rev = "85014aa9e4afe9a3ff1896ad768bf09584bff574"; - sha256 = "0aqf3wh0ibr4m9jjpi4p7vdfwc0knlm83axzlisy78x25xviks04"; + rev = "813854243156472c9d0bc9c64ea0af159b9b37ca"; + sha256 = "0c66wx3qvq4yd156j7n6x7iwyfggyxz4ss658a3n3rjnv35w3j5r"; }; meta.homepage = "https://github.com/echasnovski/mini.statusline/"; }; mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "2024-08-17"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.surround"; - rev = "d8913ed23be0a1a4585ae34414821cc343a46174"; - sha256 = "182v214d8in864i3yirs7vg5lxb2kibfxpdh9cap14hbj4nbc6mi"; + rev = "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e"; + sha256 = "1wz9vkb7idsmrgh5q5pyingzrmyr14xhjnk20b1va8hgqq27sm42"; }; meta.homepage = "https://github.com/echasnovski/mini.surround/"; }; mini-tabline = buildVimPlugin { pname = "mini.tabline"; - version = "2024-08-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.tabline"; - rev = "27c38016a28b0efc375bbe11593391ca337849c1"; - sha256 = "0sxkyyb1igysj5n1cwa43m15dk307nj5d6njd93dmyrsawl4p0pw"; + rev = "2316dd47e1e1f4a8e9255c9060acbee89bb26e59"; + sha256 = "1lbh0qzjdhx7vkycl799byjn3a62frrfgdczyzj2xdyfxv6823h9"; }; meta.homepage = "https://github.com/echasnovski/mini.tabline/"; }; mini-test = buildVimPlugin { pname = "mini.test"; - version = "2024-08-10"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.test"; - rev = "64bdbf6517032d29aab74525e212023631295a2f"; - sha256 = "02a6064sqdaajz99ga7sw7ijljlxjdd7v7i33razw2y3n5mx5f5d"; + rev = "011e14293baa8ebdfde83b756b435403281153fb"; + sha256 = "07marlkan507bx1x71xqil4im644fy04ydy65ax2q6rihrzmgzvf"; }; meta.homepage = "https://github.com/echasnovski/mini.test/"; }; mini-trailspace = buildVimPlugin { pname = "mini.trailspace"; - version = "2024-07-01"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.trailspace"; - rev = "c48d74a3cecf93f5adc6a7518c7ced60e6302895"; - sha256 = "0cywnra2v7hi76n3004wpv8r0w5qdpzwdmjrc21jv7hljq5q7av5"; + rev = "3a328e62559c33014e422fb9ae97afc4208208b1"; + sha256 = "1314bmb8zk3gdpg1wpr1935d0xd0f0cf2f0ipxclbwi07wbjz9i4"; }; meta.homepage = "https://github.com/echasnovski/mini.trailspace/"; }; mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "2024-08-10"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.visits"; - rev = "76646d885b3700d594a8c4e6bca24b8cb79ff07f"; - sha256 = "0s4936yvjkv8l7hzzr8gs63h3a8f26y9lw2ibfn1fdyvpdp7nndk"; + rev = "ef2f388158f3651e4b45faac2897d1bacbb0c398"; + sha256 = "1rizwl2dyvj1iz7sqn5sfdaalcjpmhg4zklhjijvpmkylw3da4nh"; }; meta.homepage = "https://github.com/echasnovski/mini.visits/"; }; @@ -6929,12 +6953,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-07-09"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "f978043c34f4e967a5496b4fa78c2ad092315b00"; - sha256 = "137pzp3i2yldarz6ynygfkm3yif1r76ahs5l9cy5bml817rhyshi"; + rev = "162bc34b4d670fa4d8d1407924c0f855985fcc2c"; + sha256 = "0d6jf6041lwkm4saxmh0zlfd0427z1vcxj9xdfl138b082csnfds"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6953,24 +6977,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-09-04"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "2423411a3e8076f832613efe65318f259353dab4"; - sha256 = "0ivak64qiag3yar7mx62lniq7h6ivf0rbqh3b3ahd7sw9cxj410s"; + rev = "92b2599ef813b188391d5f00f5f94ce22ecd2598"; + sha256 = "1m3ydc34r9a5md6bfrp6zvp67dlvqyg076mygifly2iqfvq43n5a"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-05-25"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "2bad2a92fe0ff6c8581d33a853a1b17592b83239"; - sha256 = "0kbr165ifkn3g131chmn6c4ishfsjikninndscpcp8dq0gv81d4h"; + rev = "e9a19339d24f41aeeb3f749cdc9491ebd27ac553"; + sha256 = "1cys9ridacwflccyz9c5nhzsg8ykqmjmgp1xkcm286ylyx45635p"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -7265,12 +7289,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-09-06"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "0774fa2085c62a147fcc7b56f0ac37053cc80217"; - sha256 = "0nfvn07xsn19mhylfgr4irg1h6cdiwcihjs4jqgfa0ziklmigcx4"; + rev = "a77af2e764c5ed4038d27d1c463fa49cd4794e07"; + sha256 = "02ag3h40p5ga12y1fwbcd06nnl3rb0l5hs064ylpkx2kjcl79arf"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -7289,12 +7313,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-09-11"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "206f6c0d96ff7ca1698e17cfe84d5b531050282e"; - sha256 = "0651cxpfggdprvmf95wjx4qqvhlm7wikxpbxsfmx7b3warcpjf3z"; + rev = "c5516054f2342e6fe4d3befd56249d02d5eeb380"; + sha256 = "0a7w6hzrpzja5n4apqqpzzzx006cxmpgh4l156rpzh48rjmj8qdy"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7361,12 +7385,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-09-10"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "eb5b156a41fb7147eed9f971504dfa8753d8b006"; - sha256 = "0d5mbv36qkfxhq1lbiz5cwba39pxk0z7bzpbvfh0nggjnw1wws1a"; + rev = "9959b58a897036ce89d47385021db1f716613399"; + sha256 = "1sfknshkkb3dcjv1xzy97habpaxmhc4n1w76ls7hm3db252gn40l"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7431,18 +7455,6 @@ final: prev: meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; - neorg = buildVimPlugin { - pname = "neorg"; - version = "2024-09-08"; - src = fetchFromGitHub { - owner = "nvim-neorg"; - repo = "neorg"; - rev = "ba35900b21921c439e676b063a79c8fad914eac9"; - sha256 = "12sgvf7zbabxvmdf07cv8rcql6jdgdv5xdcn7v5w42q8lg9mps10"; - }; - meta.homepage = "https://github.com/nvim-neorg/neorg/"; - }; - neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; version = "2024-07-30"; @@ -7530,12 +7542,12 @@ final: prev: neotest-dart = buildVimPlugin { pname = "neotest-dart"; - version = "2024-02-28"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "33b9335cd8c2be4dcf9dd8f196b24325e7c2e8e7"; - sha256 = "1g3xa33p2n5j3w1rpc8zf0dl7wkwnai2f9fs8dr8xanqp22vpl3i"; + rev = "ad0fbcd0bfb45999fb78f3d14f6b6ae7ee70b88c"; + sha256 = "1431b9izn4kr5rsc06kpwizd41nkkglcy3yl7p0wls3pfr0v1rxp"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; @@ -7603,12 +7615,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-09-09"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "3a258b6e58ada91f8af95b445b6156c2290d0e06"; - sha256 = "1gjxmg8xaybxbq4z3dl2mwna9k75kmgzl8c79aa4290acpkz277r"; + rev = "824cc934f61e9af1e2273d1153dbe337090304f2"; + sha256 = "1j3kf82rlgcch7zi66d52qgx4hknd43zm8z4i28g5vsb0wsd5vdp"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -7640,24 +7652,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-09-08"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "ae2576dfef2035506b3d3339d676b306f1c03092"; - sha256 = "0s5n1vqzsfs6sr141ybhi09349p0xz1d6cgyg93xlqpbir36f9ip"; + rev = "b9487ba185a3192937ffdb8f986e14d436174214"; + sha256 = "1b7mxi0fs878wkb621xnl0jl64lqnanr78d4pcqlffphnvwxkqrs"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-09-07"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "f3532b86371f4bfa2bdfc90f5666faa65d7efb04"; - sha256 = "0n0115z2sbjac34f251a0q1k8d180w9rvcbqspl19va5z975i9vb"; + rev = "24d34fb00eb843cc2f1c9430ac93020bdc7e2f6a"; + sha256 = "0xd0jc5fwy8q8dr4zrpvis4zc73983qcxxzm6mpspbgzr4kyx1jv"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7676,12 +7688,12 @@ final: prev: neotest-minitest = buildVimPlugin { pname = "neotest-minitest"; - version = "2024-08-05"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "zidhuss"; repo = "neotest-minitest"; - rev = "bec6bb22e2f74ae56669b0c16ba38237dcd2febf"; - sha256 = "1435ffq3zm1gqxx08yxgqg37cd9c2rlc8xjs6j4jw8v873xw06z3"; + rev = "5623b9a7b2b27314e5c336b385315d2ab7d4ccba"; + sha256 = "0rv4nhvlxl693d4q9jd9a6ym3ib1fwsjzl0911pqjwf9kmnqx4w7"; }; meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; }; @@ -7724,12 +7736,12 @@ final: prev: neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; - version = "2024-08-09"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-plenary"; - rev = "2cc925246d7e5324ddf9585fad891cec73c3947b"; - sha256 = "10466mg8mxqc95qz0q47h8qy0lrkn6qgcw5ccmmd6g4cls3rg7gn"; + rev = "3523adcf9ffaad1911960c5813b0136c1b63a2ec"; + sha256 = "12nsn035npdz5hyc9w6jdhx3wv2ixvdbqr78w2znn1p2a6mqc09m"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; }; @@ -7952,12 +7964,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-09-06"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "08f72f1ac63872756fe0f1d939037261325aa2d1"; - sha256 = "0f31j0pk54ch0zz8lkbxfh1jy859y8wq1nvyx9x80xkccw6s9z5h"; + rev = "28677f1ccaf0ea636f07176ed69c6f4e7a07f244"; + sha256 = "1hflynf84x6g4sp97m0f80vqp3ypcj46w9s5065l44c9lfa5i894"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7976,12 +7988,12 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-09-11"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "1bce99a52c78b94e1a38987001d3166858271cbe"; - sha256 = "1jq6h69amqwf2vkl5r8bk2yys01s877a9j36pi4xjh5f015lj7sf"; + rev = "86ed124c2f7e118670649701288e024444bf91e5"; + sha256 = "1zgi9m85z5pnfsh7p3rdnyz7rvrn44lfg5p6l005g3411h32pgiv"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; @@ -8036,12 +8048,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-09-11"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "3af82e912f5080933387fb625487590598af4759"; - sha256 = "1jnq1428d5l9xb0ccyhb5vr9pr5ahda2hj3cjl03p938826aymkv"; + rev = "d77312f267491aca24d69527538295b8376be864"; + sha256 = "15sfjf1q643d1bfx5d0f13jrav3jld2gpz20vvghbnh1kzfwaagm"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8060,24 +8072,24 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-08-30"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "2c8f0521ea76564377c8f9b635ba098e9a56f8cb"; - sha256 = "1hviblsmsxi69wxvn58g80hviphx073nsm4yb5m1pqp7aw5qj2am"; + rev = "1685bbb47a409253f9145db56dd83ae117f9c382"; + sha256 = "03k8z2r6csckfx193yzcqj83w8ykikihpx19zi6qb1m1qybjznca"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-09-09"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "4b6f0a2c7ad4f2200d59f3d5785aeda96a38e4ff"; - sha256 = "120sha9pg7pbimz4nndm28fb5vb8qwa6fmlznsvm5v220yj2j0yv"; + rev = "73494b365722cc14541b0d2ddde3b52d6c94a6e5"; + sha256 = "09d5i4jgk7ivnfka0bxi0kgk9qrkdx82zzwgldcnhaxsjm1cm91p"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -8096,12 +8108,12 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-07-25"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "448bb9c524a7601035449210838e374a30153172"; - sha256 = "1pxnfgcqh6b14z699akvzbq2vcvk4glfjpk5d5hybfn6fnbidapk"; + rev = "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65"; + sha256 = "0qq9rc8frviz96j1xb70pkdwhvynaz63pkwdh3jlkkmjk5iv0jm4"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -8168,12 +8180,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-06-26"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "61574ce6e60c815b0a0c4b5655b8486ba58089a1"; - sha256 = "1vllq6lkk7karc3n8h9wj2ax6sc99h26r96h18lbvi0nsy98ss53"; + rev = "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f"; + sha256 = "0klz9wy09jk74f39v6f7s5gn98nf3vq4lgv5d29mkszpykxaligp"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -8204,12 +8216,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-09-06"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "0e61fb765632508edf28a166ea8c6f1573d3069d"; - sha256 = "0f9ljhd82dypb9m0ddihyq9j378yfr5ky0vwzf5ymzfgyyn816y9"; + rev = "8d2bb359e47d816e67ff86b5ce2d8f5abfe2b631"; + sha256 = "0l1r7vsa02d9fb0fxkl6dn7nr1m4iflify6vh1ffdvcnlmri8ann"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -8252,12 +8264,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-09-02"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "fd2badc24e675f947162a16c124d395bde80dbd6"; - sha256 = "06jzi0rdrvw24bm6zwxzqd2clml8k8zmdnqkbqx5vj30rzjchc48"; + rev = "f158dcb865c36f72c92358f87787dab2c272eaf3"; + sha256 = "0phizncx5kafr75nl0ii6nfb8jh8rmx052lw1x7cdfr6918vvxdj"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -8444,12 +8456,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-09-05"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "20a4859ebde1c9bc8e96f8cc11a20667e7fdd516"; - sha256 = "1miq5m71j7x34y7ii1rfx3d75sai967chjrh8i7zyzal7hp0x0x7"; + rev = "90616ae6ae40053103dc66872886fc26b94c70c8"; + sha256 = "07x5qm7p6lidafm9kkpapwc7wwjh1k4zrcg3hdgra7sknprppjp0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -8588,12 +8600,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-08-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "382ddb90a31313f0b2e059db50df0ca4dd2859d2"; - sha256 = "0nr5bzqa4b6vv1zqx1a419s34iq403mgama9i2ik9vf8awyih9q9"; + rev = "ca258b1e466d131e17eacf0c632abe932bce20ab"; + sha256 = "0l8qpj143s3csav39ixzhag6pyk6jfajvf469m9hg19m6wfbfg1v"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -8636,12 +8648,12 @@ final: prev: nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2024-06-14"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1db56afda3e85791a14b096e483dfda699dd9163"; - sha256 = "13mx0p3ia7wajvjk1gvyhnv2v5z900bjr4c82b1wbdpmv68z69yv"; + rev = "07afd4dd14405ad14b142a501a3abea6ae44b21b"; + sha256 = "12nf1jj7z4h7nqi6gmk768z8hcl4qdgi4rpwj0y8frawc2f75ixv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -8743,12 +8755,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-09-03"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5"; - sha256 = "1bbns4kdjaiisp1wiqdr91kg1jsngf485hm4r35pj8svza38awz9"; + rev = "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f"; + sha256 = "1fccdcrjsrszmfdin72kp3mk31mzd8liw166dak6hyf8sylch3cs"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8779,12 +8791,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-09-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d88ae6623fef09251e3aa20001bb761686eae730"; - sha256 = "0gvd1hkjq555yw5g5i3ydp1gbr279w6lh1c2hl4wc9psz9jvwrac"; + rev = "dd329912c8d446240584a2dbcd3802af3a19105a"; + sha256 = "0bd8bk2r4cn9qz3psj3zbrdiqgbr94pjz43akawbybq88dj59yi0"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8839,12 +8851,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-05-25"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "1b87e6bfa4174b5fbaee9ca7ec79d8eae8df7f18"; - sha256 = "13yi6wby4ybdh536ghjsvp2svzszzc08wi2lxx9rsqcm22aah0sm"; + rev = "c2aed7519b93f4151b6dbb2378793c00096e1aa1"; + sha256 = "0rgjh62w2dpv78rzy41r70ckx83b98235qg3c42dxff2p1ix17mv"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -8923,12 +8935,12 @@ final: prev: nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2024-05-17"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "d333b6f167900f6d9d42a59005d82919830626bf"; - sha256 = "0000a56y6xp2hzb5pf0in9336s9r29w590kxqdxdl5gfpz08f763"; + rev = "fbef5d32be8466dd76544a257d3f3dce20082a07"; + sha256 = "0wbsib27kgrk632c094ivjbc8rw51kbalq9c8j576p78k93wipj9"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -9031,12 +9043,12 @@ final: prev: nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2024-08-30"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "4e5ed58d74d210b853255e3d1a4ab6410f3007b5"; - sha256 = "0p6ycz1bq8j5xafn59kyn5xdashbir66gnzlqdpdmzmigw3z9vq1"; + rev = "7a09242bf2cdc4f27326cc5f13c141110db62d46"; + sha256 = "166hsfszpc9kkhljwigb9bnhl9m85hlr36p7rbma06skf1cgms0i"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; }; @@ -9091,12 +9103,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-09-01"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "6b495947e230a93de7021c275e174b128c7ddaf5"; - sha256 = "1n108419jdq9fv47d75k7r737hl437phizrbss7mw4rgm3p4nns5"; + rev = "87b9a4fc514a789fca833bf540484fbda6a946b3"; + sha256 = "1xj1i17685ck259psam0qzd5hrk4ywrz1dpmrzdxbyj9m6dh906d"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -9139,12 +9151,12 @@ final: prev: nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-08-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "7641ce03636633b986493fc6f52d5051cb1375ce"; - sha256 = "0566c1nizpb9qfrv6qq8vwmgx3cb611791gqhyqmf4qqhgyjpv5a"; + rev = "b1c542a78522d59432a827f6ec2b28f9422c7e7f"; + sha256 = "1b9ccj6qycxlcy84fdd7n7b20bmfpwyc8x4wzcakj3xymrp469d9"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -9199,36 +9211,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-09-09"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "d41b4ca013ed89e41b9c0ecbdae5f1633e42f7fa"; - sha256 = "0xrlkx31rlgyk6a8f4kvqg2k23bcl13933yg4xrdz3mss1lr46wr"; + rev = "8405ecfbd6bb08a94ffc9c68fef211eea56e8a3b"; + sha256 = "0yrpzhs6y73dsf29l29gvv4a3k1f4dzxf8qfmylpkw30vy75brg8"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-09-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b6a6d8997c46dc15682020ce4fddc5a89ee1ac0d"; - sha256 = "0wmr08whizi71s6gv5fl6vving663b493cfyq0fpnkfc9smgncp4"; + rev = "621f5901f0b3e762cc4c5ed0f9246cf1495193ad"; + sha256 = "004k18rz22cmwm1r29h2n595w8wynw9s2ksfskvblkhc53qbgkzs"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-09-02"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "e6cc783b74606d97ca9eff6494e3f5c2ca603a50"; - sha256 = "0j10zqwssvs09izkni8mcn899xl366r777yhb0q7cz2vl7m5sd60"; + rev = "3d5390c49e3f8fe457b376df2a49aa39d75b7911"; + sha256 = "1b4f9cnr1wxnbi3pvm6lmri3xc036lyhmi2c5jikma2j52zpz0z6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -9259,12 +9271,12 @@ final: prev: nvim-treesitter-refactor = buildVimPlugin { pname = "nvim-treesitter-refactor"; - version = "2023-04-04"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "65ad2eca822dfaec2a3603119ec3cc8826a7859e"; - sha256 = "14vg4iykl56ii4m5jrbrw95yjzkqn53vyqpqm82a5lmxgsha8d6b"; + rev = "d8b74fa87afc6a1e97b18da23e762efb032dc270"; + sha256 = "0n5aygram7wfmhsy3sb68g4adpkx6z1z31cl0780zbdgs5k3785b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; @@ -9343,24 +9355,24 @@ final: prev: nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2024-08-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "8dbc655f794202f45ab6a1cac1cb323a218ac6a1"; - sha256 = "0fj02l74ibcp4b8j6jkyjfq2k25a3jllf6cd1mddhhj7laa4zhfw"; + rev = "fcdec45b3bf33d3b279d2c5fee06abf4ce152008"; + sha256 = "0si4wzlnj3anm4w6l8bmzki1zk0wlcgjjmz3rjkz0rm7mn3krq6z"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-09-06"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "9793801f974bba70e4ac5d7eae6c4f5659993d8e"; - sha256 = "0gssmr3j5cv4313pc1vh0jfd2zi8y71dnr0xyxxndxljzxggcznr"; + rev = "26220156aafb198b2de6a4cf80c1b120a3768da0"; + sha256 = "11ndzzh43xhbb6gmjcqjyinb87ijsvwshmxbxinlpw712zdiyfpn"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -9475,24 +9487,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-09-06"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "fd50872494abd1cb580c604f1f52aae2257f7220"; - sha256 = "18sld24d3n0ai7acfw2w0frj5a3knkcxn4k5xgjfappqwb7whwwd"; + rev = "955f0fdd03b0da23ee1c3368d80bf806f0e36fa5"; + sha256 = "0lz2vvfs30bzqfv714m71vch89phyvyhh08qcfm07aix1pi24mf5"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-09-10"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "1eb9fb35a4613518f79790117ed82c367a0b4a22"; - sha256 = "0fg7f600v48md44wirnzz9bwy6minvk8123abqplpqiad9115xh7"; + rev = "1360be5fda9c67338331abfcd80de2afbb395bcd"; + sha256 = "17jb7s7syzl2bwk6m888kibs88qb3hh13l2sksyxd733m7lnzb8f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -9608,12 +9620,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2024-08-22"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "057d7048e499b4de7cd4edaff94ec1890242a117"; - sha256 = "1r391b9wnc2plv9v6l22y154lbdhdxfji9x82faa1s96qwjnp0g9"; + rev = "7f8a7482a1145c1286ee05d46ef4d028a4f7264a"; + sha256 = "17c1kvqkh483h7hxpxyn3xc0cwhxlmjs5pvav6gf5rbq88ddc2kk"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -9668,12 +9680,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-09-02"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "e3500add486b17da58ce8e42a0f799161e5761c9"; - sha256 = "19w2jsv98pwpp7fvmhpryxir2b2h8yp9dzvrjn810ysjb5dxli4n"; + rev = "08d763df12f4a03e704c25254ae0de0a95e26eaf"; + sha256 = "1gkpwyfvw9z92277q6311r924rmb9zidgmlr4xxkmn2xrj5qwl7x"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -9704,24 +9716,24 @@ final: prev: outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-09-09"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "41e7b88a2b0baa90619af5ec8af462fcb442db65"; - sha256 = "1vhkwk3d1kvaa8bwfln8h9bs58fpq8qj1wifiaqz5ybawfpbjsnf"; + rev = "6c44527837ff7ac1cd054dc365a721e881020a2e"; + sha256 = "1nxcmdq04qqs57dy6wfjl81hkwcylvkpiqfx2k1176a86p8lldn3"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-08-19"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "236e60cdac6410dd95ea5cecafdb801a304d6a41"; - sha256 = "1cxfvi65h1fm5hmxvbjmqyzrhkqzh31pxs6x28nlbvdyvf4mcdkk"; + rev = "a2734d90c514eea27c4759c9f502adbcdfbce485"; + sha256 = "1fj4s0mnnr3hibm2jqkn6hmi8nvrs0bijr802cnmvwdzq1mzc54d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9849,12 +9861,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-09-03"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "1673a295db295999aaf8de7c7a3afd45e0b83a46"; - sha256 = "1qgspwk924w6gpb483v1446py8x1nzd6640nbfwjsarlb13jgryb"; + rev = "3006e641e2892b58fe51511c31595515e1a7dc00"; + sha256 = "19zp691z8lbxyg1fisqz8lf3jgra4sww6c6qj270im8kqc4h2spp"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -9909,12 +9921,12 @@ final: prev: plantuml-previewer-vim = buildVimPlugin { pname = "plantuml-previewer.vim"; - version = "2023-03-07"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "weirongxu"; repo = "plantuml-previewer.vim"; - rev = "1dd4d0f2b09cd80a217f76d82f93830dbbe689b3"; - sha256 = "0pvdiyyqd9j65q9wf3y6jxgry4lxvnbd2ah1761a4vbn02zdrr2v"; + rev = "555347700382c97b347bace57b7a9f764ed556b1"; + sha256 = "0vlx6zbdaw71vlwgs46274af60cazv6d9pa5dn9afm99vls57avq"; }; meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/"; }; @@ -9945,12 +9957,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-05-20"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; - sha256 = "0n2p8krzwiw682f0yb6n8faamffpp336rjy50pbqf3jmc6czd5z4"; + rev = "2d9b06177a975543726ce5c73fca176cedbffe9d"; + sha256 = "1blmh0qr010jhydw61kiynll2m7q4xyrvrva8b5ipf1g81x8ysbf"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -10175,12 +10187,12 @@ final: prev: qmk-nvim = buildVimPlugin { pname = "qmk.nvim"; - version = "2024-04-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "codethread"; repo = "qmk.nvim"; - rev = "cfa6cecae362d23778cd97317d33ab12671e157c"; - sha256 = "0p44i25iyryrvy1sf3bp10as39mgd6da1gai332rv2ky3zgc3lbh"; + rev = "ad51cb15e607da0983fcf9882d38a2aafac32149"; + sha256 = "14b8mx7hxv06cnh6xb1z0nrkhlj7xaxdky6lcmajn9bp9spdzlmq"; }; meta.homepage = "https://github.com/codethread/qmk.nvim/"; }; @@ -10400,6 +10412,18 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; + render-markdown-nvim = buildVimPlugin { + pname = "render-markdown.nvim"; + version = "2024-09-23"; + src = fetchFromGitHub { + owner = "MeanderingProgrammer"; + repo = "render-markdown.nvim"; + rev = "75a0a9596a91130fae43d3b7c0d6c651645ef1df"; + sha256 = "04n0l0m1b5ls8afq8dizmiqlhcczzddmb9bgfp07vzxwjxk9iv5z"; + }; + meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; + }; + replacer-nvim = buildVimPlugin { pname = "replacer.nvim"; version = "2023-07-29"; @@ -10414,12 +10438,13 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-06-19"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "e7843c55f9df6a9db9f97dac180035c6ff895a90"; - sha256 = "02iksjxamy83zix1gr495bvigvyzpv466wz6529nydhwkv8vjnbd"; + rev = "d8ffdea1d501ab0bd3bce3b1eeb55d2bdf3dcc4f"; + sha256 = "0yg3zmm00m48ahcjvnnkxvz0xqjbwn46jf01rwqzhwrwb9v3323z"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -10570,24 +10595,24 @@ final: prev: scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-09-09"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "77aaade40b660c235e6a0fc80ea9a2e4094d1de0"; - sha256 = "0s3krvyksfy3lzi4qwfmjr194av72ny5934xzg72rzp434srysji"; + rev = "cb6a968b3de9b9a176f4012dd18efcb8d9d34f71"; + sha256 = "1z1jg201q0k6lkywkgl5phxkndklz3yw4cw4h0hp8v7whjh5yn9p"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2024-07-30"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "5e3f5ead970317b2f276d38dc031cb4bc5742cd4"; - sha256 = "0l4xkjbw42vwmj3j7dgca3pwlv78dsscbxrdz1jz0i381s2inar6"; + rev = "932102696ead2b7ab9ff65017767b57e2722fdde"; + sha256 = "1ma6rrh8dhbm8wwky6pybczy19ziy98wsy55flfamsq5gclkxqyr"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -10775,12 +10800,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-09-09"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "f002d5dd6478a2171de08d2ca32db00d238d6976"; - sha256 = "11ji4wzd6g0v6jjaqmfxn9npl313bdba6v4shxvjm57cqblg8m0w"; + rev = "3737faa521d12a0c77d0d28bb15ad903a9e8cfe0"; + sha256 = "178cwqac71bd8rw5g0gw68dczzf1i0n0vp9skg7qlhaha9apchwk"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11016,12 +11041,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2024-05-31"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "c7398b0b32009406cf3918a655c364c44d7ab99b"; - sha256 = "1bn5jbzs4rv3n8kz00mgvmkk6f9z7m7ki1ayynhlmkknqmf8izmq"; + rev = "fa2242a3dd81804468241c0a8ebb32266c33fa60"; + sha256 = "13qq617i6cv0kzr2hsz2qn2r9hvm4hyj7pq0bc5x3nq94g4kzaal"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -11196,12 +11221,12 @@ final: prev: supermaven-nvim = buildVimPlugin { pname = "supermaven-nvim"; - version = "2024-09-03"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "supermaven-inc"; repo = "supermaven-nvim"; - rev = "2d10d6c63a2c251e8f90d6f80faf4e9c1b8aa7d0"; - sha256 = "0arq4c5axh5yl3cawxysjiqkiwxrqvwa0pmaj9cm159c8pgq6vpi"; + rev = "074a83a74ad8a7b6f605df83e2583775aaeb4cfc"; + sha256 = "05lgf5vsbxhcdw5yxsiindl3cncqarjfrjdbg7zws764vhgyg7d7"; }; meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; }; @@ -11317,12 +11342,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-07-31"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "43d61e7418c062c18b67b2136fcc564426f08db2"; - sha256 = "1snhf1shnqc4ybx19f1vf1jz09vwsjn5flqbjq1g65nm03m176kk"; + rev = "c58d9803f9526b0c8c8b7bfd43822764e33b30ba"; + sha256 = "1jx0z3hi9ic80l50a0qz8pffv258mdi6whlfy2x680qb5hm8p74h"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -11448,6 +11473,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; + tailwind-tools-nvim = buildVimPlugin { + pname = "tailwind-tools.nvim"; + version = "2024-09-23"; + src = fetchFromGitHub { + owner = "luckasRanarison"; + repo = "tailwind-tools.nvim"; + rev = "825ac68f3c3b364e30081089c6d78e8e51608a81"; + sha256 = "1gz7ch5ln8fc9axzjqvykwiqjif7c6srgqi68v7mvgjymp5qmyxx"; + }; + meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/"; + }; + tailwindcss-colors-nvim = buildVimPlugin { pname = "tailwindcss-colors.nvim"; version = "2021-12-24"; @@ -11498,12 +11535,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-04-22"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "nvim-telekasten"; repo = "telekasten.nvim"; - rev = "319276a7853ff996b7bb1ed4250d8047c84ad29d"; - sha256 = "05b8a9h8ni5pmj0x9r3pc8j4h77nbj2s6wmlx20w4h2vmwwp7k26"; + rev = "ae6473da3d7ee7ca5cd7df413d3934169a857a75"; + sha256 = "1sqgzhhqwvl6549rv97r2r75bw4k010jrwjj2d3p6ajk803m8yrg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/"; @@ -11559,12 +11596,12 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-09-05"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "c5a14e0550699a7db575805cdb9ddc969ba0f1f5"; - sha256 = "1787c0jkawz3gxkaxl6m6pmfw9qcjpg8rpy6c3xcy8fvgd4sngr2"; + rev = "3b8a1e17187cfeedb31decbd625da62398a8ff34"; + sha256 = "1vll5da8k1a0wqs44f7kcn6i0iwrzisiyja2z44x48b3maqkr2p3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -11656,12 +11693,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-09-10"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "6f12b6b378af873c46697814fb0dd27588bd255b"; - sha256 = "0mcnjz9ypsv4m2jifc7mg6zyq01zddn1l1hmlyzpy5ifx167dpc9"; + rev = "f7aa1a18b1cb448d6607d81603172cd62e0e0e8e"; + sha256 = "0hi0rw1a0f7lk20v2i8rvdsbr8q3jy7nxghxjg0bm9hakd4y6dmd"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11788,12 +11825,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-07-05"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "9c23e2fce1c0c7445f68f7765e5f3e512920184b"; - sha256 = "1cf2pwkbdnsm8qaqizjcidn12sfgn7yamxxr87h13cy5jl9v861x"; + rev = "5721be27df11a19b9cd95e6a4887f16f26599802"; + sha256 = "1h4id0qb3b764y528hgf6a0mr9wm9vnl1yhw8kn8dc8qmg65wap5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -11813,12 +11850,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-09-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "fe999db6e0c39c8984519ead75660e0e2d3245d3"; - sha256 = "0ycv08nlm1lbvc3bqxf37kb4is4k0sv7k0srd8fhdlwwpbvpnb5x"; + rev = "b324469959908c1c7434eb65d80e87895e6828f7"; + sha256 = "1080z16b50xisq0zinbhnds43ch03bh5qljc1d7lhacryfwl1q4g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -12017,12 +12054,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2024-09-05"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "c0543b2980251a7a2024e936ef724dcdfb07bb87"; - sha256 = "11f821jqb4yvy1s6z3psxhwsbwssjxgikihiqpy1iw5px3h5zqjh"; + rev = "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7"; + sha256 = "1bjf996ria9sghf51wmck7gn2x57vdabrzradpjn94x78iai85rl"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -12077,12 +12114,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-08-31"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444"; - sha256 = "0nav42w1g9k27jrxzwspdxdalq9sikz7g1f4p57v0wjnrzwdv741"; + rev = "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0"; + sha256 = "0v6vn3f9svj756ds8cp0skpw65xixlx1f3aj0fh374wdpb5i4zhh"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -12114,12 +12151,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-08-31"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "4b386e66a9599057587c30538d5e6192e3d1c181"; - sha256 = "1fqz4zpipfmgv4i2sdznk0cld8i8k40rdwgnj1a2jrayk9m0s6wk"; + rev = "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839"; + sha256 = "0xvdhq7400rh1450ybvw6pg4kdqfrs6k3408ibb9asw2l6mv6j3p"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -12198,12 +12235,12 @@ final: prev: triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2024-08-31"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "c11c540efb50cbb79ca16ece9ffc9e0d761427ea"; - sha256 = "09w1z8l170ikxxswdxxis41sdsahzr8dslbva2lh65sa2nhp4kk8"; + rev = "cb87a21eeee10aea5fec12e8b8fec3f80b4b8164"; + sha256 = "197xj8i9l66zackvrgmx2cvrzycz4v19ifvsd6jmc7acmbjba4qi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -12355,12 +12392,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-08-22"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "53ed7c65e466963c916251f9ce6df7dd3685dc36"; - sha256 = "1mn111slp5s894nyp9jaqxkc56vnzsbmwbg2fihyg933sq3n37dp"; + rev = "ff21db642847840db183b9421ab3d89795a7fbba"; + sha256 = "0rkxfmacwwpzifpnqfbizla425b7gfay0jfgw84bfidspvc33vab"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -12379,12 +12416,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2024-04-16"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "56c684a805fe948936cda0d1b19505b84ad7e065"; - sha256 = "1yy7y344b906z04rrnvy2hkrgsrxjm6ij399qmfw8b20rxdyi2jh"; + rev = "78b5241191852ffa9bb5da5ff2ee033160798c3b"; + sha256 = "1w4sdbcvlicb3n4dpzv8l9g41xl3pqslni227lf88b4p5pjsfkax"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -12403,12 +12440,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-09-10"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "814f968b3d48813d949046a9ee6aa0b7388fa276"; - sha256 = "0zjnv574wyfd3pgkp08ivkg6j597lb72f9v94dw7lw3k67anfkn7"; + rev = "c057942cf752b33f9945b2c42554b20d0cf2743c"; + sha256 = "0drlwml87hl8wxsqxv8inwy7q4v2xy2r1w22189k2sipb7kmlbb4"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12511,12 +12548,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-09-09"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "960557d2cbfe3226187a4f542e53a6603ab87bce"; - sha256 = "1ir5ygyw1i9f5d7s2r74dadk809lnvbcv48q047yhil4ff51cwrg"; + rev = "b1fe33e532aa360203e8015a557ba79dd38e07e4"; + sha256 = "0gwcn7r43143k95k5gzni6g9gj20kf5k4yy0gax8kdmdfc6660k1"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -13591,12 +13628,12 @@ final: prev: vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-09-10"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "a5ff8bd69fcaf53cd24827b54492c8ce87806d18"; - sha256 = "0lz9s5swd9kp26qrzrbyjpiz7j05rnw6apmppgk6afi1sangaivf"; + rev = "f29c85ab42861c6ef683289b0c6a51e0d436dcf6"; + sha256 = "04k271jzbgfxfr3c88fgkpfrgwaxqzdy45yw9sximwpgbayky1ls"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -13819,12 +13856,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2024-07-22"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "753fc863e488bd09580221d7829c3e4735a99fdb"; - sha256 = "0bzhbsnpabln2p6r1ns6dmxb6x01jy002y60w8ah49qjn6qnmk1n"; + rev = "39cfaec9ea71c22a82c459ecd64860c8850f1215"; + sha256 = "12j1gqkm3dhcfx1axi8cl2zzj20z9a3xf5ggyqlr41f1bzpmprdh"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -14095,12 +14132,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-09-08"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "03f6e39050c2a32deca6964291005c6c5c4c73cf"; - sha256 = "1swzcymq11jq6n7b7kq4z4fmcpxxk8288dz56b47fxlkwgzxsp9l"; + rev = "bcc9b23cd7f20fb232664a8fed83bf17865d0a39"; + sha256 = "1dmcaa9zylmv3abwcdrpzflp89bhm76s4wrf8d7jswabf7vyd2jz"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -14117,18 +14154,6 @@ final: prev: meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; - vim-fsharp = buildVimPlugin { - pname = "vim-fsharp"; - version = "2018-11-13"; - src = fetchFromGitHub { - owner = "fsharp"; - repo = "zarchive-vim-fsharp"; - rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; - sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; - }; - meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; - }; - vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; version = "2013-02-10"; @@ -14323,12 +14348,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-08-18"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "f365d961e540579e413acb092c8f18d62153cbaf"; - sha256 = "02n93mbn3bskbqvj3mfj4f2c6k15r1c6qkivqh6qqmbjy6593215"; + rev = "ac1fb9611de435d80a6badcf8482cb1428449b10"; + sha256 = "199zz6b4yj757hy7vygsy9mjws00j0k8vgcy90ndcrl774jpjqfh"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -14383,12 +14408,12 @@ final: prev: vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2024-06-29"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "008b7773e5f2cba625a5fcc5acc543b28b19cd26"; - sha256 = "0qligdiaxa7liikgm4hpda8i51y1dyzd1xq7c2kwk4ysxadlvk5k"; + rev = "60bb03df34fd6f22aed9dcb71f5cb297b6cceb3f"; + sha256 = "0xbjs441xx9sjvqfbp7nrfiw8cqgsbccy3xgq1rklkvxib9gdbyp"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -14600,12 +14625,12 @@ final: prev: vim-html-template-literals = buildVimPlugin { pname = "vim-html-template-literals"; - version = "2021-06-03"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "e6f3f8ffaae9c2f9deea2bbb596b64468041616c"; - sha256 = "1lrkby9m60ccgm35y1z82llgzjd5vmdwfscy7byjd5ycnkhyangi"; + rev = "54edc719402c08b409d192e97f77325c418fb12e"; + sha256 = "11pfzsizvkzkhjivlfgjjzajyr4cb93wqrhh6862q50ib6kxkv05"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -15117,12 +15142,12 @@ final: prev: vim-llvm = buildVimPlugin { pname = "vim-llvm"; - version = "2023-05-31"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-llvm"; - rev = "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1"; - sha256 = "1gnamw4whrvw3qbs8bkr45akzwkzinnkyhjpwgzza90w8a99nds6"; + rev = "7bb02ef3c6c41aa5510d4aa9817fd40936be8209"; + sha256 = "0z61dx7x2g1mw6rs7vix0wgwm1bf5nhgnfr25vkgwwjbjd3d5dkh"; }; meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; @@ -15177,12 +15202,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-08-05"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "356254d6388298017589114a8eff15d20def90aa"; - sha256 = "0pkca4bm0cskwka45l6rn2mfy6cqmab8hs2cay2dlfi9h52w72jc"; + rev = "04428c920002ac7cfacbecacb070a8af57b455d0"; + sha256 = "18naarfr01ljlkl37x3l5y2sd9j9xxdz1gkcvz7ylvspyxjmx7fa"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -15213,12 +15238,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-08-31"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "a7dce2cde681ab2716ff85f871a6a3a9f5da524d"; - sha256 = "0x4mmh9plgi2v5k77958rc7jmrnhrbf5ff6j01hi097x0za7fyai"; + rev = "6dfdac0e5676f403299f496c0e69515ee7576fe5"; + sha256 = "0vmv264vjccby0mnjas12bab18wa780n0mygk3cqmyx95qdybixb"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -15297,12 +15322,12 @@ final: prev: vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2024-03-01"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "a657e697376909c41475a686eeef7fc7a4972d94"; - sha256 = "11f26n433fvsih2b31b7ffanxfhgjnjvdkjvviav2ryc5dvidb3q"; + rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51"; + sha256 = "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -15346,12 +15371,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-09-09"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "8522c9b3ba6c92ac64a609fa792134ce6ba9c4bc"; - sha256 = "01y7gq4q7y9cis9zql3x1g1vnz4nd8ax749vd088iqqvn5z6y7sw"; + rev = "1975afe63198ab6a0dff7200919828e5cd4330b9"; + sha256 = "05gwlf5fmkvs4p92n7l397brb8g6g62pvxcd93kffv289vmx7rzk"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -15946,12 +15971,12 @@ final: prev: vim-pets = buildVimPlugin { pname = "vim-pets"; - version = "2024-09-10"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "MeF0504"; repo = "vim-pets"; - rev = "0b406e97db767a1c4f1e5de2036e1bbf8934f95b"; - sha256 = "1pwra18q3kwr997w3kv22xykjs40sfdxnxkpammfac38ril8jl87"; + rev = "bc97ede44da9ce6551bbd57146ba4f98e5421b8b"; + sha256 = "1gcz58mrglxrd4cd1k1mr4xhys5l8qs4wg7a66q7m50j5rzz5nyc"; }; meta.homepage = "https://github.com/MeF0504/vim-pets/"; }; @@ -16150,12 +16175,12 @@ final: prev: vim-puppet = buildVimPlugin { pname = "vim-puppet"; - version = "2024-09-08"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "8f6abca1534c03cae0bd950016750e05ed67c7e2"; - sha256 = "0nnb98hy86d1w1s4p3m7ky9q5qc4l19zna935qmivhn2hb2c3gpf"; + rev = "10bf0b27c5be81ee26c3a0d32e39b270f95329ce"; + sha256 = "0a6gvzz27f2121hdnzszcs6haw8pysp1k1wzq3ygjq0nzrddnlk1"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -16474,12 +16499,12 @@ final: prev: vim-shellcheck = buildVimPlugin { pname = "vim-shellcheck"; - version = "2024-06-04"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "itspriddle"; repo = "vim-shellcheck"; - rev = "52aaa9c0d976756923ee8bd5f02f7d6a4a7f1bcc"; - sha256 = "1749wi96gj9qzkws3hs494mnmc9w99s8gcmi35qzwng77jp7jvqm"; + rev = "35bccea0c566f9f005679d02fed07e96092e100b"; + sha256 = "140r70q9dy7l2v7zxxrv45gswr5i3hbvbazaz2cgmj2g3if4d91h"; }; meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; }; @@ -16546,12 +16571,12 @@ final: prev: vim-sleuth = buildVimPlugin { pname = "vim-sleuth"; - version = "2024-09-07"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "cd9d382e33bb817abe7f10cdc3a606bf1d491d75"; - sha256 = "01hqxbgikhb9pziwypssd9jigpxdabg76826zpsvjy6l2g9m7v8y"; + rev = "be69bff86754b1aa5adcbb527d7fcd1635a84080"; + sha256 = "0wqxdjgplf04nq428ialw1w03f8nh5vb629a17vl5gc9gf3zfanq"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -16967,12 +16992,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-08-27"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2c9cef3f7605fc1b272b23765c5872607c1b6183"; - sha256 = "03xpvafz40l418x030f6wysjy9pdk2bllir3414y1bmiych9zikr"; + rev = "c090bfd93919888bb0b86e1ab707bc6a3095097f"; + sha256 = "1qkgzazxj6f94ivnrd3cjlvfa2pn4hsbkf6v64fanck4m68x1jpb"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -17111,12 +17136,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2024-05-26"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "5b3c701686fb4e6629c100ed32e827edf8dad01e"; - sha256 = "0kcrz2hlv672v0967n7zz1f5xl8vh41nmps0pvms9bplw1p5nzx3"; + rev = "a9b52e7d36114d40350099f254b5f299a35df978"; + sha256 = "0sfsyf2jk57511pba6g31zfp0qi6v02np78sq6pzgny8qv40rj11"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -17147,12 +17172,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-06-13"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "f59f144b73e79aae7a73bb86bf527e79ad86de8f"; - sha256 = "0h16bs65ic5iwry8mq22v4xkn1wc2a6xin0vqn5qnlg38q7fgpn1"; + rev = "72a624f97730059bab359cb0b58a23433bfec308"; + sha256 = "1sz3mqsji14yrrrkvnx00dgaf908zkwq9m2myb5jk2gyj3z1dgib"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -17387,12 +17412,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-07-20"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "53bba6bb8342de9cbdafc82142a9b5e82008d858"; - sha256 = "02q2fyinapfr8y0fndv3q7x6ri42nlvpy6qc7cklszx77q4y0a89"; + rev = "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1"; + sha256 = "0v21r1yj6s28vhqym200n33qgdrjwxjrpzjzkax81cbmmp6a6fbc"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -17483,12 +17508,12 @@ final: prev: vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; - version = "2024-06-19"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "bcd79dd6a1b74efe1a16c70fe6a06bfc6a99e543"; - sha256 = "1ym08zy9lbqakflbif48kvgirfd4fajpaynmx8wgp6q2xhks6xvd"; + rev = "39914ff3aa3a5678285ba4b740524351d9f5ae18"; + sha256 = "1v4q17wp2bifiz7pp379nizvskfy2fk87hhc4qd9fib81fvshf80"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -17531,12 +17556,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-07-30"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "121a95905452c59c04f04e9055aa246913650e2c"; - sha256 = "0wbm85adrjqljk1jfad4kydbr5aiv7hq39fs41ka4vr0hxbqd33f"; + rev = "207290f8c60ca4f31e52f53e221e1e50aee7e5d7"; + sha256 = "15y6jjmmvrkqdrc1fa0p5nzi89hw8252gf3cywd3pa0d1a8lspi0"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -17603,12 +17628,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2024-09-10"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "ac48ef03271f7d5f34fa4c5371c231b257a28c89"; - sha256 = "0jlg51by287pxzjy503af142licfxbhf7aibbmndgn3bazbaqirf"; + rev = "f188cd7c069f41cdd9455fb24a3c34f7cd90d35e"; + sha256 = "1flgy85q6bfkd1cpzanclbkk4h30j5cxrhfskdwdj6ynqxnvxfpc"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -17724,24 +17749,24 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-09-01"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ec3b648af5092372ddd72404fb5db46b2f78beb5"; - sha256 = "1nirjrzikw53kwn49bppwmaqfgxl5c0pr0y5cbynl9ijs30d732m"; + rev = "b9cc11536a4e726c58c4776e9bcecff26fc454cb"; + sha256 = "17fl1gyax3ia0jk15n0c5863njcprg3zjicw87kb95vkx0gy5wzw"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPlugin { pname = "vimux"; - version = "2024-08-21"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "b110cd95062f5d83a4cb58b807783d783e1fbcd8"; - sha256 = "19nzdangfdkvr77i831ng60ikq3f1jgv8s8450skn6vh9w3j3hka"; + rev = "64df7ce47f16adaa5bc15d07f2d99197524961a9"; + sha256 = "1iaq8cbjhlpm3smcs7zq26qwv6a3rkmys6dsggph219cqx0cklm3"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -17868,12 +17893,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-08-31"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0"; - sha256 = "1s856ns57ds6ckh2ay4f0g0kd32bqq3qfl0ym01f74bn84rhm38m"; + rev = "fb070344402cfc662299d9914f5546d840a22126"; + sha256 = "0p66gn3cxmkx6ldp38gnwqnwy3d3qdhhl1gr1xaw8gliry0jwx9z"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -17904,12 +17929,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-09-07"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "ba630e2e174f9fe963c4bce17024a4adbcb09624"; - sha256 = "1bk07sic3b2nyywyz714wjqs3mk8gajys5z7d3bnc1anq0h5navl"; + rev = "8188ff7b62b7695eae44257bd6202d8494fee655"; + sha256 = "0w7h0xdhdxn7lniyx4qrxhfnq892z4p4p2pf2jgbsnhzj3dhhv87"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -18036,12 +18061,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2024-08-27"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "d75acc087b5183b0b3e000189518c5d799978e95"; - sha256 = "07jl36jk04rr9rykhxlf7nmxwi4p9ngmd5mcq7j7jli0rjhbj1nn"; + rev = "16eec1f32c3608bd8519e9e520041fe34201abb0"; + sha256 = "1clpik3z79mvxxph5z4ghiwrq560jy0zdr0yxmp9byl2r0ggfa64"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; }; @@ -18097,12 +18122,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-09-11"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "58bb48dd5e1e36b92bc3dae882b10c52e731f27f"; - sha256 = "0f7b8088z0jhwv784gwz6miw4m8vzv14y9ficqczhv2xl2pf3ihn"; + rev = "1f8bcc422956e347d2fe5e2f1e323d45130ae399"; + sha256 = "1xwl3k5l40z2wz6frgr4bg5pi1v0107nhljz6mwbldzxpfzjakyh"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -18131,6 +18156,18 @@ final: prev: meta.homepage = "https://github.com/elkowar/yuck.vim/"; }; + zarchive-vim-fsharp = buildVimPlugin { + pname = "zarchive-vim-fsharp"; + version = "2018-11-13"; + src = fetchFromGitHub { + owner = "fsharp"; + repo = "zarchive-vim-fsharp"; + rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; + sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; + }; + meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; + }; + zeavim-vim = buildVimPlugin { pname = "zeavim.vim"; version = "2019-06-07"; @@ -18181,12 +18218,12 @@ final: prev: zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-08-24"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "006f15ad3437d85884ad50347bcbc60c9a377640"; - sha256 = "1cydhz2f82llms865jqpfrkkp8mab44mssdr1d245swgmw24fm12"; + rev = "12daea796d5079a65dd7032bb85540443e8b30e8"; + sha256 = "1a4b1zr3kpf1mcqq9zssa9hs75l5v8f4x18abh20q4v0x0ad59mi"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; }; @@ -18229,12 +18266,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-07-23"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "dbf4eeab55b08856c9d6b6722dbff39630bb35eb"; - sha256 = "1d6qz2yi4d0ccpibjh3c366qh32hd9r646m1b99vy16r27ydffcs"; + rev = "8942fcc7ba2477e3e0d8097c806eec41cd844fd1"; + sha256 = "14psk650j0n39n5dnz14idxkwywls5dspbaz0bpsvq5qzfdxm0bq"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -18265,12 +18302,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-08-20"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "4fd72a9ab64b393c2c22b168508fd244877fec96"; - sha256 = "1fznbifj9xayimdjld2zhn9003mgp93sd87lpaky7pr6nsgsgnb8"; + rev = "63685e1562ef53873c9764b483d7ac5c7a608922"; + sha256 = "1b283i43p1i49mql84s6njfnf4mdf9csknp9hdkjjagwfi509wgm"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -18301,24 +18338,24 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-06-25"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "dcc90e04ac9c9392bf32c1e5f701353d8c5290c7"; - sha256 = "0a5lb5a4c5c39nhwy6vyb2d8qkjpwxdmlff84m4z116q332rc9b1"; + rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; + sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-08-28"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "70fc2425b50396e5f1230200b59527d8440a24df"; - sha256 = "1b0ryw9gxl6vw71y1lby46jsvwmvv3rqmf14m307y0m29k4xjs8f"; + rev = "b3d53bffd87a9aef6ff7e3976f6953f615c0d357"; + sha256 = "0ifa0vmk14isn9bj73gfxqhr2wfg7d0kd0z0k2607z9p0lm2qimw"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -18361,12 +18398,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-07-25"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "19efaf31cbe15a429cb3ca6ac9c9fce13275045b"; - sha256 = "1kpg8bkjdcna8327pb212dgh5rxij0ahvc30qn7bb5cwjcrfzbp5"; + rev = "3c0e3176d19ccd6ec301a43d0ebfc618c82928a4"; + sha256 = "0rnh5qakjk0k73xfk10bmxalsc82s6qlw27la7kgrkja1zy6f8q9"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -18385,12 +18422,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-09-10"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "dbdd2cfa7b6267e007e0b87ed7e2ea5c6979ef22"; - sha256 = "0a9zk5k3q1ilr7df444344h51l1p67bzyy5rv3cskzz1h80cr0k7"; + rev = "62f6ede07573a04e7c1a76ec48e7ce19b43d39f3"; + sha256 = "18zs0gv7cwyv9qsq9rr5k7arl8kim08m769lrriw5wb32199lrni"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -18419,18 +18456,6 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; - render-markdown-nvim = buildVimPlugin { - pname = "render-markdown.nvim"; - version = "2024-09-09"; - src = fetchFromGitHub { - owner = "MeanderingProgrammer"; - repo = "render-markdown.nvim"; - rev = "a5e2d0b1215814c3d033be1fd8eccf59ce366399"; - sha256 = "0xnz3kl45lh5n2zjas5hdqwd9ac7smcmshvvgjvkacl6xk9rgflr"; - }; - meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; - }; - restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; @@ -18503,17 +18528,4 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - tailwind-tools-nvim = buildVimPlugin { - pname = "tailwind-tools.nvim"; - version = "2024-09-15"; - src = fetchFromGitHub { - owner = "luckasRanarison"; - repo = "tailwind-tools.nvim"; - rev = "41e901e7b4470082b5388b8385249632642c2510"; - hash = "sha256-eDog1SXn1qS9ZjeG5709BU2qxzOUqa6V+gbBkW1xbqw="; - }; - meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim"; - }; - - } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a3d75e591c..235151a6ca 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -38,12 +38,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=602cc4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "602cc4b050ef1e14a69acc2ea094968bf928fa59"; - hash = "sha256-OEaeH+iVWOtDKVBAAbFPN96uyKlcuDHIObsk6SP78SY="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -193,12 +193,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=bc85948"; + version = "0.0.0+rev=f4c2115"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "bc85948c0bec746ebe921f72d2296d47e17d4ea7"; - hash = "sha256-nwo4V6eliE4P5ub3jx9DSBjLRjfFViMZKXfP1RdSMM8="; + rev = "f4c21152f1952a99f4744e8c41d3ffb8038ae78c"; + hash = "sha256-DcW6KZVTjJtPx0iNXvizeAXWW8iaShKGF4+sHrwXPvs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -325,12 +325,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=30f973c"; + version = "0.0.0+rev=30d2fa3"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "30f973c2244f0bff444186185f475c3bd76bc3a5"; - hash = "sha256-r0rtjx0crbUK8euu5BAUW6NHdxC835tLW4YttvLNpkk="; + rev = "30d2fa385735378388a55917e2910965fce19748"; + hash = "sha256-O7EVmGvkMCLTzoxNc+Qod6eCTWs6y8DYVpQqw+ziqGo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -381,12 +381,12 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=ac58458"; + version = "0.0.0+rev=45e5f1e"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"; - hash = "sha256-+6+9x+5pyjv252X3XzpN2CnrUXVzMvaCrCPVhhjEELo="; + rev = "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"; + hash = "sha256-q96RgJWrMop2HBBsQloVTspe3EaMtUL3wmVuT9xnE/g="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; @@ -526,12 +526,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=faf014c"; + version = "0.0.0+rev=a761198"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "faf014c607f912ff666b20183d32a03dcfc3111d"; - hash = "sha256-gkbPpwe/FNeZuZEWOxchccWOk1erRMU8jabWoIFl2AY="; + rev = "a761198025448c77ea11bcf22505b395a77fc0d0"; + hash = "sha256-KuaXFJGp1kxn0hqssiAFYL36zb0HY22warBb/40Ftzg="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -570,12 +570,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=09dbf22"; + version = "0.0.0+rev=27f502e"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "09dbf221d7491dc8d8839616b27c21b9c025c457"; - hash = "sha256-Bq2oWtqEAsKyV0iHNKC+hXW4fh4yUwbfUhPtZWg5pug="; + rev = "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"; + hash = "sha256-o5ou/9/TCzc9HuGzvSSZE2iyWCOwYk0c28KEgGrOiiI="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -713,12 +713,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=8f84294"; + version = "0.0.0+rev=c52e978"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "8f842945abefb76b9a68c0835619b37060b8f098"; - hash = "sha256-7nVAFWegMr/oShjSLaq9DESvaguPEK/bCCFu0Ru1QPQ="; + rev = "c52e978afadf3faed52bb3c8082cc472c915f4e7"; + hash = "sha256-MQmS6IR/fyTo9qyYxt+g5kO4eToR6URrOHMN47rQ8kk="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -900,12 +900,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=ddc3137"; + version = "0.0.0+rev=66aec57"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "ddc3137a2d775aca93084ff997fa13cc1691058a"; - hash = "sha256-q1xL3/4W442z1wjYL0HQNdz4sPZqqEijyLSvECHugXw="; + rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee"; + hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -933,12 +933,12 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=81a11f8"; + version = "0.0.0+rev=ecc2086"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "81a11f8252998ee6b98d59e6da91fc307491e53d"; - hash = "sha256-q6ChXb4nHkFlMz4QWX8DMlCMaHnTgq27c7a3hufYOvg="; + rev = "ecc20866d1bd4d80f3aef06456ed3014d4d598e6"; + hash = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -966,12 +966,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=1f55029"; + version = "0.0.0+rev=3b01edc"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "1f55029bacd0a6a11f6eb894c4312d429dcf735c"; - hash = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE="; + rev = "3b01edce2b9ea6766ca19328d1850e456fde3103"; + hash = "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -1143,12 +1143,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=cf432a7"; + version = "0.0.0+rev=5439302"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "cf432a7420eb71e9b40954aa829dcb8a9bf6b546"; - hash = "sha256-LnbEEV8N9undyrC0ziH2nfbFOOEAPKVPXTyl7Xq0KG0="; + rev = "543930235970a04c2f0d549c9e88815847c7a74a"; + hash = "sha256-MElmidivJtIywWm4dRslrmtc/vVwGDO1f6k/0P3gb4E="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1209,23 +1209,23 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=7c68e1c"; + version = "0.0.0+rev=231f1b1"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "7c68e1c8ce6eeef6bc4b749330c540dbbda5ba44"; - hash = "sha256-0Tj/hTVU8lK8j4MkcvlzpnbFFFZcNcXVdHvnB87AnyY="; + rev = "231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94"; + hash = "sha256-q8g7u3ctpfl0vq+RVBw7g7js/4SwAIkHg4CCRCuQ28w="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=fba6ed8"; + version = "0.0.0+rev=ff07a42"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "fba6ed8db3a009b9e7d656511931b181a3ee5b08"; - hash = "sha256-JWFEk1R19YIeDNm3LkBmdL+mmfhtBDhHfg6GESwruU0="; + rev = "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"; + hash = "sha256-9uRRlJWT0knZ3vvzGEq9CjyffQnYF53rnoBnsQ68zyE="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -1264,12 +1264,12 @@ }; inko = buildGrammar { language = "inko"; - version = "0.0.0+rev=234c87b"; + version = "0.0.0+rev=3a8887c"; src = fetchFromGitHub { owner = "inko-lang"; repo = "tree-sitter-inko"; - rev = "234c87be1dac20f766ddf6f486a7bde2a4bc5594"; - hash = "sha256-7BADt6NjH9chOzCDtJSLjBZaRqeLvOH006q0hI4pZaI="; + rev = "3a8887ca16dd8add3905216ce63796d4097c7a6f"; + hash = "sha256-kJ3xJGlLdvvcJIOoooOMf0BGpk88etQJhRS74enVmNQ="; }; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; }; @@ -1462,23 +1462,23 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=854a40e"; + version = "0.0.0+rev=194c255"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "854a40e99f7c70258e522bdb8ab584ede6196e2e"; - hash = "sha256-rVWmYF26DbPHoNRBv9FKEeacSbgw93PHy/wrQDGzlWk="; + rev = "194c25539f435de415ee0551a5f07058833da915"; + hash = "sha256-I2Kozd0N8R0CCOVl4xTAL4fhZ5BIzSzW+MRQOfZ3cMY="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=90fd989"; + version = "0.0.0+rev=1e4e303"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "90fd9894bebddce79f5b8041e7f82523364a619b"; - hash = "sha256-+wUGNYpw2udCrF4+qMD/4TAPkBCB7q/49Qx/k/FQa3U="; + rev = "1e4e30342b7a3b3a24886a632fbac53035d98871"; + hash = "sha256-A2uvHRoe9xtgsHSLYdZiztGLXdqXzsfw4BYeZ/Cmr4k="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1617,24 +1617,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=c25b635"; + version = "0.0.0+rev=d9287a6"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "c25b6354120182f1e0d5caa52f717b097a7e46a3"; - hash = "sha256-OdBFhflQbHlEcl6hKHnFiwNVf6DkSvJD7FbE6uiZB58="; + rev = "d9287a6f36347064e55c36858e9e522eb652c1ad"; + hash = "sha256-QFHPlvoJMTMepV1KxKXKjpiKMMmGzBO5mxxNcWKLO7s="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=c25b635"; + version = "0.0.0+rev=d9287a6"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "c25b6354120182f1e0d5caa52f717b097a7e46a3"; - hash = "sha256-OdBFhflQbHlEcl6hKHnFiwNVf6DkSvJD7FbE6uiZB58="; + rev = "d9287a6f36347064e55c36858e9e522eb652c1ad"; + hash = "sha256-QFHPlvoJMTMepV1KxKXKjpiKMMmGzBO5mxxNcWKLO7s="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1774,12 +1774,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=537095d"; + version = "0.0.0+rev=01bc5b1"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "537095ddc80cf610fa75a2a0149fe9799b011014"; - hash = "sha256-MMaeGnlNTKHjjzZd70OGCO0GOXhbjcL6bvRKpnLmDw0="; + rev = "01bc5b18693055aab7a863d7608f4b3f85843cf8"; + hash = "sha256-hzHCcKl3T+zEHhK5U4Ym+puvOjgr+etdDHNpuCbOSzU="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1829,24 +1829,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=14beb5e"; + version = "0.0.0+rev=45ddc92"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "14beb5ef0e7488bf1d93b8c67f69942324fee557"; - hash = "sha256-N8iqUa9CJ27wlUtfoMd9UO72q+kxTOGPVCblW07C0HU="; + rev = "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"; + hash = "sha256-xeUb/x1PennKS5N5TMPG0F+jLgAeY8DuIUkkbQ79QYQ="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=14beb5e"; + version = "0.0.0+rev=45ddc92"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "14beb5ef0e7488bf1d93b8c67f69942324fee557"; - hash = "sha256-N8iqUa9CJ27wlUtfoMd9UO72q+kxTOGPVCblW07C0HU="; + rev = "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"; + hash = "sha256-xeUb/x1PennKS5N5TMPG0F+jLgAeY8DuIUkkbQ79QYQ="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1920,12 +1920,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=70db420"; + version = "0.0.0+rev=81c57e2"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "70db420b20885ecd7268e5a710ebb3aeaef3a293"; - hash = "sha256-4iatIqb2IaZ6McbkBY6JQiD2IMm3PNLz7qve+2iOrU8="; + rev = "81c57e274c541c30d6c204c8dbceb90ec647ed8d"; + hash = "sha256-xtsLJx9tzj3KNhlCDuXnAGBz3EYnJ/J+EJ0UKHVN4g4="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; @@ -2233,12 +2233,12 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=c8b6e5f"; + version = "0.0.0+rev=2097fa5"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "c8b6e5f3f3c055cfc76471ebc912286e9e73d7d2"; - hash = "sha256-B+pDrkXIaWd16hN5FzunrdmO/hbqQdHI6pgGUdWZYEg="; + rev = "2097fa502efa21349d26af0ffee55d773015e481"; + hash = "sha256-a7vgmOY9K8w8vwMlOLBmUnXpWpVP+YlOilGODaI07y4="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -2442,12 +2442,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=b02af60"; + version = "0.0.0+rev=ec13dd6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "b02af60518ae1633d552ae2d0f25ca5e05f274f7"; - hash = "sha256-mfbYjU4Xs61oLqgABV1UXR/g4Qd7KRdlawX3/lAz2jc="; + rev = "ec13dd674bb8dd89213e0d6b1fe45efb68d5878f"; + hash = "sha256-ireSo04kG2RMlCZD1hf6BJcjT7eXjYdOqOsoMtQAwKQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2487,24 +2487,24 @@ }; sflog = buildGrammar { language = "sflog"; - version = "0.0.0+rev=602cc4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "602cc4b050ef1e14a69acc2ea094968bf928fa59"; - hash = "sha256-OEaeH+iVWOtDKVBAAbFPN96uyKlcuDHIObsk6SP78SY="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "sflog"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=4a3fabd"; + version = "0.0.0+rev=dd991eb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "4a3fabd26b09efd7431ea4899e5f2d81b568a4b9"; - hash = "sha256-SlLN4KkuSuywWtZlP8J0/bf4sFIres1er3HiK+gj4vA="; + rev = "dd991eb3b6957a33d9044e0f5914588f7f449a78"; + hash = "sha256-Kt396lw3O3X4I3sEadfhoRVi598UCknOmdCPIMpqgdA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2565,24 +2565,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=602cc4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "602cc4b050ef1e14a69acc2ea094968bf928fa59"; - hash = "sha256-OEaeH+iVWOtDKVBAAbFPN96uyKlcuDHIObsk6SP78SY="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=602cc4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "602cc4b050ef1e14a69acc2ea094968bf928fa59"; - hash = "sha256-OEaeH+iVWOtDKVBAAbFPN96uyKlcuDHIObsk6SP78SY="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2677,12 +2677,12 @@ }; supercollider = buildGrammar { language = "supercollider"; - version = "0.0.0+rev=affa438"; + version = "0.0.0+rev=1a8ee0d"; src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; - rev = "affa4389186b6939d89673e1e9d2b28364f5ca6f"; - hash = "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo="; + rev = "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"; + hash = "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ="; }; meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider"; }; @@ -2710,12 +2710,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=7d303df"; + version = "0.0.0+rev=032930d"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "7d303df70012edb7385a6a3b3938e0e7b89ecfbd"; - hash = "sha256-aTzbNyg248RG00qj7LiLDQAI63c7cXx++TGoANkyp2c="; + rev = "032930d6218d8ae23bde074cf29ce8d276b87533"; + hash = "sha256-VhQ+OwkqOVJH9/R2eDVkCJbmh50EmZjVGX8Pk4uMGBw="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2867,12 +2867,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=bba02e7"; + version = "0.0.0+rev=a9f9c13"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "bba02e79f85e335f310fc95e21c677e49f2c4439"; - hash = "sha256-FbOBkEtsFFD9jIWM2+fETstnvQyIj2DAF81v0dXjouo="; + rev = "a9f9c136baa9b73c63850be92301fb5f1fc9b2fd"; + hash = "sha256-BakN8qW6IyEK2GfSpPDogiJXTZXGjRiHN0LNyVH7Z2Q="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -3058,12 +3058,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=d63bc6c"; + version = "0.0.0+rev=4f93826"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "d63bc6c08a88715c89f4b1b06642e130dd899aba"; - hash = "sha256-RYYxkYGaWKFvkAgthchwxWqA3WYNzwd9dAJPv4um4jc="; + rev = "4f93826aeb31066eb241f4ccbca61f052239803f"; + hash = "sha256-Tl4q6QksNu7Pm0Pt8rJka6o55LNN2GN6zK732XmLXb8="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3280,12 +3280,12 @@ }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=21e2218"; + version = "0.0.0+rev=eb7d58c"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-zig"; - rev = "21e2218e0ec7f4e3c0640d16bf8c67e6f0a61e18"; - hash = "sha256-BJ7rexbUbi92FRg5rhXTUpips4T9YtkEA/hVtd1tBFY="; + rev = "eb7d58c2dc4fbeea4745019dee8df013034ae66b"; + hash = "sha256-iyb79SiMsV94RrWH/1Oi2aKBiX5io0Dp+zZf8qWZHwg="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-zig"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 2bfda55a47..bf8e1b8682 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -36,6 +36,7 @@ , languagetool , llvmPackages , meson +, neovim-unwrapped , nim1 , nodePackages , openscad @@ -129,10 +130,13 @@ , # hurl dependencies hurl , # must be lua51Packages - luaPackages -, luajitPackages + luajitPackages +, aider-chat , }: self: super: +let + luaPackages = neovim-unwrapped.lua.pkgs; +in { alpha-nvim = super.alpha-nvim.overrideAttrs { dependencies = [ @@ -378,12 +382,12 @@ codeium-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.8.80"; + codeiumVersion = "1.16.18"; codeiumHashes = { - x86_64-linux = "sha256-ULHO7NrbW0DDlOYiSHGXwJ+NOa68Ma+HMHgq2WyAKBA="; - aarch64-linux = "sha256-WVqPV/D9jPADkxt5XmydqXjSG8461URPsk1+W/kyZV0="; - x86_64-darwin = "sha256-0P/eYZp0Wieza0btOA+yxqKtoIYlUN6MhN0dI6R8GEg="; - aarch64-darwin = "sha256-2Cv22+Ii+otKLDQ404l9R/x42PkKTEzPB72/gc9wfig="; + x86_64-linux = "sha256-/m+t4abPgVWeGpfDkPm5DGCIXm1LoM5znHfES9lotAo="; + aarch64-linux = "sha256-0kR799yuxSFmyedJ14f5/EqOiFHs9cWjeJKvDIpIRl0="; + x86_64-darwin = "sha256-7Go5qZVAe2UHn547HZG4fmh84iF2r15+0IIlJK72Fqg="; + aarch64-darwin = "sha256-fe4GrgLRr66Qmme3p0X5BEwvKZhqG1aiE8xs5A1Dt6E="; }; codeium' = codeium.overrideAttrs rec { @@ -452,12 +456,12 @@ codesnap-nvim = let - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; rev = "refs/tags/v${version}"; - hash = "sha256-3z0poNmS6LOS7/qGTBhvz1Q9WpYC7Wu4rNvHsUXB5ZY="; + hash = "sha256-OmSgrTYDtNb2plMyzjVvxGrfXB/lGKDpUQhpRqKfAMA="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; @@ -465,7 +469,7 @@ sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-u0NvChN50LIxUhmsT4mvWs5xB/TwJkMabggFePA/b1E="; + cargoHash = "sha256-6n37n8oHIHrz3S1+40nuD0Ud3l0iNgXig1ZwrgsnYTI="; nativeBuildInputs = [ pkg-config @@ -474,7 +478,7 @@ buildInputs = [ libuv.dev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; }; @@ -488,7 +492,7 @@ # Note: the destination should be generator.so, even on darwin # https://github.com/mistricky/codesnap.nvim/blob/main/scripts/build_generator.sh postInstall = let - extension = if stdenv.isDarwin then "dylib" else "so"; + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; in '' rm -r $out/lua/*.so cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so @@ -593,7 +597,7 @@ rev = "cd97c25320fb0a672b11bcd95d8332bb3088ecce"; hash = "sha256-66NtKteM1mvHP5wAU4e9JbsF+bq91lmCDcTh/6RPhoo="; }; - extension = if stdenv.isDarwin then "dylib" else "so"; + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; rustPackage = rustPlatform.buildRustPackage { pname = "cord.nvim-rust"; inherit version src; @@ -915,7 +919,7 @@ dependencies = with self; [ nvim-treesitter ]; }; - haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.haskell-tools-nvim; }; hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' @@ -999,11 +1003,11 @@ src = LanguageClient-neovim-src; cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" ''; }; @@ -1058,7 +1062,7 @@ }; lsp-progress-nvim = neovimUtils.buildNeovimPlugin { - luaAttr = "lsp-progress-nvim"; + luaAttr = luaPackages.lsp-progress-nvim; nvimRequireCheck = "lsp-progress"; }; @@ -1066,11 +1070,11 @@ dependencies = with self; [ luaPackages.jsregexp ]; }; - lz-n = neovimUtils.buildNeovimPlugin { luaAttr = "lz-n"; }; + lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; }; - lze = neovimUtils.buildNeovimPlugin { luaAttr = "lze"; }; + lze = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lze; }; - lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = "lzn-auto-require"; }; + lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lzn-auto-require; }; magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; @@ -1146,7 +1150,7 @@ }; middleclass = neovimUtils.buildNeovimPlugin { - luaAttr = "middleclass"; + luaAttr = luaPackages.middleclass; nvimRequireCheck = "middleclass"; }; @@ -1235,9 +1239,7 @@ dependencies = with self; [ plenary-nvim ]; }; - neorg = super.neorg.overrideAttrs { - dependencies = with self; [ plenary-nvim ]; - }; + neorg = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.neorg; }; neotest = super.neotest.overrideAttrs { dependencies = with self; [ nvim-nio plenary-nvim ]; @@ -1494,6 +1496,15 @@ ''; }; + aider-nvim = super.aider-nvim.overrideAttrs { + patches = [ ./patches/aider.nvim/fix-paths.patch ]; + + postPatch = '' + substituteInPlace lua/aider.lua --replace '@aider@' ${aider-chat}/bin/aider + substituteInPlace lua/helpers.lua --replace '@aider@' ${aider-chat}/bin/aider + ''; + }; + refactoring-nvim = super.refactoring-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter plenary-nvim ]; }; @@ -1506,17 +1517,17 @@ ]; }; - rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-nvim"; }; + rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-nvim; }; - rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-config-nvim"; }; + rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-config-nvim; }; roslyn-nvim = super.roslyn-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig ]; }; - rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rtp-nvim"; }; + rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; }; - rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; }; + rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rustaceanvim; }; sg-nvim = super.sg-nvim.overrideAttrs (old: let @@ -1530,7 +1541,7 @@ buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -1582,7 +1593,7 @@ pname = "sniprun-bin"; inherit version src; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -1884,7 +1895,7 @@ }; vim-addon-manager = super.vim-addon-manager.overrideAttrs { - buildInputs = lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; }; vim-addon-mru = super.vim-addon-mru.overrideAttrs { @@ -1945,7 +1956,7 @@ src = old.src.overrideAttrs (srcOld: { postFetch = (srcOld.postFetch or "") - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' rm $out/colors/darkBlue.vim ''; }); diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch new file mode 100644 index 0000000000..63995f0636 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/lua/aider.lua b/lua/aider.lua +index 38db0d1..d1ad6d5 100644 +--- a/lua/aider.lua ++++ b/lua/aider.lua +@@ -26,7 +26,7 @@ function M.AiderOpen(args, window_type) + if M.aider_buf and vim.api.nvim_buf_is_valid(M.aider_buf) then + helpers.open_buffer_in_new_window(window_type, M.aider_buf) + else +- command = 'aider ' .. (args or '') ++ command = '@aider@ ' .. (args or '') + helpers.open_window(window_type) + command = helpers.add_buffers_to_command(command) + M.aider_job_id = vim.fn.termopen(command, {on_exit = OnExit}) +diff --git a/lua/helpers.lua b/lua/helpers.lua +index 152182b..aa21584 100644 +--- a/lua/helpers.lua ++++ b/lua/helpers.lua +@@ -63,7 +63,7 @@ end + + local function build_background_command(args, prompt) + prompt = prompt or "Complete as many todo items as you can and remove the comment for any item you complete." +- local command = 'aider --msg "' .. prompt .. '" ' .. (args or '') ++ local command = '@aider@ --msg "' .. prompt .. '" ' .. (args or '') + command = add_buffers_to_command(command) + return command + end diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix index 00fb8b8ded..1a62f13a04 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix @@ -33,12 +33,12 @@ buildPythonApplication { # wrap python scripts makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ - nix nix-prefetch-git neovim-unwrapped nurl ]}" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts}" ) + nix nix-prefetch-git neovim-unwrapped nurl ]}" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts/pluginupdate-py}" ) wrapPythonPrograms ''; shellHook = '' - export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts:$PYTHONPATH + export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts/pluginupdate-py:$PYTHONPATH ''; meta.mainProgram = "vim-plugins-updater"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 84a906b9e8..391370c54e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -49,7 +49,7 @@ let buildInputs = [ libgit2 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5d6e940391..b93ff96b98 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -49,6 +49,7 @@ https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, https://github.com/aduros/ai.vim/,HEAD, +https://github.com/joshuavial/aider.nvim/,HEAD, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, @@ -201,8 +202,8 @@ https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/lilydjwg/colorizer/,, https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, -https://github.com/numtostr/comment.nvim/,, https://github.com/LudoPinelli/comment-box.nvim/,HEAD, +https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, https://github.com/hrsh7th/compe-conjure/,, https://github.com/GoldsteinE/compe-latex-symbols/,, @@ -294,6 +295,7 @@ https://github.com/NTBBloodbath/doom-one.nvim/,, https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Bekaboo/dropbar.nvim/,HEAD, +https://github.com/earthly/earthly.vim/,HEAD, https://github.com/Shougo/echodoc.vim/,, https://github.com/sainnhe/edge/,, https://github.com/edgedb/edgedb-vim/,, @@ -622,7 +624,6 @@ https://github.com/neomake/neomake/,, https://github.com/Shougo/neomru.vim/,, https://github.com/rafamadriz/neon/,, https://github.com/ii14/neorepl.nvim/,HEAD, -https://github.com/nvim-neorg/neorg/,, https://github.com/nvim-neorg/neorg-telescope/,HEAD, https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, @@ -663,8 +664,8 @@ https://github.com/preservim/nerdcommenter/,, https://github.com/preservim/nerdtree/,, https://github.com/Xuyuanp/nerdtree-git-plugin/,, https://github.com/miversen33/netman.nvim/,HEAD, -https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/prichrd/netrw.nvim/,HEAD, +https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, https://github.com/chr4/nginx.vim/,, @@ -904,7 +905,7 @@ https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, -https://github.com/danielfalk/smart-open.nvim,0.2.x, +https://github.com/danielfalk/smart-open.nvim/,0.2.x, https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, @@ -994,6 +995,7 @@ https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, +https://github.com/joerdav/templ.vim/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/chomosuke/term-edit.nvim/,HEAD, @@ -1538,4 +1540,3 @@ https://github.com/ziglang/zig.vim/,, https://github.com/zk-org/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, -https://github.com/joerdav/templ.vim,HEAD, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/vimacs.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/vimacs.nix index e65439df52..e54ac39b2a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/vimacs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/vimacs.nix @@ -1,5 +1,5 @@ { lib, stdenv, config, vim-full, macvim, vimPlugins -, useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) +, useMacvim ? stdenv.hostPlatform.isDarwin && (config.vimacs.macvim or true) , vimacsExtraArgs ? "" }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index d0b27457b6..686ff8652a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -8,9 +8,9 @@ let version = "1.54.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "Unsupported system: ${stdenv.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 3d58a59a61..bcc6a21a40 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -313,8 +313,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "2.2.0"; - hash = "sha256-9CKm9SLotPlwkAELb7Us/blK959HVt6eXiDp0fgVLmA="; + version = "2.3.2"; + hash = "sha256-5PAmyy4RX2hLgviWxgnxGZjgeFWZaJKNiYGNdCTL0IE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -1069,7 +1069,7 @@ let version = "0.8.44"; } // sources.${stdenv.system}; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; @@ -1234,8 +1234,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.55.0"; - hash = "sha256-slfHfRPcuRu+649n6kAr2bv9H6J+DvYVN/ysq1QpPQM="; + version = "0.56.0"; + hash = "sha256-ITSpPe032XcGIlfRQtJSR0iNTizs85qwfRaTtKwNn50="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1816,8 +1816,8 @@ let mktplcRef = { name = "dependi"; publisher = "fill-labs"; - version = "0.7.9"; - hash = "sha256-VsjISVDZGGh6/pf3Fd5g8pYDvWXA1+0oZKlQEGLBp4M="; + version = "0.7.10"; + hash = "sha256-m8W21ztTmEOjDI1KCymeBgQzg9jdgKG9dCFp+U1D818="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; @@ -3223,7 +3223,7 @@ let version = "2.1.11"; } // sources.${stdenv.system}; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib zlib @@ -3782,8 +3782,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.12.2"; - hash = "sha256-dj8UFbYgAl6dt/1MuIBawTVUbBDTTedZEcHtKZjEcew="; + version = "1.20.0"; + hash = "sha256-lHTnyObWWhMIXipqdII9GYLGQDFPMFP5y/L/ai9325o="; }; }; @@ -4073,8 +4073,8 @@ let mktplcRef = { name = "wikitext"; publisher = "RoweWilsonFrederiskHolme"; - version = "3.8.1"; - hash = "sha256-piwS3SPjx10nsjN5axC+EN0MEDf0r2lVFllqQzciOfc="; + version = "3.8.2"; + hash = "sha256-rWifSoJSN37xPIaCQgPyXRz9tCX2Akahl/3CuqzXq94="; }; meta = { description = "Extension that helps users view and write MediaWiki's Wikitext files"; @@ -4867,8 +4867,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.53"; - hash = "sha256-5CHAX1jGyJ2VVEBTh5G1JM8+L9paryBa2zJoTkZ+G7Q="; + version = "0.0.54"; + hash = "sha256-oY8z3q4LOLhiTttm9Rtcy/CnhaSHkjyCBjwqYnuNBQA="; }; meta = { description = "VSCode language extension for Uiua"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index 8d665025bb..68a3673134 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -106,7 +106,7 @@ buildVscodeMarketplaceExtension { chmod +x "${bin}" '') extInfo.binaries )) - + lib.optionalString stdenv.isLinux ( + + lib.optionalString stdenv.hostPlatform.isLinux ( lib.concatStringsSep "\n" ( map (bin: '' patchelf_common "${bin}" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 9c26f92ca9..3e988c6272 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -99,7 +99,7 @@ buildVscodeMarketplaceExtension { chmod +x "${bin}" '') extInfo.binaries )) - + lib.optionalString stdenv.isLinux ( + + lib.optionalString stdenv.hostPlatform.isLinux ( lib.concatStringsSep "\n" ( map (bin: '' patchelf_common "${bin}" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index 1fab7198ce..dce1d75615 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2024.8.0"; - hash = "sha256-aEDgIDlQfQNcyrgm7MjJjCc6aKWfBNwfKu/t43+VQZk="; + version = "2024.8.1"; + hash = "sha256-eFInKB1xwVVJFIsXHxsuRJeLKTe3Cb8svquHJOW0P+I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index a53fc7b8ca..e937da9c44 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -52,7 +52,7 @@ let pkg-config libsecret ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index d9c3ee2358..0e61678a8f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -16,11 +16,11 @@ vscode-utils.buildVscodeMarketplaceExtension { postPatch = '' pushd sourcery_binaries/install - rm -r win ${if stdenv.isLinux then "mac" else "linux"} + rm -r win ${if stdenv.hostPlatform.isLinux then "mac" else "linux"} popd ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index f56f477c85..8f3ba7cfad 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -13,19 +13,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-fvDzsFOG1pdmpC3RDY8zGP0yL/TzX6i00LnIX+yceVU="; + hash = "sha256-NdVSQQ5OeBPGSLbynUArNbfm+a2HCc/gwJMKfEDgzDM="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-3yRZzOTuiTbkUUz1D3mZo7G5vayM6W9YBbJxTiVou9g="; + hash = "sha256-4FjA3mUz+DVBiMUJAlGkUbpDtZuDYuUHPWA4QUiqd5w="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-fKvR2bea4UxvnZ+LlWR/ahpKe8mk5f4mZrjqTFpsC5A="; + hash = "sha256-aexe9hrUxb3ZnrgJrvEXu2PZPmxOGdkk9exrfDaXA7s="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-nkK3BH+MRi6KdThq4kYR9ZAfnuSkC2r/lKWpEtmD7Ak="; + hash = "sha256-ijmKU+eU3R3mxeFxFr5AtVwGYVBuYWecD8W+0gHzP5w="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.19"; + version = "0.1.26"; inherit (extInfo) hash arch; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 0d55381e65..20b81c3c70 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -41,11 +41,11 @@ let cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo="; - buildInputs = lib.optionals stdenv.isDarwin [ lldb ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ]; nativeBuildInputs = [ makeWrapper ]; - env = lib.optionalAttrs stdenv.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; buildAndTestSubdir = "adapter"; @@ -90,7 +90,7 @@ let buildInputs = [ libsecret ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security @@ -114,7 +114,7 @@ let # entitlement which nixpkgs' lldb-server does not yet provide; see # for details lldbServer = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else "${lldb.out}/bin/lldb-server"; @@ -150,7 +150,7 @@ stdenv.mkDerivation { '' cp -r ${nodeDeps}/lib/node_modules . '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME="$TMPDIR/home" mkdir $HOME ''; @@ -161,7 +161,7 @@ stdenv.mkDerivation { ]; makeFlags = [ "vsix_bootstrap" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$TMPDIR ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index f2807a1b59..defae3cf96 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -157,12 +157,12 @@ in ]; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; nativeBuildInputs = [ unzip ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook asar copyDesktopItems @@ -176,7 +176,7 @@ in installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out/Applications/${longName}.app" "$out/bin" cp -r ./* "$out/Applications/${longName}.app" ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}" @@ -205,7 +205,7 @@ in preFixup = '' gappsWrapperArgs+=( ${ # we cannot use runtimeDependencies otherwise libdbusmenu do not work on kde - lib.optionalString stdenv.isLinux + lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdbusmenu ]}"} # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin @@ -216,7 +216,7 @@ in # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' # this is a fix for "save as root" functionality packed="resources/app/node_modules.asar" unpacked="resources/app/node_modules" @@ -234,7 +234,7 @@ in '' + ( let vscodeRipgrep = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" else "resources/app/node_modules/@vscode/ripgrep/bin/rg"; @@ -247,7 +247,7 @@ in '' ); - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --add-needed ${libglvnd}/lib/libGLESv2.so.2 \ --add-needed ${libglvnd}/lib/libGL.so.1 \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index eb87099577..35f6601d60 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -10,9 +10,9 @@ # documented in https://wiki.nixos.org/wiki/Visual_Studio_Code#Insiders_Build # On MacOS the insider binary is still called code instead of code-insiders as # of 2023-08-06. -, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.isLinux) "-insiders" +, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.hostPlatform.isLinux) "-insiders" , commandLineArgs ? "" -, useVSCodeRipgrep ? stdenv.isDarwin +, useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin }: let @@ -27,24 +27,24 @@ let armv7l-linux = "linux-armhf"; }.${system} or throwSystem; - archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; + archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0glnqj8kr7m6dq5nbygjwlgim8cngrh3idc10zp05rg0n364906v"; - x86_64-darwin = "18xy36jha1ixd8lb0dg045ld9qivyjlds90i2k6rh974mx8jl7rj"; - aarch64-linux = "1hdjmfjpdycsj78dfsjyidpg8mx7s66b4sb7xih87vfqvzhfmyw2"; - aarch64-darwin = "1xjqq5fz8blprxjnck8zbn933y7kgx1hnq3nc887kp7q0879p9kr"; - armv7l-linux = "07rnkswy2lv8wad0iiaknrd329bj1hdadzcklgd34dmqpgr28lij"; + x86_64-linux = "0475kwa3ym14l9ggaf2hg4lcrc0lpi9vchzj4sgj4c3606l9i1aa"; + x86_64-darwin = "15sz42p7khzxpxii4zx14770kzyk4a3g1kwxjwvd46nxqjqciys4"; + aarch64-linux = "14d5p764vx1ppi5f6b6v0wrn1wr3qqyfr6mpncjhnzr2pdss9fz0"; + aarch64-darwin = "0kdh7a0nfpadhyn6cj89vw76hhbab4fg5wifbzdrjikwfg8jbd4b"; + armv7l-linux = "1aqlpxyzjrf6qm0znyqbl7srn251f7ra5lj594b7906lxhirin3c"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.93.0"; + version = "1.93.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "4849ca9bdf9666755eb463db297b69e5385090e3"; + rev = "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "00yjdgb48mclaamv8c9rz5d6p9pbqrik3y1pj60qqpqf29cj5p9s"; + sha256 = "0cxpv9q681nk7gjcs1msn2rnj8i86hlrkb0x4ja1id42aj4xwrqy"; }; }; @@ -79,7 +79,7 @@ in # Editing the `code` binary within the app bundle causes the bundle's signature # to be invalidated, which prevents launching starting with macOS Ventura, because VS Code is notarized. # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. - dontFixup = stdenv.isDarwin; + dontFixup = stdenv.hostPlatform.isDarwin; meta = with lib; { description = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 312e49e8d0..54a1a98ad7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? stdenv.isDarwin }: +{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin }: let inherit (stdenv.hostPlatform) system; @@ -12,7 +12,7 @@ let armv7l-linux = "linux-armhf"; }.${system} or throwSystem; - archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; + archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { x86_64-linux = "14pqi5l7zbkhpsl8hd7mqss4xkqnxf0f0h5bs710iadpcscgpndf"; @@ -22,7 +22,7 @@ let armv7l-linux = "1rjv5c85ffy5szxhf71kjmvxiahyyvx2dl6183v5q7apv9pa64hj"; }.${system} or throwSystem; - sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; + sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) "."; in callPackage ./generic.nix rec { inherit sourceRoot commandLineArgs useVSCodeRipgrep; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix index bbe5fec19d..25c97f52d7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix @@ -68,7 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { dontPatchELF = true; dontStrip = true; meta = vscode.meta; -} (if stdenv.isDarwin then '' +} (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/bin/ mkdir -p "$out/Applications/${longName}.app/Contents/MacOS" diff --git a/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix index 23ef7a0ef5..eee370d174 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.cc.isClang [ openmp - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/xedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/xedit/default.nix index 6fa4a67dfd..eb8f2ee925 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/xedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/xedit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; # ./lisp/mathimp.c:493:10: error: implicitly declaring library function 'finite' with type 'int (double)' - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' for i in $(find . -type f -name "*.c"); do substituteInPlace $i --replace "finite" "isfinite" done @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "xedit"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix index fe3a12a37c..0c58d35042 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pcre2 wxGTK32 xercesc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix index 80f8374c37..7ca6cd4b4f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1600"; + version = "1601"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-bSW0ZAPIBDh3+VhAJlp16W1z4fEIPUkI73grJE/KUx4="; + sha256 = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/zee/default.nix b/third_party/nixpkgs/pkgs/applications/editors/zee/default.nix index 38ca48ee40..cea9768607 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/zee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/zee/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # disable downloading and building the tree-sitter grammars at build time # grammars can be configured in a config file and installed with `zee --build` diff --git a/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix index f4e1827c8e..ac306cf5cd 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix @@ -33,7 +33,7 @@ enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch, enableVncRenderer ? false, - enableWayland ? stdenv.isLinux, + enableWayland ? stdenv.hostPlatform.isLinux, unfreeEnableDiscord ? false, unfreeEnableRoms ? false, }: @@ -88,20 +88,20 @@ stdenv.mkDerivation (finalAttrs: { libopus.dev libmpg123.dev ] - ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional enableWayland wayland ++ lib.optional enableVncRenderer libvncserver - ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.libs.xpc; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.libs.xpc; cmakeFlags = - lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" + lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" ++ lib.optional enableNewDynarec "-DNEW_DYNAREC=ON" ++ lib.optional enableVncRenderer "-DVNC=ON" ++ lib.optional (!enableDynarec) "-DDYNAREC=OFF" ++ lib.optional (!unfreeEnableDiscord) "-DDISCORD=OFF"; postInstall = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 -t $out/share/applications $src/src/unix/assets/net.86box.86Box.desktop for size in 48 64 72 96 128 192 256 512; do @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let libPath = lib.makeLibraryPath ([ libpcap ] ++ lib.optional unfreeEnableDiscord discord-gamesdk); - libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' makeWrapperArgs+=(--prefix ${libPathVar} : "${libPath}") diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix index f7fd332c7a..df08235529 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix @@ -44,14 +44,14 @@ stdenv.mkDerivation (finalAttrs: { pkg-config which wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ SDL2 libao - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio openal udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.OpenAL ]; @@ -71,9 +71,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = lib.optionals stdenv.isLinux [ + makeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" "lto=false" "vulkan=false" @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { "prefix=$(out)" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.14"; meta = { homepage = "https://ares-emu.net"; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.isc; maintainers = with lib.maintainers; [ Madouura AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: select between Qt and GTK3 diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 354437e7c7..046192df92 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -47,26 +47,26 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isLinux [ wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns makeWrapper ]; buildInputs = [ SDL2 libao ] - ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenAL ]; enableParallelBuilding = true; makeFlags = [ "-C" "bsnes" "prefix=$(out)" ] - ++ lib.optionals stdenv.isLinux [ "hiro=gtk3" ] - ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin makeWrapper $out/{Applications/bsnes.app/Contents/MacOS,bin}/bsnes ''; # https://github.com/bsnes-emu/bsnes/issues/107 - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=( --prefix GDK_BACKEND : x11 ) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/default.nix index 17700859ca..3eb9a9a310 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ SDL2 libao - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { openal udev ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa OpenAL @@ -72,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = let platform = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin + else if stdenv.hostPlatform.isDarwin then "macos" - else if stdenv.isBSD + else if stdenv.hostPlatform.isBSD then "bsd" - else if stdenv.isWindows + else if stdenv.hostPlatform.isWindows then "windows" else throw "Unknown platform for higan: ${stdenv.hostPlatform.system}"; in '' @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir ${placeholder "out"} mv higan/out/higan.app ${placeholder "out"}/ mv icarus/out/icarus.app ${placeholder "out"}/ @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { # we create a first-run script to populate # $HOME with all the stuff needed at runtime let - dest = if stdenv.isDarwin + dest = if stdenv.hostPlatform.isDarwin then "\\$HOME/Library/Application Support/higan" else "\\$HOME/higan"; in '' @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: select between Qt and GTK3 diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index 123ca313ec..91ad4b876e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config wrapQtAppsHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild # for plutil ]; @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { xz # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838 #zlib-ng - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib bluez libevdev @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { #mgba # Derivation doesn't support Darwin udev vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreBluetooth ForceFeedback IOBluetooth @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" "-DUSE_BUNDLED_MOLTENVK=OFF" "-DMACOS_CODE_SIGNING=OFF" @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_AUTOUPDATE=OFF" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix index 6a27274783..c35700856b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; + ] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook; buildInputs = [ curl @@ -93,13 +93,13 @@ stdenv.mkDerivation rec { fmt xz qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez udev libevdev alsa-lib vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreBluetooth OpenGL ForceFeedback @@ -109,11 +109,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SHARED_ENET=ON" "-DENABLE_LTO=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { # - Allow Dolphin to use nix-provided libraries instead of building them postPatch = '' substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)' substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' ''; @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Madouura ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix index 2a1171ccf3..50805ae20d 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; desktopItems = [ (makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix index 8b1e92b596..e165a36b31 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator"; changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases"; description = "Program that emulates steam online features"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix index fae7a0d3fc..25018c56aa 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix @@ -90,8 +90,8 @@ stdenv.mkDerivation rec { sqlite qtbase ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] - ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; nativeBuildInputs = [ copyDesktopItems @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 gpl2Plus ]; maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "mame"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index 532109eefa..18c510b846 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -267,7 +267,7 @@ in let # linux = bsd # https://github.com/DerKoun/bsnes-hd/blob/f0b6cf34e9780d53516977ed2de64137a8bcc3c5/bsnes/GNUmakefile#L37 - platform = if stdenv.isDarwin then "macos" else "linux"; + platform = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; in [ "-C" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix index 83cb0b2bbc..b23a5e3c9b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix @@ -2,9 +2,9 @@ , stdenv , nixosTests , enableNvidiaCgToolkit ? false -, withGamemode ? stdenv.isLinux -, withVulkan ? stdenv.isLinux -, withWayland ? stdenv.isLinux +, withGamemode ? stdenv.hostPlatform.isLinux +, withVulkan ? stdenv.hostPlatform.isLinux +, withWayland ? stdenv.hostPlatform.isLinux , alsa-lib , dbus , fetchFromGitHub @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ lib.optional withVulkan vulkan-loader ++ lib.optional withWayland wayland ++ - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib dbus libX11 @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { "--disable-update_assets" "--disable-update_core_info" ] ++ - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--enable-dbus" "--enable-egl" "--enable-kms" @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { # https://docs.libretro.com/development/retroarch/compilation/osx/ # and # https://github.com/libretro/RetroArch/blob/71eb74d256cb4dc5b8b43991aec74980547c5069/.gitlab-ci.yml#L330 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix index 92b7aca0a1..312c25a020 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r Ripes.app $out/Applications/ makeBinaryWrapper $out/Applications/Ripes.app/Contents/MacOS/Ripes $out/bin/Ripes - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -D Ripes $out/bin/Ripes '' + '' cp -r ${src}/appdir/usr/share $out/share diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix index 481b5ec866..55b2ce67fc 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ jre_minimal ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib gsettings-desktop-schemas makeWrapper @@ -46,10 +46,10 @@ rustPlatform.buildRustPackage { python3 wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib cairo gtk3 @@ -64,11 +64,11 @@ rustPlatform.buildRustPackage { vulkan-loader udev ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; dontWrapGApps = true; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/ruffle_desktop \ --add-needed libxkbcommon-x11.so \ --add-needed libwayland-client.so \ @@ -80,7 +80,7 @@ rustPlatform.buildRustPackage { # This name is too generic mv $out/bin/exporter $out/bin/ruffle_exporter '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' vulkanWrapperArgs+=( --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix index 04e5452bf7..82cd8e9a25 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libpng SDL2 SDL2_image - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix index 67a2d62f75..b1916a8686 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.10"; + version = "2.1.11"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "sha256-ca+BKedHuOwHOCXgjLkkpR6Pd+59X2R66dbPWEg2O5A="; + sha256 = "sha256-OtJ632H449kPRY1i4Ydlcc1tgG00Mv622KrCyJ80OF4="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix index dccf67a7a9..cff069a2e7 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix @@ -23,7 +23,7 @@ let }; } ./setup-hook-darwin.sh; - darwinFrameworks = lib.optionals stdenv.isDarwin ( + darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin ( toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: lib.optionalAttrs (buildScript != null) { builder = buildScript; } -// lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.hostPlatform.isDarwin { postBuild = '' # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and @@ -68,12 +68,12 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } pkg-config ] ++ lib.optionals supportFlags.mingwSupport (mingwGccs - ++ lib.optional stdenv.isDarwin setupHookDarwin); + ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin); buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: [ pkgs.freetype pkgs.perl pkgs.libunwind ] - ++ lib.optional stdenv.isLinux pkgs.libcap - ++ lib.optional stdenv.isDarwin pkgs.libinotify-kqueue + ++ lib.optional stdenv.hostPlatform.isLinux pkgs.libcap + ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus @@ -92,7 +92,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev - ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) + ++ lib.optional vulkanSupport (if stdenv.hostPlatform.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional usbSupport pkgs.libusb1 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; @@ -100,8 +100,8 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] - ++ lib.optionals stdenv.isDarwin darwinFrameworks + ++ lib.optionals (openglSupport && !stdenv.hostPlatform.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks ++ lib.optionals (x11Support) (with pkgs.xorg; [ libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm ]) @@ -115,7 +115,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals ((stdenv.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; + ++ lib.optionals ((stdenv.hostPlatform.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix index 2c73ab48ad..8c8ebdea58 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix @@ -35,7 +35,7 @@ vulkanSupport ? false, sdlSupport ? false, usbSupport ? false, - mingwSupport ? stdenv.isDarwin, + mingwSupport ? stdenv.hostPlatform.isDarwin, waylandSupport ? false, x11Support ? false, embedInstallers ? false, # The Mono and Gecko MSI installers diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index e41e8a61a1..cf517bfc0f 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.17"; + version = "9.18"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-Ptt+tvMbtcP3N43VYj2p2V99TW18g3iv2JyOOjCqCAw="; + hash = "sha256-ZSb1IRwIVFO8tkKUbrLOjR1CqKSmgWi/Kg1z8yYS3Rw="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ez7P9R5Q7t+FpaU5bVer4n2bt+evgXLJb83gP+zxIAw="; + hash = "sha256-m3tuwb6OFcgZ/NATixIH1j3YgrzsREJNpnVbevN/9FY="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix index 4a9bfb6c32..634964fb75 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; (wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: { - buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs; + buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.hostPlatform.isLinux "util-linux") self.buildInputs; nativeBuildInputs = [ autoconf hexdump perl python3 gitMinimal ] ++ self.nativeBuildInputs; prePatch = self.prePatch or "" + '' diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix index 5e6c09b89c..9bbe32fd29 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { # Force the use of the pure-go implementation of the os/user library. # Relevant issue: https://github.com/gokcehan/lf/issues/191 - tags = lib.optionals (!stdenv.isDarwin) [ "osusergo" ]; + tags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "osusergo" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix index fdc60a3093..1644da02ed 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { slang zip ] ++ lib.optionals x11Support [ libX11 ] - ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm ''; - postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) '' + postFixup = lib.optionalString ((!stdenv.hostPlatform.isDarwin) && x11Support) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/projectable/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/projectable/default.nix index 207ea0d0ba..b296e6a7ff 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/projectable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/projectable/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix index 3cc04e3744..092d1cb431 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ] - ++ (if stdenv.isDarwin then [ + ++ (if stdenv.hostPlatform.isDarwin then [ Accelerate CoreGraphics CoreVideo diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix index 2e02c1d2da..68bbcb46b5 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -5,7 +5,7 @@ , makeWrapper , wrapGAppsHook3 -, withOpenGL ? !stdenv.isDarwin +, withOpenGL ? !stdenv.hostPlatform.isDarwin , bison , blas @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { zlib zstd ] ++ lib.optionals withOpenGL [ libGLU ] - ++ lib.optionals stdenv.isDarwin [ libiconv ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; strictDeps = true; @@ -117,14 +117,14 @@ stdenv.mkDerivation (finalAttrs: { "--without-odbc" ] ++ lib.optionals (! withOpenGL) [ "--without-opengl" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--without-cairo" "--without-freetype" "--without-x" ]; # Otherwise a very confusing "Can't load GDAL library" error - makeFlags = lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "GDAL_DYNAMIC="; /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ diff --git a/third_party/nixpkgs/pkgs/applications/gis/spatialite-gui/default.nix b/third_party/nixpkgs/pkgs/applications/gis/spatialite-gui/default.nix index b33818e354..a8bdedabaa 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/spatialite-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/spatialite-gui/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { wxGTK xz zstd - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ]; enableParallelBuilding = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' rm -fr $out/share ''; diff --git a/third_party/nixpkgs/pkgs/applications/gis/udig/default.nix b/third_party/nixpkgs/pkgs/applications/gis/udig/default.nix index 264445336c..04740f55b0 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/udig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/udig/default.nix @@ -63,6 +63,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix b/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix index df2343d881..199595a658 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix index dac185e3d3..e0834055e7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional openexrSupport openexr ++ lib.optional librsvgSupport librsvg ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index cd998be701..27abada541 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { pango ] ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix index d39961da90..b55e6a8a5b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix @@ -28,7 +28,7 @@ in sed -i "s,python3,${python3.executable}," CMakeLists.txt ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 $src/deploy/icon.svg $out/share/icons/hicolor/scalable/apps/antimony.svg install -Dm644 ${./mimetype.xml} $out/share/mime/packages/antimony.xml ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix index 8b391f104d..8f6d27b176 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix index 30cf116fed..82bba3c3fc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { imagemagick libpng pstoedit - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix index 111e37711e..b1493b94ce 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { freetype fontconfig libjpeg libpng libtiff libwebp zlib - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preBuild = '' cd build diff --git a/third_party/nixpkgs/pkgs/applications/graphics/c3d/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/c3d/default.nix index cce0158023..dac235b999 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/c3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/c3d/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl3; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix index d8e8693166..f25259e5eb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK32 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/curv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/curv/default.nix index 7113437245..f1f66784aa 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/curv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/curv/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { xorg.libXi xorg.libXinerama xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ilmbase llvmPackages.openmp ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/curv3d/curv"; license = licenses.asl20; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ pbsds ]; mainProgram = "curv"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix index 534d1f5884..9977224dd7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { lib.optionals withDocs [ libxslt ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration-gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix index 3678b9760c..99af85a12b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { qtbase xorg.libXt libtiff - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL; preConfigure = '' NOCONFIGURE=1 ./autogen.sh @@ -49,10 +49,10 @@ mkDerivation rec { "--with-x" "--with-tiff" "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI - ] ++ lib.optional stdenv.isDarwin "--enable-mac"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-mac"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 47ee1ebd43..d6b6bb8e9e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { makeWrapper nodejs yarn - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoSignDarwinBinariesHook ]; @@ -62,15 +62,15 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp -R ${electron.dist}/Electron.app Electron.app chmod -R u+w Electron.app export CSC_IDENTITY_AUTO_DISCOVERY=false sed -i "/afterSign/d" electron-builder-linux-mac.json '' + '' yarn --offline run electron-builder --dir \ - ${lib.optionalString stdenv.isDarwin "--config electron-builder-linux-mac.json"} \ - -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json"} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} runHook postBuild @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv dist/mac*/draw.io.app $out/Applications # Symlinking `draw.io` doesn't work; seems to look for files in the wrong place. makeWrapper $out/Applications/draw.io.app/Contents/MacOS/draw.io $out/bin/drawio - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/lib/drawio" cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index 3bdb37900d..ad76e0e92b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -107,7 +107,7 @@ in mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; } // lib.optionalAttrs buildServer { mainProgram = "drawpile-srv"; } // lib.optionalAttrs buildClient { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix index 2b249d7e29..c0f9046fa9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita libxml2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ]); diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix index a57a33e11b..0db2a75721 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix @@ -30,7 +30,7 @@ let libXrandr libXxf86vm libxcb - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = rpathLibs ++ lib.optionals stdenv.isDarwin [ + buildInputs = rpathLibs ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { OpenGL ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix index ca93a5f579..939232197e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ expat fontconfig freetype @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix index fb39723984..9c5c7e81c3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # Undefined symbols for architecture x86_64: # "_bundle_path", referenced from: App::SetupPaths() in src_app.cpp.o - broken = stdenv.isDarwin || + broken = stdenv.hostPlatform.isDarwin || # https://github.com/bcampbell/evilpixie/issues/28 - stdenv.isAarch64; + stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix index 5daaf0e10e..3ce4095162 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix @@ -15,7 +15,7 @@ , opencascade-occt , assimp , fontconfig -, withManual ? !stdenv.isDarwin +, withManual ? !stdenv.hostPlatform.isDarwin , withPythonBinding ? false }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { opencascade-occt assimp fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ] ++ lib.optionals withPythonBinding [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 56f4936cef..e7d144579a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ lib.optional stdenv.isDarwin "verscmp=0" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "verscmp=0" ++ lib.optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix index c3d1f5eb65..f902776fb5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 3c44ae0bdd..2d07fbb863 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "geeqie"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - hash = "sha256-MVBKaiKcKknU0rChUYJ+N4oX4tVm145s+NqGQuDHY2g="; + hash = "sha256-k2FXj2ZKZzB5XpCcWzEv7Q1ozATfU3221XKcOFdWOGU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix index 8faf717a14..5270b70848 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation (finalAttrs: { makeWrapper gtk-doc libxslt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -135,11 +135,11 @@ in stdenv.mkDerivation (finalAttrs: { glib-networking libmypaint mypaint-brushes1 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa gtk-mac-integration-gtk2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libgudev ] ++ lib.optionals withPython [ python @@ -168,7 +168,7 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = true; env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DGDK_OSX_BIG_SUR=16"; # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index 667a1d5057..f5c9266b57 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -155,7 +155,7 @@ in }; }; - farbfeld = pluginDerivation rec { + farbfeld = pluginDerivation { pname = "farbfeld"; version = "unstable-2019-08-12"; @@ -309,7 +309,7 @@ in variant = "gimp"; }; - gimplensfun = pluginDerivation rec { + gimplensfun = pluginDerivation { version = "unstable-2018-10-21"; pname = "gimplensfun"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnome-obfuscate/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gnome-obfuscate/default.nix index 6d0a8a8436..db173f58b5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9lrxK2psdIPGsOC6p8T+3AGPrX6PjrK9mFirdJqBSMM="; }; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. # The vendored gettext does not build with clang 16. GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 gdk-pixbuf libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 60d5e22a4c..d4def73be8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -83,44 +83,10 @@ python3Packages.buildPythonPackage rec { ]; nativeCheckInputs = with python3Packages; [ - nose mock httmock ]; - # most tests are failing, presumably because we are not using test.py - checkPhase = '' - runHook preCheck - - nosetests $src/hydrus/test \ - -e TestClientAPI \ - -e TestClientConstants \ - -e TestClientDaemons \ - -e TestClientData \ - -e TestClientDB \ - -e TestClientDBDuplicates \ - -e TestClientDBTags \ - -e TestClientImageHandling \ - -e TestClientImportOptions \ - -e TestClientListBoxes \ - -e TestClientMigration \ - -e TestClientNetworking \ - -e TestClientTags \ - -e TestClientThreading \ - -e TestDialogs \ - -e TestFunctions \ - -e TestHydrusNetwork \ - -e TestHydrusNATPunch \ - -e TestHydrusSerialisable \ - -e TestHydrusServer \ - -e TestHydrusSessions \ - -e TestServer \ - -e TestClientMetadataMigration \ - -e TestClientFileStorage \ - - runHook postCheck - ''; - outputs = [ "out" "doc" ]; installPhase = '' @@ -140,6 +106,7 @@ python3Packages.buildPythonPackage rec { mkdir -p $out/bin install -m0755 hydrus_server.py $out/bin/hydrus-server install -m0755 hydrus_client.py $out/bin/hydrus-client + install -m0755 hydrus_test.py $out/bin/hydrus-test # desktop item mkdir -p "$out/share/icons/hicolor/scalable/apps" @@ -154,6 +121,16 @@ python3Packages.buildPythonPackage rec { runHook postInstall ''; + checkPhase = '' + runHook preCheck + + export QT_QPA_PLATFORM=offscreen + export HOME=$(mktemp -d) + $out/bin/hydrus-test + + runHook postCheck + ''; + dontWrapQtApps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix index 8b2347f438..2b2c3e1982 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8="; }; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. # The vendored gettext does not build with clang 16. GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gtk4 gtksourceview5 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix index 2398a61f21..37fed43765 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib ]; dontWrapGApps = true; - desktopItems = lib.optionals stdenv.isLinux [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "ImageJ"; desktopName = "ImageJ"; @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${jre}/bin/java $out/bin/imagej \ ''${gappsWrapperArgs[@]} \ --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix index 9c60f309e1..178bdfcae3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -32,7 +32,7 @@ let # default value of withWindowSystem withWindowSystem' = if withWindowSystem != null then withWindowSystem - else if stdenv.isLinux then "all" + else if stdenv.hostPlatform.isLinux then "all" else "x11"; windowSystems = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 81cd91ebb6..62f485ff91 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { ] ++ (with perlPackages; [ perl XMLParser - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -168,15 +168,15 @@ stdenv.mkDerivation rec { python3Env zlib libepoxy - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gspell - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cairo gtk-mac-integration ]; # Make sure PyXML modules can be found at run-time. - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/inkscape/*.dylib; do ln -s $f $out/lib/$(basename $f) done diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix index 4d60cde30c..f98549cb14 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix @@ -13,17 +13,16 @@ , ninja , wrapGAppsHook3 , testers -, komorebi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "komorebi"; version = "2.2.1"; src = fetchFromGitHub { owner = "Komorebi-Fork"; repo = "komorebi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk="; }; @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { clutter-gst ]; - passthru.tests.version = testers.testVersion { package = komorebi; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Beautiful and customizable wallpaper manager for Linux"; @@ -53,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kranzes ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lorien/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lorien/default.nix index 8105e3682b..1f86c6dd2e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lorien/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lorien/default.nix @@ -27,8 +27,8 @@ let preset = - if stdenv.isLinux then "Linux/X11" - else if stdenv.isDarwin then "Mac OSX" + if stdenv.hostPlatform.isLinux then "Linux/X11" + else if stdenv.hostPlatform.isDarwin then "Mac OSX" else throw "unsupported platform"; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix index 8d965fe7b1..e8ae4e7f25 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional stdenv.isLinux pkg-config; + ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ libX11 libXrandr ]) + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; buildNoDefaultFeatures = !withSki; buildFeatures = lib.optional withSixel "sixel"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix index c6f2b18877..f2c7aa843d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl fontconfig - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXcursor @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Minimalistic crossplatform image viewer written in Rust"; homepage = "https://github.com/woelper/oculante"; changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix index 9b29f6ddc9..26e19eec33 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -26,7 +26,7 @@ , mkDerivation , qtmacextras , qmake -, spacenavSupport ? stdenv.isLinux, libspnav +, spacenavSupport ? stdenv.hostPlatform.isLinux, libspnav , wayland , wayland-protocols , wrapGAppsHook3 @@ -66,8 +66,8 @@ mkDerivation rec { eigen boost glew opencsg cgal_4 mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig qtbase qtmultimedia qscintilla cairo - ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] - ++ lib.optional stdenv.isDarwin qtmacextras + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] + ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras ++ lib.optional spacenavSupport libspnav ; @@ -88,7 +88,7 @@ mkDerivation rec { make objects/parser.cxx ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix index 3af9566c37..7104600545 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix @@ -48,7 +48,7 @@ mkDerivation rec { qtbase qtsvg qttools - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoDecodeAcceleration ]; @@ -58,6 +58,6 @@ mkDerivation rec { homepage = "https://ovito.org"; license = with licenses; [ gpl3Only mit ]; maintainers = with maintainers; [ twhitehead ]; - broken = stdenv.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... + broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix index c7e7b7d07f..494fd093ac 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libpng libtiff - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix index ebee900cf9..eab80b018c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace qosmic.pro \ --replace "/share" "/Applications/qosmic.app/Contents/Resources" \ --replace "/qosmic/scripts" "/scripts" \ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "CONFIG+=link_pkgconfig" ]; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv qosmic.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix index e7c6def43b..ef4e17fcce 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapQtAppsHook qmake ]; - buildInputs = if stdenv.isDarwin then [ qtsvg ] else [ qtx11extras ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ qtsvg ] else [ qtx11extras ]; meta = with lib; { description = "Qt Visual Graph Editor"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix index aa7c9c84ac..deb45b06d1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { exiv2 libraw libjxl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcanberra-gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { "-DCACHE_NAME_SUFFIX=\"\"" "-DWITH_SYSTEM_LIBRAW=\"ON\"" "-DWITH_JXL=\"ON\"" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { ]; env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/RawTherapee.app $out/bin cp -R Release $out/Applications/RawTherapee.app/Contents for f in $out/Applications/RawTherapee.app/Contents/MacOS/*; do diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix index 5b71622999..943f46fab6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux + buildInputs = lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ # glfw-sys dependencies: libX11 libXrandr libXinerama libXcursor libXi libXext @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { # FIXME: GLFW (X11) requires DISPLAY env variable for all tests doCheck = false; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/applications cp $src/rx.desktop $out/share/applications wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix index ece80ef18a..f4c516ef56 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -2,7 +2,7 @@ let myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 mkdir -p $out/lib/sane - cp -rp usr/lib${lib.optionalString stdenv.is64bit "64"}/sane/* $out/lib/sane + cp -rp usr/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/sane/* $out/lib/sane # Symbolic links were absolute. Fix them so that they point to $out. pushd "$out/lib/sane" > /dev/null diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan5/default.nix index b816eb71d2..91be20f3ab 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -2,7 +2,7 @@ let myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; system = stdenv.hostPlatform.system; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix index 1581b2f5b7..55fbc9a361 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { libxml2 poppler gawk - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libieee1284 libv4l net-snmp diff --git a/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix index 5d8ef439f0..46f654b956 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix index 3c83be5119..e19da3fa15 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix @@ -99,7 +99,7 @@ let fribidi openexr fftw - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix index 16899aea97..a8563a09e4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { icu pango opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix index 6ab953020c..e026db40e8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 + broken = stdenv.hostPlatform.isDarwin; # needs apple frameworks + SDK fix? see #205247 maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix index 4470ccfec4..be14ad6c63 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix @@ -67,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: { lzfse SDL2 SDL2_mixer - ] ++ lib.optional stdenv.isLinux wayland-protocols - ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ] - ++ lib.optional (!stdenv.isDarwin) opencl-headers; + ] ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices OpenCL ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; cmakeFlags = - lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; + lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; # error: "The plain signature for target_link_libraries has already been used" doCheck = false; @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { # one. # This is not needed on darwin, since on that platform data files are saved # in *.app/Contents/Resources/ too, and are picked up automatically. - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' for prog in $out/bin/*; do wrapProgram "$prog" \ --set CORE_PATH $out/share/$(basename "$prog")/ @@ -113,6 +113,6 @@ stdenv.mkDerivation (finalAttrs: { license = [ licenses.mit licenses.cc-by-sa-30 ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix index 83bbbecdc6..75a0b88fba 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 ]; - buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.isLinux [ qt5.qtwayland ]; + buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; postInstall = '' install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix index 1bbdbd4a35..7f80ff24a3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Image viewer for image processing experts"; maintainers = [ lib.maintainers.kidanger ]; license = lib.licenses.gpl3; - broken = stdenv.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin + broken = stdenv.hostPlatform.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin mainProgram = "vpv"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix index 36647a62ae..61b40006b3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ffmpeg x264 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Carbon Cocoa VideoToolbox - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus libva gst_all_1.gst-plugins-base @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { git typescript makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config autoconf libtool @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { gst_all_1.gst-plugins-base pipewire ]; - in lib.optionalString stdenv.isLinux '' + in lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} ''; @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Use your tablet as graphic tablet/touch screen on your computer"; mainProgram = "weylus"; homepage = "https://github.com/H-M-H/Weylus"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index 3527f96bf5..921fef4562 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] ++ [ glib diff --git a/third_party/nixpkgs/pkgs/applications/kde/falkon.nix b/third_party/nixpkgs/pkgs/applications/kde/falkon.nix index b24375e750..85c4d113fb 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/falkon.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/falkon.nix @@ -20,7 +20,7 @@ mkDerivation rec { libpthreadstubs libxcb libXdmcp qtsvg qttools qtwebengine qtx11extras kwallet kpurpose karchive kio - ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index f95d5d9a94..cecb229ce1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -61,7 +61,7 @@ let meta = { # Requires to be installed in "/Application" which is not possible for now (https://github.com/NixOS/nixpkgs/issues/254944) - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Multi-platform password manager"; homepage = "https://1password.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; @@ -76,7 +76,7 @@ let }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 9ecc38a9ab..cbc05d27b8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation { else throw "Source for ${pname} is not available for ${system}"; - nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ xar cpio ]; - unpackPhase = lib.optionalString stdenv.isDarwin '' + unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' xar -xf $src zcat op.pkg/Payload | cpio -i ''; @@ -55,7 +55,7 @@ stdenv.mkDerivation { --zsh <($out/bin/${mainProgram} completion zsh) ''; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index bc2b92843c..efeb82110c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.4.4"; + version = "6.0.6.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-5jV+EJDZ90qtYF8w7RW8jGiy36nPYsLfoOVM35ilVvw="; + hash = "sha256-U4RApOUtrZ9su4O1jamjDbVrjozujW+vYRI1R7rSzpc="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -27,22 +27,28 @@ buildDotnetModule rec { projectFile = "ArchiSteamFarm.sln"; executable = "ArchiSteamFarm"; + + enableParallelBuilding = false; + + useAppHost = false; dotnetFlags = [ + # useAppHost doesn't explicitly disable this "-p:UseAppHost=false" - ]; - dotnetInstallFlags = [ + "-p:RuntimeIdentifiers=" + ] + ; + dotnetBuildFlags = [ "--framework=net8.0" ]; + dotnetInstallFlags = dotnetBuildFlags; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; - preBuild = '' - dotnetProjectFiles=(ArchiSteamFarm) - ''; - preInstall = '' + dotnetProjectFiles=(ArchiSteamFarm) + # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors. makeWrapperArgs+=( --run 'mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}' @@ -55,7 +61,7 @@ buildDotnetModule rec { echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ - -p:UseAppHost=false + $dotnetFlags $dotnetInstallFlags } buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 170e10fbeb..d33bed6722 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -4,7 +4,6 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; hash = "sha256-LvJDD+C/NiPLVjEnIWkR+39UkzoeWgPd7BBXakij0WU="; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; hash = "sha256-w3H3HtsEgG/qH5Zre5i2OAh5r+mDyNIjhfweJu9SDzM="; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; hash = "sha256-1DP9M4+Jzj1MEkz+qXLMLQC4YJCZqIuDlKMWlSF3lAY="; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; hash = "sha256-58ukrKgmk9w5ZyuQU67KS3du4zvkfJ1MskKRL9L6M1o="; }) (fetchNuGet { pname = "Humanizer"; version = "3.0.0-beta.54"; hash = "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "3.0.0-beta.54"; hash = "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="; }) @@ -58,10 +57,11 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "3.0.0-beta.54"; hash = "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "3.0.0-beta.54"; hash = "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "3.0.0-beta.54"; hash = "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; }) (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24324.1"; hash = "sha256-+YEdFt4em1e8SMC3PnRAwOfyMZLwWPJo7/loTt7l9kQ="; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) @@ -78,54 +78,49 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) - (fetchNuGet { pname = "MSTest"; version = "3.4.3"; hash = "sha256-FkjZdIm9j/nfEy+sZRHs9M1g03+QJTWEva23L1TdChw="; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; hash = "sha256-sd+DFcORXa5ToA+n7p8isy4niOCd4mH4Sk5tRuDPRpE="; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; }) + (fetchNuGet { pname = "MSTest"; version = "3.5.2"; hash = "sha256-BZLyxq2WtJL338s9cIVlpodvVInsrjZ6L7vYalIFk5Y="; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.5.2"; hash = "sha256-Jwmtm/+yk8DoPnjOqauDXknVtmVzsrmqJwZuP6QfHvw="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.5.2"; hash = "sha256-ZudwTMNhxbxehLz9hCOgrhTzegVs4P6avUpFiez+u10="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; }) - (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; hash = "sha256-6bMYbKyNWtb0tn8k3418mWBuogofIAfwT9NHSopUu58="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; hash = "sha256-N7EgFENnCZdJVhV1TOjl6R7CImPb3SMcIvP63MfFJng="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.3"; hash = "sha256-M6IbNKj4cUplxS7vi54m2SZe4bQdmMusDTMmsjqmZKg="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.12"; hash = "sha256-KAqPPDIXrqM85yb1TfhqHUhBYrHug/bOlrEepV+0BEc="; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.12"; hash = "sha256-ZnPQeBLrGkP4EqfoJtDjJuuPqCZW5AMv/3XJaB0o0L0="; }) (fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; hash = "sha256-gl4I7GGJbe2HblOLIznTVxmEOm5SV6UyX+DVmKXcCcQ="; }) (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; hash = "sha256-/JlVHQeer2Vxmv7kWXK1Wc7Ihjqdjb+hEoiYxxIW3qs="; }) (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; hash = "sha256-yIUPHCmDcuPsrE1fV5ij6G5ACdUL7M0rrvd6dOSy55w="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.9.0-beta.2"; hash = "sha256-zV4sKZ3v2uSPPy0HLbAE6XwGt6r8R5UVdFJ/tVDiKWg="; }) (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.9.0"; hash = "sha256-vvIrTeDGzgz8dI7/SkLL0ZrV+9u3e9uhvW6VVdsd6Ps="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.9.0"; hash = "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.9.0"; hash = "sha256-y/UbDt6n6heD+ayzv0xPurXLFNL+eSldwqoyGpvCg7o="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; }) - (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; hash = "sha256-iCJc3MjuD7QoF5mUy0ROSgfosUvPaZjUgrNhd9dcmQY="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.2"; hash = "sha256-aQ1zMyWPOvGFcDYYscn/qTpnWS4HfK/k1NLk37zeVAE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.2"; hash = "sha256-clFYZAy7v6mbWr1a+yy0BVbqoQGlqDvzXGlVMXzqg9s="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.7.2"; hash = "sha256-tBsLIRSWAknFWvNu524sSFmOB4aIKuYX9I3Wp9AHxwE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.2"; hash = "sha256-cH+/13iri7PMxlymzLUT+YEoJKxlXNNK56x8oQAkuAs="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.2"; hash = "sha256-EzHxMjlwAsyNOFdHZTiQ7Wk6ZEWpRJqwoQGSe/eFoJE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.2"; hash = "sha256-4+aBYecxcA/Et8sAxoJ2+e86WO7s3rYT6xd9MOaQIxQ="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index b1da7708bf..8231e831b4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "3ae4df4206a3f5fbbe582403403df848fd29847f"; + version = "1641151b9f430908bc63bbe9927fa8414538e7f1"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-81PESllqRmtfdYFda1fBRZMczlWQq2xSPWELIOIpi3s="; + hash = "sha256-0qfX0vHaDY4Mv9N6nXcn2/9DgRAAl07c8eNHBC3rX6I="; }; - npmDepsHash = "sha256-OIkT5XMWcVRbCemaC+hkHkZACCzNedJKHLvGmNXEye4="; + npmDepsHash = "sha256-/DRkzwU32RgXR+58MrD2KbxF55nJJxnMAnU3kafqtXg="; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/misc/anup/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anup/default.nix index 91cf5c9540..a72ba17eb6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/anup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/anup/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite xdg-utils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix index 44e1f0992a..621fca6feb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix @@ -31,7 +31,7 @@ , enableAMR ? false , amrnb , amrwb -, enableLibpulseaudio ? stdenv.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio +, enableLibpulseaudio ? stdenv.hostPlatform.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio , libpulseaudio }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; buildInputs = - lib.optional (enableAlsa && stdenv.isLinux) alsa-lib + lib.optional (enableAlsa && stdenv.hostPlatform.isLinux) alsa-lib ++ lib.optional enableLibao libao ++ lib.optional enableLame lame ++ lib.optional enableLibmad libmad @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableWavpack wavpack ++ lib.optionals enableAMR [ amrnb amrwb ] ++ lib.optional enableLibpulseaudio libpulseaudio - ++ lib.optional stdenv.isDarwin CoreAudio; + ++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix index 70812441d3..b1ff6eb0a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix @@ -42,7 +42,7 @@ webkitgtk, wxGTK31, xorg, - withSystemd ? stdenv.isLinux, + withSystemd ? stdenv.hostPlatform.isLinux, }: let opencascade-occt = opencascade-occt_7_6; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bb/default.nix index 89a0d75fc2..16f4c0bd2d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bb/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ aalib ncurses libmikmod xorg.libXau xorg.libXdmcp xorg.libX11 - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreAudio; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '/^#include $/d' *.c ''; # error: 'regparm' is not valid on this platform - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-D__STRICT_ANSI__"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix index 92ccc41129..da77d6c693 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix @@ -31,11 +31,11 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with xorg; [ libX11 libXcursor libXi libXrandr ] ++ [ vulkan-loader ])} ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 503e739a74..a2ac2a81c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -71,22 +71,24 @@ python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 rocmPackages, # comes with a significantly larger closure size runCommand, - spaceNavSupport ? stdenv.isLinux, + spaceNavSupport ? stdenv.hostPlatform.isLinux, sse2neon, stdenv, tbb, wayland, wayland-protocols, wayland-scanner, - waylandSupport ? stdenv.isLinux, + waylandSupport ? stdenv.hostPlatform.isLinux, zlib, zstd, }: let - embreeSupport = (!stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin; - openImageDenoiseSupport = (!stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin; - openUsdSupport = !stdenv.isDarwin; + embreeSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + openImageDenoiseSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + openUsdSupport = !stdenv.hostPlatform.isDarwin; python3 = python3Packages.python; pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; @@ -105,18 +107,18 @@ in stdenv.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.2.1"; + version = "4.2.2"; srcs = [ (fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-+Y4JbzeK+30fO8WdEmvjOeQjm094ofsUhRFXs9mkcxI="; + hash = "sha256-wv9EwB4DXSVS5K+lb+7gU3pTrMDO/ELeV2eErivfsWU="; }) (fetchgit { name = "assets"; url = "https://projects.blender.org/blender/blender-assets.git"; - rev = "6864f1832e71a31e1e04f72bb7a5a1f53f0cd01c"; + rev = "v${finalAttrs.version}"; fetchLFS = true; hash = "sha256-vepK0inPMuleAJBSipwoI99nMBBiFaK/eSMHDetEtjY="; }) @@ -130,10 +132,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "source"; - patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./draco.patch ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; postPatch = - (lib.optionalString stdenv.isDarwin '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace-fail '${"$"}{LIBDIR}/python' \ @@ -200,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBDIR=/does-not-exist" "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib" ] @@ -275,7 +277,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional embreeSupport embree ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; }) ++ ( - if (!stdenv.isDarwin) then + if (!stdenv.hostPlatform.isDarwin) then [ libGL libGLU @@ -328,14 +330,19 @@ stdenv.mkDerivation (finalAttrs: { blenderExecutable = placeholder "out" - + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); + + ( + if stdenv.hostPlatform.isDarwin then + "/Applications/Blender.app/Contents/MacOS/Blender" + else + "/bin/blender" + ); postInstall = - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/Blender.app $out/Applications '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext} '' + '' @@ -355,7 +362,7 @@ stdenv.mkDerivation (finalAttrs: { addDriverRunpath "$program" done '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender ''; @@ -377,7 +384,7 @@ stdenv.mkDerivation (finalAttrs: { import bpy bpy.context.scene.eevee.taa_render_samples = 32 bpy.context.scene.cycles.samples = 32 - if ${if (stdenv.isAarch64 && stdenv.isLinux) then "True" else "False"}: + if ${if (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) then "True" else "False"}: bpy.context.scene.cycles.use_denoising = False bpy.context.scene.render.resolution_x = 100 bpy.context.scene.render.resolution_y = 100 @@ -433,7 +440,7 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-darwin" ]; - broken = stdenv.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile + broken = stdenv.hostPlatform.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile maintainers = with lib.maintainers; [ amarshall veprbl diff --git a/third_party/nixpkgs/pkgs/applications/misc/boatswain/default.nix b/third_party/nixpkgs/pkgs/applications/misc/boatswain/default.nix index 5d2b1540ae..fc2842ebe5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/boatswain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/boatswain/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ _0xMRTT ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index 10bbeefd03..b5e8c469b4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -224,6 +224,6 @@ stdenv.mkDerivation (finalAttrs: { else lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/cardpeek/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cardpeek/default.nix index 833ad9202b..6122607bc4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cardpeek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cardpeek/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # replace xcode check and hard-coded PCSC framework path substituteInPlace configure.ac \ --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ @@ -34,8 +34,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib gtk3 lua5_2 curl readline ] - ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux pcsclite; + ++ lib.optional stdenv.hostPlatform.isDarwin PCSC + ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix b/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix index ae3964355a..178a0e25cb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/citations/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita poppler - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipqr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipqr/default.nix index 18b276f264..90d4e0b66b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clipqr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clipqr/default.nix @@ -69,7 +69,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ MatthieuBarthel ]; homepage = "https://gitlab.com/imatt-foss/clipqr"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "clipqr"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix index bf3dd3c4a0..61f307edd5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix index 82276b73c4..a5dd6a8d9e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-g25Pw3BlRbuaGjsQav6mU9zVyS1mVUKkgKDOILm8R6U="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Static site generator written in Rust"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix index 96f19b4796..392bf98af6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix @@ -48,7 +48,7 @@ crystal.buildCrystalPackage rec { # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. nativeBuildInputs = [ wrapGAppsHook4 pkg-config gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libadwaita diff --git a/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix index 94a4d427e8..5ce8d147fb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/TD-Sky/conceal"; license = licenses.mit; maintainers = with maintainers; [ jedsek kashw2 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix index d75cdd4843..22e9906db5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ qttools fribidi libunibreak ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/buggins/coolreader"; description = "Cross platform open source e-book reader"; mainProgram = "cr3"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix index 3b8d737dc1..e2f5cffdfb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-o9LRXbx77EXXO7rEmpBrx2nommJgG0ikw1YzdeB0Gug="; - buildInputs = lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; meta = with lib; { homepage = "https://github.com/replydev/cotp"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 8f6bc27438..84263380f1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitLab , cmake , extra-cmake-modules , qttools @@ -12,21 +12,24 @@ , wrapQtAppsHook , gst_all_1 , testers -, crow-translate }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crow-translate"; - version = "2.11.1"; + version = "3.0.0"; - src = fetchzip { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-1rq1pF4tOaZNEaHflxlBuHta80EzD9m3O99geR1EPxE="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "office"; + repo = "crow-translate"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hdrhxbv44DlxoF1JU1d2auP/vR8a3IJI+hN7PhdPMaY="; + fetchSubmodules = true; }; postPatch = '' - substituteInPlace data/io.crow_translate.CrowTranslate.desktop \ - --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + substituteInPlace data/org.kde.CrowTranslate.desktop.in \ + --subst-var-by QT_BIN_DIR ${lib.getBin qttools}/bin ''; nativeBuildInputs = [ @@ -54,15 +57,15 @@ stdenv.mkDerivation rec { ''; passthru.tests.version = testers.testVersion { - package = crow-translate; + package = finalAttrs.finalPackage; }; - meta = with lib; { + meta = { description = "Simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; - homepage = "https://crow-translate.github.io/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + homepage = "https://invent.kde.org/office/crow-translate"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.linux; mainProgram = "crow"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix index 0d29b7921a..f75ddf0c10 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "Graphical Minecraft seed finder and map viewer"; mainProgram = "cubiomes-viewer"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix index 502c247ce2..0212547a75 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Foundation Security @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys # because the vendored copy does not build with newer versions of clang. - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix index 1d54b57c9b..d64d8f6ab9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo poppler wxGTK ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; preConfigure = "./bootstrap"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix index 87d484c2e9..4b15eae9e6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ benjaminedwardwebb ]; platforms = platforms.linux; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix b/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix index 6b54636488..8ddbe3a126 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/done/default.nix b/third_party/nixpkgs/pkgs/applications/misc/done/default.nix index 47238cd9cb..095d77b1ee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/done/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/done/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { libsecret openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_DIR = gettext; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix index c514c21773..8ec9dfc350 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GUI tool to find duplicate files in a system"; homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 910e21528e..e9854ac3ef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = [ ] ++ lib.optional stdenv.isLinux qtwayland; + buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 859d7bb42b..0faaf36912 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -32,13 +32,13 @@ let }; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.{v}" - else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -71,7 +71,7 @@ python.pkgs.buildPythonApplication { ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python.pkgs; [ aiohttp @@ -124,7 +124,7 @@ python.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ "Exec=$out/bin/electrum %u" \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix index 9d71a5886b..cd0b89f94f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/grs.nix @@ -13,13 +13,13 @@ let version = "4.5.4"; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.{v}" - else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; in @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum-grs.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-grs %u"' \ "Exec=$out/bin/electrum-grs %u" \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index 110a17aeea..e0aaf139cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -14,13 +14,13 @@ let version = "4.2.2.1"; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.0" - else if stdenv.isDarwin then "libsecp256k1.0.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.0" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.0.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -112,7 +112,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Despite setting usr_share above, these files are installed under # $out/nix ... mv $out/${python3.sitePackages}/nix/store"/"*/share $out @@ -131,7 +131,7 @@ python3.pkgs.buildPythonApplication { ''; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; pytestFlagsArray = [ "electrum_ltc/tests" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix index 6b68334f20..1758dde546 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication { mainProgram = "etesync-dav"; license = licenses.gpl3; maintainers = with maintainers; [ thyol valodim ]; - broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix b/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix index f8f24fa635..f9a911a1c1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix index 9f8a507fdc..0f9155fe1b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { glib libopus vips - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix b/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix index f35df6a049..7508bc53e6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withColorer [ spdlog xercesc ] ++ lib.optionals withMultiArc [ libarchive pcre ] ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ] - ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin + ++ lib.optional (withNetRocks && !stdenv.hostPlatform.isDarwin) samba # broken on darwin ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ]) - ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; postPatch = '' patchShebangs python/src/prebuild.sh diff --git a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix index 8eb001e9c9..55e1700c5c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix index 98146e6bfd..c2cb20ef5b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SOsHvcfDdUpb0x5VZ1vZJnGaIiWWOPgnAwKYNXzfUfI="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoHash = "sha256-aimPeGIE5jP0pdrqwnzUzBqW0jz9+kcfpLdCN0r30xU="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gcal/default.nix index 8f345f39b5..f07a18c0ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gcal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gcal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; + buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext; meta = { description = "Program for calculating and printing calendars"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix index da456226b1..c9c29cd8e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { --replace-fail "\"types-requests\"," "" \ --replace-fail "\"types-vobject\"," "" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace gcalcli/argparsers.py \ --replace-fail "'notify-send" "'${lib.getExe libnotify}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix index b9a49e1723..01a071dc68 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgpiod ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix index 4f455d901c..c807438aaa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-fqzrgmtqy7dlmGEaTXAqpdt9HqZCVooJ0Vf6/JUKihw="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ LWP LWPProtocolHttps XMLLibXML Mojolicious @@ -40,7 +40,7 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/.get_iplayer-wrapped ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix index 71582e3acc..802c03489b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pKHhYWEF9L0UX9hc2Ga3WOUWzISA8ONwn3rcI9u2/n0="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix index d33560c4f1..37f12a266c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { xvfb-run ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; mesonFlags = [ "-Ddocs=disabled" # docs do not seem to be installed - (lib.mesonEnable "tests" ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.isDarwin))) + (lib.mesonEnable "tests" ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.hostPlatform.isDarwin))) ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix index 218110f6d1..e6d8dfc31f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook3 ]; buildInputs = [ gettext glib gtk2 libX11 libSM libICE ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix index 3fcd77f8f4..c37e7dc72f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 { meta = { description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; platforms = lib.platforms.linux; - broken = !stdenv.isx86_64; + broken = !stdenv.hostPlatform.isx86_64; maintainers = with lib.maintainers; [ gador adamcstephens ]; license = lib.licenses.gpl2Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix index 6b1865509b..9c8edf3c77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo - ] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ] - ++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtx11extras libXtst ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 libiconv ] ++ lib.optional withCC opencc ++ lib.optional withEpwing libeb ++ lib.optional withExtraTiff libtiff @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { (lib.optional withZim "CONFIG+=zim_support") ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index fbacfb6984..e1cfb55689 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -2,7 +2,7 @@ , qmake, qttools, wrapQtAppsHook , libusb1, shapelib, zlib , withGUI ? false, qtserialport -, withMapPreview ? (!stdenv.isDarwin), qtwebengine +, withMapPreview ? (!stdenv.hostPlatform.isDarwin), qtwebengine , withDoc ? false, docbook_xml_dtd_45, docbook_xsl, expat, fop, libxml2, libxslt, perl }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # Floating point behavior on i686 causes nmea.test failures. Preventing # extended precision fixes this problem. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-ffloat-store"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-ffloat-store"; doCheck = true; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 gpsbabel -t $out/bin - '' + lib.optionalString withGUI (if stdenv.isDarwin then '' + '' + lib.optionalString withGUI (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv gui/GPSBabelFE.app $out/Applications install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/Applications/GPSBabelFE.app/Contents/Resources/translations @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cp -r html $doc/share/doc/gpsbabel ''; - postFixup = lib.optionalString withGUI (if stdenv.isDarwin then '' + postFixup = lib.optionalString withGUI (if stdenv.hostPlatform.isDarwin then '' wrapQtApp "$out/Applications/GPSBabelFE.app/Contents/MacOS/GPSBabelFE" '' else '' wrapQtApp "$out/bin/gpsbabelfe" diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix index 18c31afef6..c300210425 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { lrelease GPXLab/locale/*.ts ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXLab/GPXLab.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 62936d9505..60bc8b5792 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -9,7 +9,6 @@ , qtpositioning ? null # qt6 only , qtserialport , qtsvg -, qt5compat ? null # qt6 only , wrapQtAppsHook }: @@ -18,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.24"; + version = "13.26"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-qdfNW29SvY0dQy4rS4IDVuYL3h6BByluCecsNSgHbn8="; + hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70="; }; buildInputs = [ @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtpositioning qtsvg - qt5compat ] else [ qtlocation ]); @@ -48,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { lrelease gpxsee.pro ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications mkdir -p $out/bin @@ -60,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = isQt6 && stdenv.isDarwin; + broken = isQt6 && stdenv.hostPlatform.isDarwin; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; description = "GPS log file viewer and analyzer"; mainProgram = "gpxsee"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix index b2b9c7b67b..bb30f7d1b6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { kubectl ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Giant Swarm command line interface"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gv/default.nix index ca12e3bc77..b812e56073 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-SIGCHLD-fallback" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { Xaw3d ghostscriptX perl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/health/default.nix b/third_party/nixpkgs/pkgs/applications/misc/health/default.nix index 8a2972e99a..8ff79b36a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/health/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/health/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libadwaita libsecret tracker - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix b/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix index 4f9c748730..c71dae3b27 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/inlyne/default.nix b/third_party/nixpkgs/pkgs/applications/misc/inlyne/default.nix index 661f537d8b..9f10136042 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/inlyne/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/inlyne/default.nix @@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ fontconfig xorg.libXcursor xorg.libXi @@ -41,11 +41,11 @@ rustPlatform.buildRustPackage rec { wayland libxkbcommon openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # time out on darwin "--skip=interpreter::tests::centered_image_with_size_align_and_link" "--skip=watcher::tests::the_gauntlet" @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { --zsh completions/_inlyne ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/inlyne \ --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/inochi2d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/inochi2d/default.nix index 44a98ee403..a88c58d385 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/inochi2d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/inochi2d/default.nix @@ -45,7 +45,7 @@ in meta = { # darwin has slightly different build steps - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/Inochi2D/inochi-creator/releases/tag/${src.rev}"; description = "An open source editor for the Inochi2D puppet format"; }; @@ -73,7 +73,7 @@ in meta = { # darwin has slightly different build steps, aarch fails to build because of some lua related error - broken = stdenv.isDarwin || stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}"; description = "An application that allows streaming with Inochi2D puppets"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 6a1a9423b5..7f85685679 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -44,13 +44,13 @@ let linux = appimageTools.wrapType2 rec { inherit pname version src meta; + nativeBuildInputs = [ makeWrapper ]; profile = '' export LC_ALL=C.UTF-8 ''; extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications @@ -74,6 +74,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/misc/jp2a/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jp2a/default.nix index 7702468768..f55b435a4b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jp2a/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jp2a/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://csl.name/jp2a/"; description = "Small utility that converts JPG images to ASCII"; license = licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix index c59b5e62c4..8a7e91ba3c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6zD9WRPWEt0ubppaMRTOusy0zm3z6SGB/5/kMxcJ/Ag="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix index 8e9035c101..914884a9aa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-old-style-cast" "-Wno-error" - "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" + "-D__BIG_ENDIAN__=${if stdenv.hostPlatform.isBigEndian then "1" else "0"}" ]); - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { "-DWITH_XC_UPDATECHECK=OFF" ] ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (lib.optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (lib.optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") + ++ (lib.optional (withKeePassFDOSecrets && stdenv.hostPlatform.isLinux) "-DWITH_XC_FDOSECRETS=ON") + ++ (lib.optional (withKeePassYubiKey && stdenv.hostPlatform.isLinux) "-DWITH_XC_YUBIKEY=ON") ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") ++ (lib.optional withKeePassBrowserPasskeys "-DWITH_XC_BROWSER_PASSKEYS=ON") ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" # testcli, testgui and testkdbx4 are flaky - skip them all # testautotype on darwin throws "QWidget: Cannot create a QWidget without QApplication" - make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" + make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.hostPlatform.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" runHook postCheck ''; @@ -98,12 +98,12 @@ stdenv.mkDerivation rec { qttools pkg-config ] - ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook3; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3; dontWrapGApps = true; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" ''; @@ -128,9 +128,9 @@ stdenv.mkDerivation rec { readline zlib ] - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) LocalAuthentication - ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optional stdenv.isLinux libusb1 + ++ lib.optional (stdenv.hostPlatform.isDarwin && withKeePassTouchID) LocalAuthentication + ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras + ++ lib.optional stdenv.hostPlatform.isLinux libusb1 ++ lib.optional withKeePassX11 qtx11extras; passthru.tests = nixosTests.keepassxc; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix index 70941045ce..7ad3afc16c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ poelzi ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "Kemai"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix index 83de3e517d..32c307af60 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { install -Dm755 misc/khal.desktop -t $out/share/applications ''; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 0b1bc64791..afff0cd683 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ { lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl +, which, perl, libgit2 }: mkDerivation rec { pname = "klayout"; - version = "0.28.12"; + version = "0.29.6"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo="; + hash = "sha256-gbbes8CPh+Z9wCeQaAaObZjQvBTMe06z8oR12i6e12M="; }; postPatch = '' @@ -31,6 +31,7 @@ mkDerivation rec { qtmultimedia qttools qtxmlpatterns + libgit2 ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix index 136ad6115d..e7a511769a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libgit2 Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libgit2 Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix index fea8dbc80e..0ef76edd42 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix @@ -6,14 +6,14 @@ , gitUpdater }: python3.pkgs.buildPythonApplication rec { pname = "KlipperScreen"; - version = "0.4.3"; + version = "0.4.4"; format = "other"; src = fetchFromGitHub { - owner = "jordanruthe"; + owner = "KlipperScreen"; repo = "KlipperScreen"; rev = "v${version}"; - hash = "sha256-6hMefH9VcNnWhKdQRs7cPVL86LEDRSLaxygmi15HdLI="; + hash = "sha256-MxuUmkuEnfFC0iPwNUc0Wh8bIEl1J1FMgGEYMjHePZ8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix index 6533778046..4cbd5f38e1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix @@ -40,11 +40,11 @@ rustPlatform.buildRustPackage rec { }) ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; meta = with lib; { description = "Music theory binary and library for Rust"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix index d03b005d0b..014bc216b4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -17,13 +17,20 @@ stdenv.mkDerivation rec { version = "2024.04"; - src = if stdenv.isAarch64 then fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; - } else fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; - }; + src = { + aarch64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; + hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; + }; + armv7l-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; + hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; + hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src_repo = fetchFromGitHub { repo = "koreader"; @@ -68,7 +75,7 @@ stdenv.mkDerivation rec { "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; mainProgram = "koreader"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix index 3cca48b24c..24d7faf407 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { openssl dbus sqlite - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd leetcode \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/lenmus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lenmus/default.nix index 7dc018e087..c7a1ce9f5d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lenmus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lenmus/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { wxsqlite3 fluidsynth fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-DMAN_INSTALL_DIR=${placeholder "out"}/share/man" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/lenmus.app $out/Applications mv $out/Resources $out/Applications/lenmus.app/Contents diff --git a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix index db08979622..ff5d34e822 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ocaml pkg-config ]; buildInputs = [ mupdf libX11 freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { install build/llpp $out/bin install misc/llpp.inotify $out/bin/llpp.inotify install -Dm444 misc/llpp.desktop -t $out/share/applications - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/llpp \ --prefix PATH ":" "${xclip}/bin" diff --git a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix index 8850ec597f..7471d7ce5e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "2.0.4"; + version = "2.0.9"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-U+yelFSulAhgsn5xt45mxC7qGpQwmb3m3lt9nEW6MHU="; + sha256 = "sha256-tV3giMBF3DN8Aop1B1D7pGp3HYPMQlcZ52JrOhxFrEE="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix index e4093295df..92498cc926 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Plain text Zettelkasten based on mdBook"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix index 9fa453cacd..90c1683ede 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -2,20 +2,20 @@ , buildGoModule , fetchFromGitHub , stdenv -, withSpeech ? !stdenv.isDarwin +, withSpeech ? !stdenv.hostPlatform.isDarwin , makeWrapper , espeak-ng }: buildGoModule rec { pname = "mob"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = "mob"; rev = "v${version}"; - hash = "sha256-+v48znHCfu2qBFB0JhYT1vnce0wSHMULTlwaLv0237Q="; + hash = "sha256-LktA7GMOWAl12PRLgX8VTyYZ00sh6AHsgw9NdyjAJ64="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix index b54d9dd861..0a242d50e3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -15,7 +15,7 @@ , libjpeg , darwin , gumbo -, enableX11 ? (!stdenv.isDarwin) +, enableX11 ? (!stdenv.hostPlatform.isDarwin) , libX11 , libXext , libXi @@ -98,16 +98,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems - ++ lib.optional (stdenv.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle + ++ lib.optional (stdenv.hostPlatform.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] ++ lib.optionals (enablePython) [ which swig ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames xcbuild ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else [ freeglut-mupdf libGLU ] @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { moveToOutput "bin" "$bin" cp ./build/shared-release/libmupdf${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib - '' + (lib.optionalString (stdenv.isDarwin) '' + '' + (lib.optionalString (stdenv.hostPlatform.isDarwin) '' for exe in $bin/bin/*; do install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe" done @@ -185,7 +185,7 @@ stdenv.mkDerivation rec { mkdir -p $out/${python3.sitePackages}/mupdf cp build/*/_mupdf.so $out/${python3.sitePackages} cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/_mupdf.so '')); diff --git a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index 5591fa9b45..01df4df5d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString ([ # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated "-Wno-error=deprecated-declarations" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # error: narrowing conversion of '-1' from 'int' to 'char' "-Wno-error=narrowing" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix index 23abf6a354..2d634e99dd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postInstall = '' wrapProgram $out/bin/navi \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix index cccb55f5e5..9d1c4a2466 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix @@ -22,6 +22,8 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ]; extraInstallCommands = '' @@ -30,7 +32,6 @@ appimageTools.wrapType2 rec { $out/share/icons/hicolor/1024x1024/apps/notable.png substituteInPlace $out/share/applications/notable.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "--disable-seccomp-filter-sandbox" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix index 3753da39a0..8f3cb52872 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix @@ -74,6 +74,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix index 9f59da0f9c..9f3b685cd0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.20"; + version = "0.3.21"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-lpXcH45BFgfRjkEHqimnHonDenm5YA6oahe4sN2wpY4="; + hash = "sha256-aVQSWvQTRdz5R9uEXU4CvveRaPdehcL7hrXwFoPCEyI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 41ddd2cf8d..e8ffe9f3b8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -23,10 +23,10 @@ let maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; + hash = if stdenv.hostPlatform.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; }; icon = fetchurl { @@ -89,4 +89,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 18369b8827..a241a10909 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -181,8 +181,8 @@ let class-doc pydantic_1 ] - ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ] - ++ lib.optionals (!stdenv.isDarwin) [ octoprint-pisupport ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ py.pkgs.appdirs ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ octoprint-pisupport ]; nativeCheckInputs = with self; [ ddt @@ -241,7 +241,7 @@ let disabledTests = [ "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.isDarwin [ "test_set_external_modification" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ]; disabledTestPaths = [ "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix index 8d4d4df4ef..b02a63301f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix index 2fcaa7f4c4..0ebe028810 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -121,10 +121,10 @@ python3.pkgs.buildPythonApplication rec { hunspellDicts.en-us hunspellDicts.es-es hunspellDicts.it-it - - python3.pkgs.nose ]; + # Tests have never been enabled, and upstream uses nose as a test + # runner (though not as a library). doCheck = false; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix index a727bdac62..04a9fffcb0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ hqurve ]; platforms = lib.platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix index de3fc6cd0a..7a9fd06cc2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./000-enable-svg.patch ]; # The strip options are not recognized by Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '/strip -s/d' Makefile ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix index 380a88e6f2..479fe1bcb0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-axRI3sssj2Q6IBfIeyvOa494b0EgKFP+lFL/QrGIybQ="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/fixup_bundle/d; /NO_DEFAULT_PATH/d' CMakeLists.txt ''; @@ -65,9 +65,9 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config gtest - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools makeWrapper ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus flac - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ AppKit ] ++ [ gtk3 @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite tinyxml wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-utils libselinux libsepol @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXtst ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lame ]; @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { "-DSQUISH_USE_SSE=0" ]); - postInstall = lib.optionals stdenv.isDarwin '' + postInstall = lib.optionals stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/OpenCPN.app $out/Applications makeWrapper $out/Applications/OpenCPN.app/Contents/MacOS/OpenCPN $out/bin/opencpn diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix index b1326dd592..0c5e55efe0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { env = { RUSTONIG_SYSTEM_LIBONIG = true; ORANDA_USE_TAILWIND_BINARY = true; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # without this, tailwindcss fails with OpenSSL configuration error OPENSSL_CONF = ""; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index 06014f6f47..b81f09e1c3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -30,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.08.16-5"; + version = "2024.09.08-7"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-qVLeZySVdncHEwA0aTiScGJ/RAIpvVVVse3O/sXLto0="; + hash = "sha256-X1dmk1IBjqM2AUVkvSDNZyVtV5Ens9ninZvMvsRc334="; fetchSubmodules = true; }; @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix index 3d537afc1d..b8ca97d298 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; cmakeFlags = ["-DWITH_LTO=OFF"]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-faligned-allocation" ]); diff --git a/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix index e48c0bbcab..5164e294a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+Cw/aAXkSbYLqc7TGWsMUJNo88v0s1Cq1m4V84j3gXE="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Command-line tool to generate, analyze, convert and manipulate colors"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index 2b6e7a0ed8..cae71f7859 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = lib.optional stdenv.isDarwin (lib.cmakeBool "MOVIES" false); + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeBool "MOVIES" false); meta = with lib; { description = "Presenter console with multi-monitor support for PDF files"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix index 3e55a0de0a..7ee5f31674 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pe-bear/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.6.7.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - hash = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE="; + hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index 6d91a49980..35777a0b25 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.isDarwin [ + qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PGSQL_INC=${lib.getDev postgresql}/include" "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" "XML_INC=${libxml2.dev}/include/libxml2" @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. buildInputs = [ postgresql qtsvg ] - ++ lib.optionals stdenv.isLinux [ qtwayland ] - ++ lib.optionals stdenv.isDarwin [ cups libxml2 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups libxml2 ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin for item in pgmodeler pgmodeler-{cli,se,ch} do @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { done ''; - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Database modeling tool for PostgreSQL"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix index 3f4e82d2e4..65161d713f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix @@ -8,7 +8,7 @@ version = "4.0.0.dev10"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix index 77774b5343..d9f76a7545 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ annaaurora ]; # error: redefinition of module 'ObjectiveC' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "pomodoro"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/porsmo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/porsmo/default.nix index f741ad2d6b..6d9ed5ee2c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/porsmo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/porsmo/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix index ef2b9fec3a..10f55aced9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ gtk4 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 159b0e0aeb..ecce3066ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { catch2 ] ++ lib.optionals withSystemd [ systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreWLAN ]; @@ -210,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.agpl3Plus; maintainers = with maintainers; [ moredread tweber tmarkus ]; platforms = platforms.unix; - } // lib.optionalAttrs (stdenv.isDarwin) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { mainProgram = "PrusaSlicer"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index 173323f589..1eff035541 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -23,11 +23,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Libsystem SystemConfiguration libiconv diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index dc2de8b0cd..b2856cb797 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { openssl xercesc file - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXext libXi libXt @@ -63,14 +63,14 @@ stdenv.mkDerivation rec { libuuid libyubikey yubikey-personalization - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; cmakeFlags = [ "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DNO_YUBI=ON" ]; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { for f in $(grep -Rl /usr/bin/ .) ; do substituteInPlace $f --replace /usr/bin/ "" done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/ui/cli/CMakeLists.txt --replace "uuid" "" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix index a28e8d5886..806d1df05f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Upstream install is mostly defunct. It hardcodes target.path and doesn't # install anything but the binary. - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out"/{Applications,bin} mv qMasterPassword.app "$out"/Applications/ ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index b94b8326dc..6bffbda0a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { qtscript qtsvg qtxmlpatterns - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; @@ -68,17 +68,17 @@ mkDerivation rec { "QMAKE_CXXFLAGS=-std=c++14" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm555 release/qcad-bin $out/bin/qcad - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad mkdir -p $out/lib '' + '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix index b4d8bd3ab1..705618bd2f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix @@ -74,6 +74,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/qolibri/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qolibri/default.nix index 0439e212d1..4b8213d46d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qolibri/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qolibri/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isx86_64; # Looks like a libcxx version mismatch problem. + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; # Looks like a libcxx version mismatch problem. mainProgram = "qolibri"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix index 2fa22cf732..68baf5e08e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix @@ -31,13 +31,13 @@ mkDerivation rec { }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch; postPatch = '' - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace includes/platforms/linux/posixUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ --replace '"pgrep -x' '"${procps}/bin/pgrep -x' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace includes/platforms/darwin/macUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' ''} @@ -64,6 +64,6 @@ mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; - broken = !preferNative || stdenv.isDarwin; + broken = !preferNative || stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix index b737716ed5..c544dc4488 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; # package does not contain tests as of v0.3.3 docCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix index 41a21e8f49..6451fa2c7a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix @@ -3,15 +3,15 @@ , libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection, wayland-scanner , gtk3, python, pygobject3, pyxdg -, withQuartz ? stdenv.isDarwin, ApplicationServices -, withRandr ? stdenv.isLinux, libxcb -, withDrm ? stdenv.isLinux, libdrm -, withVidmode ? stdenv.isLinux, libXxf86vm +, withQuartz ? stdenv.hostPlatform.isDarwin, ApplicationServices +, withRandr ? stdenv.hostPlatform.isLinux, libxcb +, withDrm ? stdenv.hostPlatform.isLinux, libdrm +, withVidmode ? stdenv.hostPlatform.isLinux, libXxf86vm , withGeolocation ? true -, withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa -, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue -, withAppIndicator ? stdenv.isLinux, libappindicator, libayatana-appindicator +, withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin, CoreLocation, Foundation, Cocoa +, withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux, geoclue +, withAppIndicator ? stdenv.hostPlatform.isLinux, libappindicator, libayatana-appindicator }: let diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix index 53ad4f9aea..655dd90fdb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix @@ -52,7 +52,7 @@ crystal.buildCrystalPackage rec { nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection - ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ webkitgtk_6_0 diff --git a/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix index 7d0e072ee3..ffe1018471 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix index ce774e5a66..d173777bc3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix index a111142bbd..7ee3d4573d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix @@ -25,8 +25,8 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenAL ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix index b542966e82..999b140c5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { homepage = "https://github.com/SpectralOps/senv"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - broken = stdenv.isDarwin; # needs golang.org/x/sys bump + broken = stdenv.hostPlatform.isDarwin; # needs golang.org/x/sys bump mainProgram = "senv"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix index 1e82fce078..d9b4c4cfd5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_nonmedia_files" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix index ab853d4dc1..64faccf681 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt3d qtbase ] - ++ lib.optionals stdenv.isDarwin [ freetype ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; nativeBuildInputs = [ installShellFiles @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - qmakeFlags = lib.optionals stdenv.isDarwin [ "CONFIG+=non_portable" ]; + qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ]; postPatch = '' substituteInPlace pdf_viewer_build_config.pro \ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/etc/sioyek" "$out/etc" ''; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders cp pdf_viewer/prefs.config sioyek.app/Contents/MacOS/ cp pdf_viewer/prefs_user.config sioyek.app/Contents/MacOS/ diff --git a/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix index cf5cd1ff0b..a7e6a75a7a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix index 11f49d8506..3a66344351 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { tftpy ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' rules="src/snagrecover/50-snagboot.rules" if [ ! -f "$rules" ]; then echo "$rules is missing, must update the Nix file." diff --git a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix index 0de395549b..4441508e0b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/stw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stw/default.nix index 689fc9e81c..5f36e1e112 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ somasis ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "stw"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix index 2bb4184b43..bfb79fd10b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - doCheck = (!stdenv.isDarwin); # times out + doCheck = (!stdenv.hostPlatform.isDarwin); # times out enableParallelChecking = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index 4745a94230..c441ca3008 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -12,7 +12,6 @@ , p7zip , autoPatchelfHook , libXxf86vm -, unzip , libGL }: diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index a993a57deb..3d0cbe7198 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -22,9 +22,9 @@ , xdg-utils , webviewSupport ? true , jsSupport ? true -, kioPluginSupport ? stdenv.isLinux -, plasmoidSupport ? stdenv.isLinux -, systemdSupport ? stdenv.isLinux +, kioPluginSupport ? stdenv.hostPlatform.isLinux +, plasmoidSupport ? stdenv.hostPlatform.isLinux +, systemdSupport ? stdenv.hostPlatform.isLinux /* It is possible to set via this option an absolute exec path that will be written to the `~/.config/autostart/syncthingtray.desktop` file generated during runtime. Alternatively, one can edit the desktop file themselves after @@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { qtutilities boost qtforkawesome - ] ++ lib.optionals stdenv.isDarwin [ iconv ] - ++ lib.optionals stdenv.isLinux [ qtwayland ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ iconv ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] @@ -74,12 +74,12 @@ stdenv.mkDerivation (finalAttrs: { ; # syncthing server seems to hang on darwin, causing tests to fail. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${lib.getBin qtbase}/${qtbase.qtPluginPrefix}" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # put the app bundle into the proper place /Applications instead of /bin mkdir -p $out/Applications mv $out/bin/syncthingtray.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix index fe15ce3b98..7db338b168 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/gui/src/SslCertificate.cpp \ --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \ --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" ''; @@ -69,14 +69,14 @@ stdenv.mkDerivation rec { qttools # Used for translations even when not building the GUI openssl pcre - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol @@ -95,17 +95,17 @@ stdenv.mkDerivation rec { ]; # Silences many warnings - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-inconsistent-missing-override"; cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" # NSFilenamesPboardType is deprecated in 10.14+ - ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.hostPlatform.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; doCheck = true; checkPhase = '' runHook preCheck - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # filter out tests failing with sandboxing on darwin export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing '' + '' @@ -120,12 +120,12 @@ stdenv.mkDerivation rec { cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/ '' + lib.optionalString withGUI '' cp bin/synergy $out/bin/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \ --replace "/usr/bin" "$out/bin" - '' + lib.optionalString (stdenv.isDarwin && withGUI) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && withGUI) '' mkdir -p $out/Applications cp -r bundle/Synergy.app $out/Applications ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS diff --git a/third_party/nixpkgs/pkgs/applications/misc/taizen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taizen/default.nix index 903de3c05c..30bb445089 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taizen/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix index 80ece5bded..ec2cda0c16 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; OPENSSL_NO_VENDOR = 1; LIBGIT2_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index f2cc437ab9..4e789f2f8e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix b/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix index 2749a7ec15..d99579a5f2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation (finalAttrs: { ''; # https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330 - postConfigure = lib.optionalString stdenv.isAarch64 '' + postConfigure = lib.optionalString stdenv.hostPlatform.isAarch64 '' bash ../cmake/fix_ruy_build.sh .. . ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tthsum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tthsum/default.nix index 603ddeca4f..e2b9d2e570 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tthsum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tthsum/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp obj-unix/tthsum $out/bin ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Md5sum-alike program that works with Tiger/THEX hashes"; longDescription = '' tthsum generates or checks TTH checksums (root of the THEX hash diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix index 1d2c6681c1..9eeac726a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-K0TXWFCSVjwogSXiTRX2eE92w5OzOGVeU4hFkDTJl+M="; + hash = "sha256-PRzLTlq8XfI5dYZhJ8YBtYi4H3883S2olp9jrn1Q5CQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix index 499cf576c3..a4305dbd17 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix index f2c0a9aa02..883850f10b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ubpm"; license = licenses.gpl3Only; maintainers = with maintainers; [ kurnevsky ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix index 24424c1017..42f2585ec4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/usb-reset/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usb-reset/default.nix index 0e924ba5ee..a5bb2061ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usb-reset/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usb-reset/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Perform a bus reset on a USB device using its vendor and product ID"; homepage = "https://github.com/ralight/usb-reset"; changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix index 368a816365..12e14f212f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; postInstall = '' - wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isLinux [ chromium ] ++ [ ffmpeg ttyd ])} + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ chromium ] ++ [ ffmpeg ttyd ])} $out/bin/vhs man > vhs.1 installManPage vhs.1 installShellCompletion --cmd vhs \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix b/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix index 1335d95040..cb3ab09e31 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix @@ -10,7 +10,7 @@ , withMBTiles ? true, sqlite , withMd5Hash ? true, nettle , withOAuth ? true, liboauth -, withRealtimeGPSTracking ? (!stdenv.isDarwin), gpsd +, withRealtimeGPSTracking ? (!stdenv.hostPlatform.isDarwin), gpsd }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook3 yelp-tools ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ] ++ lib.optional withGeoClue geoclue2 diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index cb6033fa4b..d7a7c4d9f7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -40,7 +40,7 @@ # other , git , withPcap ? true, dpkt, dnslib -, withXclip ? stdenv.isLinux, xclip +, withXclip ? stdenv.hostPlatform.isLinux, xclip , testers , visidata }: diff --git a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix index fccd7585e4..5ed42ab1fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ tcl tk ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix b/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix index a0521d4439..869f7c6371 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Program to help prevent Repetitive Strain Injury"; mainProgram = "workrave"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix index 142d331be9..df95d41738 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 2cea4d2dd4..9b46c65b80 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libmicrohttpd openssl hwloc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices OpenCL diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index fb69b92e8f..9efdbc700a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libuv libmicrohttpd openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices IOKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix index 2315810e03..13b4097f8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Fix "No known features for CXX compiler", see # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt --replace \ 'cmake_minimum_required(VERSION 2.8.12)' 'cmake_minimum_required(VERSION 3.1.0)' ''; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { categories = [ "Office" ]; }; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm644 ${desktopItem}/share/applications/xpdf.desktop -t $out/share/applications install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix index 4ce68f77e2..3260574739 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ]; cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ] - ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" mv $out/XyGrib/XyGrib.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index c2a4abacb5..0ed21d7688 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -79,20 +79,23 @@ stdenv.mkDerivation (finalAttrs: { appstream-glib ]; - buildInputs = [ - gtk - girara - libintl - sqlite - glib - file - librsvg - check - json-glib - texlive.bin.core - ] ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isDarwin gtk-mac-integration; + buildInputs = + [ + gtk + girara + libintl + sqlite + glib + file + librsvg + check + json-glib + texlive.bin.core + ] + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.updateScript = gitUpdater { }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b49371b24d..f0fd28d4a4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { tesseract leptonica mujs - ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix index ad340558bd..65e9f03de6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix @@ -26,8 +26,9 @@ appimageTools.wrapType2 rec { pkgs.pandoc ]; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/zettlr \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix index c7fb80e831..40d8b61603 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/adguardian/default.nix b/third_party/nixpkgs/pkgs/applications/networking/adguardian/default.nix index 21123d47e5..425974fee5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/adguardian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/adguardian/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IPkKiXuFN0KFlcrrSjLmML+O5zCrVRKEqdyV2xBsCsg="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index a845bb2bfd..97bf552604 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; subPackages = [ "main" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix index 1451e4bbaa..786f11d2d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index a78454196e..af50ac1b75 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -3,20 +3,20 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( - if stdenv.isAarch64 then + if stdenv.hostPlatform.isAarch64 then rec { pname = "brave"; - version = "1.69.168"; + version = "1.70.117"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-ZSFhbj/Tw+jOaFP2HHnn74DO2w4l37upS+rxLcF5P9I="; + hash = "sha256-FUomXWnIbuW8H0/r+fKEmMG8qO0vBAKUS9kijCbH5Mc="; platform = "aarch64-linux"; } - else if stdenv.isx86_64 then + else if stdenv.hostPlatform.isx86_64 then rec { pname = "brave"; - version = "1.69.168"; + version = "1.70.117"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-smLyA4eZAw62BfbPPFKjKaZd8FJ1FMSV1SUWXCFCzD4="; + hash = "sha256-54puHFpg3zqgORoqale9ZNgokn7q8fbI+240azFqrlQ="; platform = "x86_64-linux"; } else diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix index 0a4345593b..e94e1a93bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -49,14 +49,14 @@ , commandLineArgs ? "" # Necessary for USB audio devices. -, pulseSupport ? stdenv.isLinux +, pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio # For GPU acceleration support on Wayland (without the lib it doesn't seem to work) , libGL # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) -, libvaSupport ? stdenv.isLinux +, libvaSupport ? stdenv.hostPlatform.isLinux , libva , enableVideoAcceleration ? libvaSupport diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index b0b5fbbe44..1ef2e9d153 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchpatch , recompressTarball , buildPackages , buildPlatform @@ -65,10 +65,6 @@ let python3WithPackages = python3.pythonOnBuildForHost.withPackages(ps: with ps; [ ply jinja2 setuptools ]); - clangFormatPython3 = fetchurl { - url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; - hash = "sha256-1BRxXP+0QgejAWdFHJzGrLMhk/MsRDoVdK/GVoyFg0U="; - }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -379,9 +375,6 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc - # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: - base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format - # Add final newlines to scripts that do not end with one. # This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged, # as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index bebb279f1a..484cc0e4f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -16,7 +16,7 @@ , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium , cupsSupport ? true -, pulseSupport ? config.pulseaudio or stdenv.isLinux +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , commandLineArgs ? "" , pkgsBuildBuild , pkgs diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c44c7fc0f7..d1b57b42e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -21,17 +21,17 @@ ungoogled-chromium = { deps = { gn = { - hash = "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk="; - rev = "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8"; + hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; + rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; url = "https://gn.googlesource.com/gn"; - version = "2024-06-11"; + version = "2024-08-19"; }; ungoogled-patches = { - hash = "sha256-o/cEVLD64qYd/VIbmN/FCFbu7LgQsZdWkyxIns7/bRs="; - rev = "128.0.6613.137-1"; + hash = "sha256-3BK1HZiQ9SnRuMMviC8gm9ZLiu8ImceBlcAp24/aYlM="; + rev = "129.0.6668.58-1"; }; }; - hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00="; - version = "128.0.6613.137"; + hash = "sha256-8dKWu2/ZKw5ZthH1s5wR+h9b0aIqlDhNsPUrlE9DMQg="; + version = "129.0.6668.58"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index 8a129f2fda..3dd71ab810 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null , enablePython ? false, python ? null -, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null +, enablePerl ? (!stdenv.hostPlatform.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null # re-add javascript support when upstream supports modern spidermonkey }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ncurses libX11 bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] - ++ lib.optional stdenv.isLinux gpm + ++ lib.optional stdenv.hostPlatform.isLinux gpm ++ lib.optional enableGuile guile ++ lib.optional enablePython python ++ lib.optional enablePerl perl diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index b16e48e47e..4be907711c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1035 +1,1035 @@ { - version = "131.0b2"; + version = "131.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ach/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "c9990cb32583fb2a2013292b90565da186bc260fb16a3d6434b8a78ef17d7e1c"; + sha256 = "4763bf000a15940affeccfe6e3cd468a9a8cd89db8d790292272f2819c980c07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/af/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3dd479a3b70d621ce7381cb7f07e803f68b20008f13e7ce6355119f9ea6f29ac"; + sha256 = "85046ad1fb678e95ca835435aa0722552a774e2c71f0b38cb9d15ba711d37c10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/an/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8f0de6004ca227c5812e019addfb7a741afbd1578be8a4927cea81f2cbe3815d"; + sha256 = "353952993afb71045c68f373b590ba3a496981a365d2f4f0c33300f82750a87f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ar/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bccae4c45fb1105c5ce50ca93d7be805b97f113f882a05d8db3302f6ec0bb4a9"; + sha256 = "9965c0c302662f0863bce753d538950f0f5425575633f299188850505b9ca1cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ast/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2387e5a248e8abb1dd78370ef516823430f3964e0727e80c2a13337637dd8a08"; + sha256 = "b8bf592307c2719a448f9203471e3e71e90e1bacc41509d54a50307c3ac3920c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/az/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fb5f7d94787e989d5ae90ac37bc173819fd2b28223204bf3f1f0f2aeeb148be7"; + sha256 = "4a58014662c43072ae6616ff98c28ca8f54fd883329789c41248bf5d63c7404d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/be/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "77c1a76c060bb2a592bc23947bcd4ccc2d194a1c20198cc89c1ba6f6d7a11d56"; + sha256 = "f6845ab9a4715d92841973723c1126ffe10bf45a911c12cd74e3a09bdc1ad2b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/bg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c9f9983329f31da97e689cc48291cce473c9ff650fa9bca627fdcacdb0de9ab7"; + sha256 = "9d180594754fe68366fb37ae22c9a1fc20ee429ae997ef482f7bd192f1ece760"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/bn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "5237bc3516a5033f9319581672fc266737533cf0c022570f9140192f9757fa4e"; + sha256 = "8281a1f5577892eeba43c761c66c26d0304faab55d5e4579a6f977e26f3fd6ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/br/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d40b119786fe589bbbc27c2757ad47afdbeac5c74034557dd2fa4a21943b644e"; + sha256 = "188e8f62ef978a7113b648caccf581055f64925a170351169d193d8635492b97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/bs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "5a9301047a17a7d49c56c737820088e68cf15e591a6f452933c1ab0f4cd3a6df"; + sha256 = "b3ec4dd38cc6efdee0bea477f3cf804304d4b36b34b124cd969b7f5925009e30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ca-valencia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "613a9ee16ae4b37d909d488a5bda6d65a1fc6e1df8874ba746edcd511a22d96a"; + sha256 = "f2519beaa589ee54f69e0a5d35c583fdabe80df247aa83f7915e2370c457d8f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ca/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "73dfe3389ddba583112f96b06752038ab44ff180041286dd62678f0d629c2f29"; + sha256 = "22dd974392d30780b1a233406153082d292a7ad9ea3920f0afd315c6c9d7796f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/cak/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "2554a7ae05e5720aa4de9b6651c1ebfd3552be1a79a073d9cc9689c1da7a5041"; + sha256 = "6afb592800ed07337b807a6bd925c4c0db40c9d18a28b7976a88f349e0dc46d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/cs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7056248f297a9c7b83a9375641afdc960028dea9095027fb7f91f47191d4a494"; + sha256 = "5975de9356392c335c37136be59c157a0364238eada296d356429f3c9a3c232f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/cy/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "45186aeeca477721b1e591223035c602da73a176d600db524a63a4f8bbe00b04"; + sha256 = "ff96ef11edde597f1c8c4dce2da4d6b9c72e3652c911d7e34368a9dbdf5fe1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/da/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f7b2e52338ebf2b5aa8e9102fffb4ddf75a94f8311b574a06c5e3a8a112f6c09"; + sha256 = "620e6b7f7398e9942b67e41c6c850739a753ed46bcf82ce504c8e9912c46cd97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/de/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "19a7ac07cec385c50e8a6dcbaf5d5faeac3ee72e7bc4645ce15ad4c5e1fbb4bb"; + sha256 = "1bf2006d6c8c2275eab203ba2d6a0d8aefea199e7276c4a33019400b2557fe2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/dsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "6171eb0c139b26f8c9844e9fdbe7e468fef92f8d5e3a31064381ae40ea8772f1"; + sha256 = "600f9fd28335e4a86a79d3e0a8a83d8037e439426ea514c4257316230092d2bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/el/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3c2a38996231198bba30049bba2ee4814cf5ce9bc2a2e3710026d18f8b9a9b29"; + sha256 = "d14fce952540ab83fcea14b8318817138b93d4ade2fc95c38211e3888fcb152b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/en-CA/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "45180dda5e6444da9b82e0cdd2adb131b53c0d6be06f4a0ae34ea9e39f76d1f2"; + sha256 = "f54ee4901ce8d26f812f97f5a1aa803d46c3b79e9db85fec7d5d49ae78b2d3b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/en-GB/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "306c79853175fdaceff1a33a2212012ae18b313f3ba93a7dad625e3bd07a6653"; + sha256 = "cbc631160a71849b8f104a8e3486b750b1d1e614bd763c6f4aa67b2a8b804680"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/en-US/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2a7e7b15fca7e6651a3d8315d9cba3e4d8e25afbb69128fd5b68239c0a3c82c9"; + sha256 = "6b8b2aead8f8ad4ad979277e2af621ae27d6a2dc11781abf85f11e1a867411f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/eo/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "bf236d29b19e12e78239f4a09552935aeb6f77deca96337468805c5df4ecd67b"; + sha256 = "ab1c46580ab975f9a1318e23b8d8269b485c9ffd82696d2579efbce6d41a7c67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/es-AR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fc13435a3618c255bf65efdcae86ff3f975c65f7a1932da1c50641f3cd61508f"; + sha256 = "00e238aa562c1700d8faa26b0233e17f6185a2cc2599e7842c34870d9e0227e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/es-CL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "905e8383164734604eb3e280192d0df5da3137e8b3aa9ccff831a1cf763484ff"; + sha256 = "d6a1d8734908c47e5392670f68ee6bd413bb2d81635da5e244e9ccd7bdbbd0d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/es-ES/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "fbefc2e5418a3e53115e28b866ecd7032b5f88ed1d8c904fa400e3a461508138"; + sha256 = "ef25296096196e03c4d73156b0915e15bf5de0a3beca46693902e0bbdc276152"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/es-MX/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d1f57a866b13f5637518ebf693b86822ea6274e5173a57f28063b2d7af72d784"; + sha256 = "c41c0c851eee771d4c12a0296979837efc33730448d03a34565c326311efee4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/et/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "98c333a6ac8c69b2e3a5e268c26629d9bf219a8ebdb52a9e0e7367504c4ec929"; + sha256 = "810668f7056a9e025bf48f0e1dd07ca588b1e159bac5c406460f18372c8a126d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/eu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5c2fd8965b00717ab8d8c933a6d69d4bd07f0583b44e4c70c8d9457186323ed8"; + sha256 = "f9a7f2caba22a34d7363ef3e0fe2097ae577fffb8f410b5e4544ea4e158fd7c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/fa/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f057a01d986242da98a0df2abe5bc0d686ff710475ec30ff8f23a6a435106137"; + sha256 = "9ea0945da1a54c10bec5ae2c459963ae6b87ae2958b35a352ea2e7c7aca86e48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ff/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "38da1a609b176b9af9e20f21db54a5423d9d6c4a26719b986d60b3379bc00d05"; + sha256 = "103b3246e2411b27caf160379581b33ed1b749444903a4194b0d33f1b2ea3c1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/fi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2236c4a59de0b49925cb7c43f620fffd73950b147f455c010a0a5e3a4db8f455"; + sha256 = "2a25aa1fc5bc4126b93a47acb8554c4e337ab40faa5631b729b8f4b8b1278199"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/fr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "19727e4a8a4c83b7a185848cae7c52c04c6c7838da77044d8b9555d584623f73"; + sha256 = "57e5b8cb7ff457f22c40d75cd6f4b997afdd0b195f9d627bbdb08542c8bc0c84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/fur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "8302121f2f487a1b26be5ac001c9cae1afd2f68fd2d58871ae94983b32d7e1dc"; + sha256 = "3e6025dacc114d5798a74816d5b688f1b35fcd8e43664c53b2ae250790fdaa31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/fy-NL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "76c619abfe503f10de40d2cbe05178ca3753cb053b933681f0aad8e07a1b17e4"; + sha256 = "94868a793e8f2f4d6489832d2f8f775f41a1e75cc1c2cadbfc9aec7bb490ea44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ga-IE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4631e17e07b04a14c09883a220b131207b34f7c7cbf1ddc0b6e666b659fc99b2"; + sha256 = "1122f87064c7d34664a2c357ed572326b4722f2070d9ffb215a911dd4dee10e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/gd/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "091c7dd2e3102fe32a923c8bf4c3d063615cb1129c32deb6a96278dcb68e4b13"; + sha256 = "271b9616e87ae48d0a0f10cb354e4757762b8a6fd70d47c7eaf36f8175948f2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/gl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "e871c809a27bbc136db06c87445dbd0d3f43f50fd55ee45d79d2d464d96ac1c1"; + sha256 = "383a27b1a3811dd920cca825eff6d73546df6cc43c91090a3b2802d18e6356c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/gn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1cce92311e37c264f6dc4d90aabb9deb89bd7dde2c6d6ff7b55382b752492a69"; + sha256 = "3d91aa02daec75a4f46365fd2e01e2d8384b980de87a7c332e38f96b16ad40ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/gu-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "4bbfbca68d357a99d1f897b5b0d4ce258c73a589e02e001dda0d75f557e23fb7"; + sha256 = "4bb2617124583eaa98d78747eb815c0fded49567b0322f12691b0d9d92b1ac3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/he/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "de404be284ef2c97b178bb2cc9eb356360e38e6bda3e1bbff45ba6ee8ee1a46d"; + sha256 = "6cd73d1ed9d9b4a6e3b3f42eb2326e934bc63d8b65847bb86f2485203a984546"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/hi-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ad5df0b32f47f3c0abe743863d947569f260a85c72f2e6c947b64eb3c1431bdf"; + sha256 = "b58ede5f65661ae777ae357f5da1e07915e52a649421772bb5dd8b9194afc386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/hr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e7ad80162c36e523c119a746bfcb664c9ec7f291a0b5707a9ad97831748ce717"; + sha256 = "540b9e4bb100ba1498e39f4fdfa40d7d3f6607054c679527c2e2fdf679c73dc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/hsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0e1cadfe1e1e55378f50672023d98cfb55fe088a197fb471e6a4125bc62688a6"; + sha256 = "b77d277e46d2c4f855d3aa000da4e9664c93b734c679afe16b059e3b348df05b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/hu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "74f806bf4c09e652b61a12a654e8897c63b03aef7ee320d54d293a99704440bb"; + sha256 = "ef5519a39296a517876092ea902ba93bea1915a0d32f664e9a5c86e8933cf49c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/hy-AM/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6997cab5a37ef46bb714622e9f67084032540cd7a984ba7fb09f89180e4f87c7"; + sha256 = "4f50d666cdd26affa0da647af3df72b8d960bdb3697c5efc6b8537fb26813704"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "eba4d0113538440c15451370d9ca7ae0af01162df2bb1db6325a62f3b7d22e44"; + sha256 = "5437999fcac257a3d7d83b2ee8267fe142583a39e0ffd80b8abe69a78bbca57f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/id/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "8db30d33550f374f67c5fa0919f4b5346ab4bb0008fb666f9d1be40a2cc73e1c"; + sha256 = "2527e3f497eaa25bbe0650c249c3f07f9b1c451c74d58a7b47fbc542bf4fc01a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/is/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8d904a9b9fb6bb31569df06f8037278a24b9e67d8cc568aa4050223b05a7f82b"; + sha256 = "565db2c30fa3d51dc6061c134e4c428e7d65bf1d99ebe8c936e0f13b14e9ba31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/it/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d3df75b0ef5eb346769f19fcdd32622d94cd779b4a9acc14eb4ffb26460be7b0"; + sha256 = "cbfb895d5e01e2b4c80592dcf9a6a8a67fff3fdd926ca418066b52c5cf8af486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ja/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ed6c816e32628cd57e36f994f72b9b0c81f2b23024e0dc07c3518eee15f1af73"; + sha256 = "afe3aad601e339f649596754620a6cb41178e0580e2e04dfc3525921177ec2f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ka/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2e1c694a898ec6fd3f5d5233b42bd3009146c63c8e09a519c247276dad9652ae"; + sha256 = "037ac18be525fd286e58d3cca21a83a92962df5b5317f561f014536e71eaf2a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/kab/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "46a6a2f8b948df030a5e4b537c2750efbbcea5559b768a5d3478040bb63d8425"; + sha256 = "e26ad34373517016e32b6e1901f0b1a310870f2ce269e7273e4f3d5859c164aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/kk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c5280183a622b7ea71934c87b5782932af281d67aa603a4b51ce1733486badb5"; + sha256 = "ff379878de875600ec9c229153a37500f6f1b4e2ff0a61916698e18da0235b3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/km/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "ebb04de2a30a9b93fbc91f6cc89c859e7631e196ae95f9904614772ce964e646"; + sha256 = "abac0d85952087d33c02880c689ab47a8b51ff421e6e7d1f2703250005662e21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/kn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d5ae3eb95d76ed351a24b3f030d68fe6ee7a581bcfc7c24ec04761df5231aca9"; + sha256 = "a4fa0dbe1d51351c8ab54cc44bf4a3810a6919049e174d93c7dd64a86838c0c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ko/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a7a16542e1623fc82b77ad83bf9c246ec60255de20ce78c620cbffb983edde61"; + sha256 = "02901a60da1e4ac3b8b70579ae003270dccefc72c112f4bbac1e3ba38a391a9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/lij/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2c0fd0952b15f0d070db4c00a8785de78ea86aab7445d6127e2abc5a9a4ea926"; + sha256 = "2f4d71e54f56426651218df43cffae83d4a0da4f775f9e540d21f9e4e059d6c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/lt/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "16481d5c259596ed8433a033bd07f3030b7ad58f2261be66dc5956d0dfb7c06a"; + sha256 = "d27567298bdd12f95089983413d3379987b2842fd94e29761aa83c89908ab3d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/lv/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "2a244f0668768aff680432abec967fbd20d3c7efa6bb9f3c34511ae106287ddd"; + sha256 = "781792bdd0f5169bda104c1bce61d80e3dfe854a98dc469d5fd89145e7480c16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/mk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "49929ebdd8f4d83413ab36e9d5a23987c8eb46531c66cb9ad90dd1725540c12e"; + sha256 = "441acc04a7796fdd9a693049ac2a2a99e19ca26d5433158a649dc9054cc78bfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/mr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "adc5e2c30c9355c141449e2733820cdae86e49ac4199b2a15ba0b3eb752bf0ab"; + sha256 = "a45c4c84a08f969821f060d81e6537600d4c6f7be4bcb7967e0a1e4df8057985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ms/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "7d641159fc766377ca0d6421bbbf40b7f2d440f3f3d252ec692b2e34c9cda0d6"; + sha256 = "9a1f96989aa5b0f5f40bd9b89f813b586334165d28ce68d0ea811bf4b4377a12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/my/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f87ad6d7cb563acd82093ba33610baa572ade089cb9613744597327878a5f69c"; + sha256 = "3622b5b8c9af179a8a536f3ce616132ebd8d3dc13f67a0368c7190c579cf9dbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/nb-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "89e945519ac06076aac0ba6c9def4fe4f2b92c0a2d2f2feb534a01c5bb270dec"; + sha256 = "062a00dec6f88988674e0b79f3c53215dc1dcfd270f04f9dc24fc0c69cbcc3bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ne-NP/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "897bafcf344f15b09195d45c1de57d5463f69845e209fcedad51d6f1e6e26464"; + sha256 = "9a83d84d258cd1ad43dda913423825aeaa3e77f7c51fff699cbed4932b2fccac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/nl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7a29de71c0835d91c12bb7c110930b259dc34ef248164b7963210e615bb15aef"; + sha256 = "88f5a6ef96cb7aaff5903085988a43a0f5bd38c85e353076d150434986d571b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/nn-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2bb7286e8cf88b14ce6157fce0c8d8aa0c8448361b3b059d08a8a61ac9c389dc"; + sha256 = "0c226da7a894a8d13e6442b49ea60712afb95409fc0f8c786915594142fada35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/oc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2cfa1945617ce6c53ac1dbe2953253b6b41d205741bc6a18d21bc6f57a9600e9"; + sha256 = "54e231943cd9766431635429ba349590a9a80bfecf66eaad597d7c72cf4dcb0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/pa-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "eafc03d5b511fe7e9893c780d5fec2b3e997747c5a2c3afc46955bcbd896a245"; + sha256 = "c9dc7e8f3c8dce9ca52f033928e7bbcc955e06afbb2d1322c6e4156d2b079d76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/pl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "faeeb77aecdc5657f3fd484e4395024cbbf8500ee3a8ffce8ae869f7a0388814"; + sha256 = "b310f3ea397ab1c84c0e4481a6a8d95f026766ab757faa412e5963a883c01fb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/pt-BR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "85fa55bad98ebc45a757c434a0031cdabf3ee20f108dfdf44f93b3e74a7641b1"; + sha256 = "aa2881ab9553305e96544a534f42a476c26cbc206658ec2fe2b4927085e74481"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/pt-PT/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "951b6e5bbf5d993c835125ab976dac284ae31d03f29bc300886ee5e5a49cb5b2"; + sha256 = "a8b171efe5ea76a3dacf02931f4bc4373aee947c9c326a514618fc827a0c2fcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/rm/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ee56f0b20aab9ce5e2784ee88e8f59d48cc57a0ebbf1c0814a85cda022a8040a"; + sha256 = "8a05a553e9e0a35db3e871604c6921441d1eb859d9d05a2de8ac5e65ac3fb2d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ro/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b4f33e54f3224cd89287626c830e3c56a3f46d747e767862253172a93d407026"; + sha256 = "1873afb93447fc534b18370f8349e871dac5c8aa2f7380fec998a95259585d4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ru/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b9cc4d284f227aeaf76809698b8e95dc5cb2680d585cb189de163c23a6d5d39c"; + sha256 = "dc4c06cc1440b014a85a889ba019e4ef1a5feb89e870f4dd7ac687114f6cd3ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sat/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "499ff9a8a5c427d3ad414545280ad68ad9a93088b7fa0459c6224a3d25ad6821"; + sha256 = "562d52bbcbb8883bf4a790960dcd91f090b3c2f8899c03d0440edbe4a30a0eff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "627193966863fe68e2086bf1d858229ca3bf408710708841b99077ba5b487350"; + sha256 = "e75d71ba560a52a50c8032bf4d7df8da27c8cf8eb7cf4e9016e56a6377df1b5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sco/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3b3b59fab49e11318293e00d96a219963d976a306b199d4c3fe95671e11a1c76"; + sha256 = "e94f83e68516732fbbe00ad6caea44ae166c996ddd05fd2a7049c187143ea277"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/si/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "98e4d4b59154352973160eac694397fcdb2b1fe11ba655ec19d0a5f6b71b2b53"; + sha256 = "6883130e8537d9d4d8213103a75b9bc31b95535449ddbef258a602c11bfe144e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "3d1b2b19f04ab9437113573b5a7d009c612081e2231daa5b3979ac9e85f7de79"; + sha256 = "6343a3fb3b7c8ab39c87c5abccc4eceb9105c9f59e6dc8944e2a2dc7b23ac073"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/skr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "d19752613f0cf5651f53074ef2cac210f198993d97f0cb87b44d474eda4c702f"; + sha256 = "f74f73fda01b36deed700f0b089bd3688f60b76b61aa1444a1d092d7d54599f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "915bd8451b6e1e95403d135de2bb4a6117a17ebafb19e3815a81762d431a4426"; + sha256 = "5c5a2ced7e9236d0cdbfb566105128307bd0012cbdd39af705e48b262e85aea2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/son/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f9db6c9b8051b6b80b2210bb8a3be81c73f9095b4db90908e322ea1fd3869315"; + sha256 = "7e1bed00b5d0daa360a0a0b019cd9d4130006cd269c5e092ff48ef3288da21f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sq/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "426fa2c9f116b59fd8ad15d68897a5c19d75f40095a66ac180fb544dac4e5a4b"; + sha256 = "d49e5c8bc7d2be60ae98b4a9f07579ddec4b153b300e35c6d1aea2d9f66ccc8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d9b5d79eace77ab96e62f02f1f866fbac90496b9d5c1e0943e7ba6b1804d0026"; + sha256 = "363a6c7cffa7e5088d7253dce1e4981752a43a57c57d2183471644415776ce32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/sv-SE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "559b650e184528785607cfd40b544525a68370904a4abdb4b432872a3d2ddbbc"; + sha256 = "5a5e86dacac51bc734078575bbb394690ddb479830c95ace2520403249f4d386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/szl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "6d8b2ddabbbb2e717cdc7187d58023697c3998a57bfcb6308f04b1a2b4e1d790"; + sha256 = "cd8d6559dfef4999094775ccc7499170d5f41304215094e02a30b4c63017c7e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ta/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "08fd65b8caf94df7bf271648f4827253f6debe10f14517aaf2a98dcce6768039"; + sha256 = "a83ff685e9a0b45c32ebec720382ab696f1135457369a44917ec34ebda26db8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/te/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "6b8ef5680b1296ae57ea54c9ebd5147d87f5ceaaf43d4f872ee44e9e8a0f23fe"; + sha256 = "5a2d5f05b95044bdd40f89ba7110b74902295b51a9ac59ef3e645b241bb90622"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/tg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "23e45685ba9ccc9c46eb6ea3a861fc046fffac2bd86059061250846d3883f0b0"; + sha256 = "0ef5be4109ba6caafa91edc5ad32149fd76ed045258b045f30c1aa9b024428ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/th/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "82e4252f49df2cb35b5c257ef4c08f100afa749325e96ebd3fd19c73587b5190"; + sha256 = "5ac6d03de6aab2c5280fa880a13eec2cb228c02fe307e4bcd2e460cbe2f10ae7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/tl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "70b42fc544bae5f7ab07dc43304fd10420c55c18a86bb3b74cb34cf8059ba7af"; + sha256 = "6518de1b4deb40cacfca830333b6909f451e54d087fe6badfcd1c7dc6a32876e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/tr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2f42db7b6647e343fb9beef1cb75479dd5e8b31aad8990906e845524b3b14325"; + sha256 = "652367b86b180d5f9aa2fc2175069df9f00f270a9a526f6db3033df1e4ecf7ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/trs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "8e7fc5af95b97a16d0b5707db5d5f851a4196c0424f85ceee7b9a898cafe72e7"; + sha256 = "c949531be0a24259947c66581cb30c7e8ff0e046cdd5b80616ce32c24d4b394c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/uk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6671da86233d6d304d68399fb53dbad024487a4ae7ce313ae95df550ff1d94eb"; + sha256 = "9b705eb1ae999334bb3a652aed2a69b1112f7bde18b2463aa609f6ca82237304"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/ur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "151e8382cd3b84341665b66c46e6997c67ddcd81691bd4a7339066ce84795bb9"; + sha256 = "f9543650db97d04106eac07897faea7115e1ee6180996c3c94dfae3a5d34363e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/uz/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e2ac70ae5d9caca55075c179eceef3df158930e13b4d1f63edbe344948d8b841"; + sha256 = "aedadfeb84a3efe02eae59f806d827edb36271aa3c5ebf46e4e264ab937c6ab7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/vi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "044fca4a71d6cdeffa5ec6ffeb6b75f641c22b49b8342bea20ad4ec4f3527c91"; + sha256 = "87dfc6ea7811478111a426ec5bd71bf13f30f7d8161c49570124e23092fedc6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/xh/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3bae5d8e468868e6eebb8d80c4ab0373b92d2887566987a4189b213cf8f36ade"; + sha256 = "95ecc4eb6b769de9b2d30cbb04484f3845d79f6f097ed3d4a61ea5e231faa93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/zh-CN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b8648c1948f18765ab0bbd2d13dacfb4bb6c0a8032d4daeebc557333283de33d"; + sha256 = "15475cf50d40b86141c1e870e24d280d79678885977ffcb417239d3948ac3d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-x86_64/zh-TW/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "958e426965e47c1d7db25abe5a00f35dd38077c77e9601d54c20c036a1e1a226"; + sha256 = "d3e80bda223fbe9ee08bf1f6e094793ebb0ef1a16fe56ba58362e6c62a22e546"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ach/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "97991893c4e89ab7cc5a22e43b89fee32ed2cd80c1325be7f76039b5e4b26599"; + sha256 = "69eb32eb9819bb9d01b77d10e5429a8770cc2970df5c460747dd7335ad0877d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/af/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4ac7b5b100371901373678cd58619d6de725f89ea7d218c50caa803a3681cf4f"; + sha256 = "8e2d978913ab8b2e8b8bec9ae3b64906ba1cf0f71bfb79e5f942239659f6a5a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/an/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1d0b6773fe02456214076248586edabca921e913009ab2778a057ba04337fdb6"; + sha256 = "5d361f9a5720a958e58757e23ca8fd9852bf6187c3ae9a90b8c0457991e6847f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ar/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b3f82cad6f3de592af56625232507451031193974f02010ab0883e249f82d132"; + sha256 = "614b31438e1027d427fcbd2cc49fdc149c407c7c7b58f2ebb711fe152e0a6620"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ast/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1e6e631c2e7273e0e341e0081f3f872d0197120cbdfe98013873dada4c9be5d8"; + sha256 = "f9a7ea4bcd928db80b1abf8bfaa375fc685e142ff70dfe892e414672af2312f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/az/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "90ac918cfb41b2b460c13dc40b8ec576a180ab13f66ea810f580984b5e8fa867"; + sha256 = "5cc255cbe0df8bd7441f16cd6337e64f335aa06dfd0cb1a38d541a2e2e4d9499"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/be/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "91ff2d3690183dcda998306b24f6d4139390878adda7b963763949b7c6251429"; + sha256 = "a4724722a484dbf404897f0c9f387d1485f50032f28560826445a11d35c4059d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/bg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f906dca7aac66f574b84e15a8fddeec8d499b0d3970f6230386393965a1670ea"; + sha256 = "084c33231412d7e6770cc730b3f33db1588889bf64108cacb19f7dfacc6694e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/bn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a645bf29a18f834631c8c6f7b53f9fbd97155ad09f06aef7bc6116a6e0137e49"; + sha256 = "94cb150193c6f5ead5d7c06fff92ebe5c51291037f10b5e9e3d9d51cf910883c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/br/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c9dbaa5e72c9f17b70a02cce041533ef80983d48c0993d31730daecdf3911151"; + sha256 = "78e05cf9b8a735a28ca2593a2e729883478245579f32d6e8b11b247c5dfae586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/bs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "3ecfbbfeea76c95752291d7baab2718c9128d28352f3cfa3ac3994daacf09473"; + sha256 = "06f1ef247527e3d421bac33e34fb4e46c97a866f14c7688517dee7189eb3267f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ca-valencia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "4ff48f3409b635e39b1b5883ebf0150ffaf838debb0b4b89dcd7b5256ac9205f"; + sha256 = "3ff3279d3adfa248b650f57a4f6fe094ab75d3ef0daf4b93a55f17685341e896"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ca/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "72e9d216b898d91c789ec4bb9b92abf89ae4f8983ca5136560a05a006267a54c"; + sha256 = "ce26536d2db9581f9b92c1e386cb172546df4e0f7cd40cb54116b7bc66cfcf36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/cak/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f426eaa0640d262fdb16dcfe1323615cf65c53747f4781dc9aa58d3410fdbf75"; + sha256 = "61629cda585866b87d0047adc52b733df91f5ac46b161e955cf3c8b7962750f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/cs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "31353f97cc34ab88d3e94b12235da5bc00e52d0edf6e5dc62d619670d35d6ddd"; + sha256 = "8d365f87da2d7c2b396e1bdb8fdafaa4daa2c7421cffad935e24e40636fc4036"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/cy/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "634c947d8fe8a9bba512f7a9d0248615629366b652d794a11da1b207c76476ad"; + sha256 = "69d62b9ca499d51c99f796a91b58d9bc52bb73c4883ffe48982b74c1011a1d94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/da/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b388b508f75a351a3090f38d45dcb70e73f3cdd48162c26b931e26a40cfde213"; + sha256 = "6f8231de644fe6ece3e5d8765585aaa2f781a2d0502895be840503600d173c51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/de/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6eb308a30ca441b82115b01cde6d897b9998d27369353df3687e54ef694fc455"; + sha256 = "0af79c076391c3e809d88c53f017059ce673b16c91dae44fe314550f99f1621b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/dsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "29a6291386341fa6d3e97fc07a841c0ca6e4d2b846dc2e8e6736d88c93131ce9"; + sha256 = "584be70610e13bc2236cbb6c8e3ac22ea487b8dbc0edac9c05e74bf3171558f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/el/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9f527587db9a4343f2d381a0e5e2c876f51d30c2c8688f105fc38866581080e9"; + sha256 = "cbd65e86e40673e20fa15cc487cb34b17bb07a5346f25c4822b7037b3ac3fd5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/en-CA/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5f01c6c0d6613a3350bd519a7a37a95841f87fe9a5f5c27d389cea82317a8c94"; + sha256 = "b0136e885b4562b74dfe89e92b9c2f4db85693b218031e7fc5540baef6c44e78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/en-GB/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "9945eea085fe28ef26824c086fe45fc896292c99b1a71935db05ea7713ece682"; + sha256 = "52e04c5559b439f51cfb128a9e2e3fc9167912162bc945da81f6be2355f50e64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/en-US/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0403a9451e6357969501b71dfc6e14028689860f7464d3cba3be5acb60be25e1"; + sha256 = "93f50d0f65931e966fce4efc049967ad413a9eaa6a3a0b73bdd160bb11cca7e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/eo/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c2e53f49474a9aeff7b1a02b6a45cb6a960b6b61693a05ad1e69ae64a6ef170b"; + sha256 = "63ecb54b5c8640b3cf4302fa61639d25dd8d273e758ccc0d43c832a67320e240"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/es-AR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "33d13e9f574fbc0e6776def6ef6eef232d4cbcb8bbcb9d3f2ae135a0d87c786c"; + sha256 = "76a371441d463f40f676b6333b5e041908ae1b53cd584268941232f57784d4fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/es-CL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "27183eeeaac246a05d906d47f189cbdd1d84cf87ca62461771a89086e195d2e3"; + sha256 = "1272fea50d52e07512d86468f55c79222d8d10fab989326e7cb26596d60694f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/es-ES/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5792b8fdb894711cabce5d4d089a2aaab0cb1cd233b41781a0105d21267b378d"; + sha256 = "7080509303a493851c8519533f95394c97f4e48cb9edf4c71ba8015fcfab2db2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/es-MX/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "733e6e5b68944fdd7a2652ab4e120effa1e1f9da4e4247220b542d0e0693eabc"; + sha256 = "5a8d79d8e90caff7607852d2516fe46984f3301e863ea676f6df0426458a39d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/et/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d94cf2e52ffbb132df13f2f5d99799c29c9555bbc4a9aea54eeaf142d8b34cbe"; + sha256 = "51bf97a75d98e0229712b5089514ef98ef9418cb2f81b0aa417b35b93a91b238"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/eu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "0f8cf1fac74f24bca46e04c2f7b546f3af9122a59a4748b46c2b04f87831a733"; + sha256 = "ae4cb5677424112ca885b9e685bbff7973ab5abd2346978f1df4d04a5ec9da67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/fa/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "edf8e40552ccfe14ca1ed9c6cb683a0b68a704344843f3cfc4092e5ae02b7ed9"; + sha256 = "6b2285a462be10594c197bf77443f3adf74282d9476c7b61d105f1e56faf274e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ff/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "53c95e555229de889160604d1e54e86dc0e34a00d0c0e6539f3a7d3eb4576513"; + sha256 = "63d7966b3f3888f94c2572a782f542a0c8d0459070a980cc10ce6596e19de55d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/fi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9c69170c6d6c066c9211ad05ca23c8679e134cf96a3e9e71be60f31ad26d312c"; + sha256 = "9fda1052b11868a54132c45791e608da9198a394ead4cdccc4c33641fbd99639"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/fr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "310b5c497059a9a56589ba4a90a05a4fccb3c5d0a713f4544e61720df4f2d3f9"; + sha256 = "e05ac7d8b58060da27f51a54e9a42602b9c703a4ecea3f5516ba3bef5729f78a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/fur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "6c8a1ae987d685ff0260a3383e6906a93da4d382a1d2d0f5b88aa1c2ea5cf3b2"; + sha256 = "84f48f7f053bc954c6e3a0f49d6037d87eaebad140442e24ec004cf570f4e04d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/fy-NL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f29f00187535ddd2930ebdeba6091947acff7df77562a5996353714bf5478aa3"; + sha256 = "bee16b840dd96e1717d847dc9f0a21f39bbd1a0e3dd7d1e44c6abe570c2d3e11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ga-IE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3f347420c2d83a7d18841fa1489c7f6b6179c765de62b417a7f35a36320d42df"; + sha256 = "3cc432fc0616bc6a25efcd7b8fb7ca531a46bfa6daecfd1f9e6fd8c8e6de1567"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/gd/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c400d275c52e683ec3c9f18971620622ecd6b8acfd39d6f9784fe212bf88b893"; + sha256 = "b2e82175ac46f60330091ae4988431ca99589b5e29ce2164831374201231002e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/gl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "af9130cccdcbbd15ea6e1f8b0d5368cfedb2dbdb2bf1aea76ccf19b0378c11c1"; + sha256 = "652ecc427d7db1959cbd13b8a6b3eac5bf460d75615318b3e33899c09e2c318c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/gn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "42e4368642f9cd1862e79553479aac8777f6e2f26a93ed2f9959d22a59f42c09"; + sha256 = "af1b79fd7cf0ed1f2694065c5ee1f8fb87d34a472524ddee78757d30c2bf6583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/gu-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "57b7fab40bc05530cce3fe1d5865e8cad4949087a1c37a89d47e5e3693f5516f"; + sha256 = "a88d70e37ad783bfec45f5f3546df2c2ebbe42020bde496dba49aa2621079e44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/he/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e99555290c258233ab9612e644b782c5ab463bb414606cfa61f9b41972d51708"; + sha256 = "f3b4435ae00f6be336dc0c7278250f4b8c53a19ece0b32148314aa3ac3350efc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/hi-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "3dfc6e36012bd441b58bd924d67e70a0cb1a6b4bf6755c1a960f687ab477a2da"; + sha256 = "41c595a8811d5f27775d99acd340a9aa8aa0678e8e4da525e0df68bb084d73fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/hr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3116907d979c1d87aac667e174d17a94e9afbeec1579c987f752f120e35dd94a"; + sha256 = "71dc76bb7b7f363b30821ef1ceee50df8063e50c55e922233843a3830bf00753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/hsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "42c35bd22c88423294c1ffa3382b6c2219c2e6f11c022cdf3d13eabb41bf89a0"; + sha256 = "eb19898c2578257846f822837848aa5a58cadb2e384e3bc1279f283872bba988"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/hu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0eec84ef73ce7c2885afe9a5797f50a4b1d39934d34c4eb20c0f8d235244d9c0"; + sha256 = "c99dfa4470841565a60263940e697ea6068627ff6a382895a5b6644cc05d5485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/hy-AM/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "86a237c9bdbb18a3f05bbee174d3f4bcd82e8e50b7f8bec237a47f644e54ab1d"; + sha256 = "717a9d71f0c4e9f458c7743ebc2653ed804c21808bbe33e24df46734d76c2929"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "240a1b270db5c3e8ab6a936cf367d21c9141c1e410a34d16d93a7ca6e90d5299"; + sha256 = "66bdcbd7b27e71d26274614863586364cab5362a1a4e408da922f72fb5859fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/id/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6d4df22e1a100e6d0573607a39591c61b35b0b51894014e907c37d256ea05975"; + sha256 = "916eb11604936e14fe256adfea3904d385282d470cfe7b822d6d24826b4f5923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/is/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7eadf3f009d11bb54e7ba28710b9fac3e048ac03863913711ec9249f63e4c1ba"; + sha256 = "c7922e665f9b382ccef7f3a9e50303ccc6cff61976f70a2dd8f176dc6efcc208"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/it/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ab2e5d83172e0d9381fac1d9cfe88eb33c9f36a914d96fe25cb8080ba02dba34"; + sha256 = "f4f7542197a31773045c365c3cebb432b272c1b0ebac49bbbf2ff2c39bfcd91c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ja/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "80b6995c26479cdeb07a455561e8be6182c04b05abb92b6060627cbc34ce16fd"; + sha256 = "5ba99b8a6904ff53cc4488824ae3f32c708752cb35df030e6973fed9ac9bc6be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ka/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "3f4cb5e3ca42e31219968032be4ff1ed3b0ec87be625e24a6a0bcf3c3bc096fa"; + sha256 = "f02989fce1be1761be71aa960b3f70327d747bc8d71e8ceb10da06f2599f8a2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/kab/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e5a9ea86b4230db260c0c3ed8758cdc4fb7e6896fd4b54fe240b70a7702cad87"; + sha256 = "02b6b5c873c2f2a68071beb86df22e25b7b2aed1e2d1f4db955db534e6867c56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/kk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "e1eb39058db37d4d783eee2a1ec95fb28c97617e354ba956bb4ff596ecbbfdb4"; + sha256 = "57305885fc575780f61b244747ad99d694204051ee0a6812c5d46d43afc1f4e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/km/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "6aa4621b0be763e07bd32d2013bdd0e6317aa79f73fd24ed482e296edc41102c"; + sha256 = "ca423f1155bd45bb60d84bdb257b1c223e847735725a780d64c16d05b599dbc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/kn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c1014d6bef1a8140c35850bb3cbddfa151a5f53fad410800262a89adc6e059aa"; + sha256 = "d3834fbbb1f9441a377bd78bbb6a1433fca18ef67215bf4bba17642354aa465e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ko/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "9828bcf554d7fae9cc9979a6664f815fb106d3f2f19d20c7345f087b233fae3d"; + sha256 = "f57b61412b00d9942691405691b0c4ab71eefabcd8a2440a4a1207aee913da78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/lij/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a1ed36475b49109ddb3cc3f4e48944e16037728389fc0fd01204b257f971c8e2"; + sha256 = "3786385aa819c46d4d2403c313e172ff5548f5ef41a8f8cab9cec0de2661e3a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/lt/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4b4306048fc9ba20cc38d9c851452015d815ddc7285eddec9c54fdff78102fb1"; + sha256 = "8c9d2b0f829947046d5707437e53e98b56c36811bb4afd081a214de543c90e1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/lv/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "081a77fbea9de7611c9bdccf52f5ec482bf2e18be5879501b6649ef84e84d9af"; + sha256 = "25fa85bf802cba0358f01e9098306611baa047bbd796b9c1486179c4e181d4d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/mk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8a7bd3f7e58803e31ec7c21b3b050ff240c9657c6dd692b0b53c20716e0015b0"; + sha256 = "1b5bc7720849a702206d07439adede9f06a3dc36df1aaedec87b11bd464cc950"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/mr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "39deffac69c15faa2f25e7ef2d90a89ff366a7f555d73c52d5355c1b60f9a027"; + sha256 = "8d75634cfab7c5398c5dbb1d198d80f3a530ca6be9492fe161b103d67fa3120f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ms/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "3b7ccdea479b9c8586e2800950c035637c17f4d6529dee506a470b622274ac57"; + sha256 = "b255028a855792af9c669b2a12e80dc6b6962a2fb64c29bc9b46e39b1a7ef83f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/my/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ff239fed9bb48818ba18fe5422162041ec93318184600b3c182662b2ccd6c283"; + sha256 = "ef1dc83a189e514c3cc446724bdb2325ccc806c7389acc85f751bb7356ccb9c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/nb-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "cccb3044d77f50c036174ea14dd625f727e9ef9a315a0b1fc47190cebf711d69"; + sha256 = "7ff5c535300d391d5db869189876b2ba6c7fd8692d8acb32b23dbed587e5d404"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ne-NP/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "e3a4a4ca38ff6958c1c013ac0b157af59d11f49ccb2298ed5ae9edd2fc0b281a"; + sha256 = "645e5f730f0678cce48e727b7d425b16197e45f259fa73ab2bdfb8d29ea0acf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/nl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "49999af37532a33d81acfd71285ed8a58a262c85b506d5e0523e8d2eb5b218f6"; + sha256 = "38fb818029706b30dfdb3a133190a13b7c30ee62472a17cc2591ddf3403ae945"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/nn-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3e1c03fe336a142bab5a144ab1b7c19d167930162ea34b0bcbe764b9a7007181"; + sha256 = "bcb08b084bc0c785ccbdbe7106896b81f77e1ebfd1652752780abd9b83390a70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/oc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ccfef9aabd07e1b62028455b67393b7a887d3e0cfdefb4207346c4154b49f73b"; + sha256 = "79e27d2a621ce64315cce6c38599e6d12c3b18de06c594dd33090947daaa6c43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/pa-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "3793f4a1cff10cf7eaffb3d9ffdbf1246c68eb2bced32675d83d4dc886b2e7bf"; + sha256 = "bde16ef9afdcc989827e0e014d69abec3200ae07d138df5c69a6e7c9787722b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/pl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "23b9020fc4389b4894f2fa62b01b377e0035662cc32e59e95b23a0d5c1173ed3"; + sha256 = "9e8665b37b0256e5ac0b62a88967ee337a5ff5d4625f7ae43cb13da7e51ad162"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/pt-BR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "960644850b676942fe265429b39527eb6b9727e47cfb647146874410062202c3"; + sha256 = "66fa6a0361d64b6d2bec784671c77e42e0fb70db3a724fb57d5e4349ef1a4f06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/pt-PT/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9443c923ab02318e548588db3ec8cbe8b20ea9a007695f427f8759822b8a14c8"; + sha256 = "5c3b2f9f8589fee3214b3458c716214675b22608a76974ee154a0a3794ad4fb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/rm/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "52eb1c27f8c15850ee917e36ae494298d0a7dfed5877a595567e9406ddf09f1b"; + sha256 = "0338c62aa70a83c6782065db6196850e7d1a8e7c13475aa2971c2ca0995fcaf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ro/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f5f8b2b8863693ac0d14dd1b3d8db4e404d0d399960f72c3e736029b9718bd79"; + sha256 = "545a96ae03334282d9e915ad3970cb655346600c3cc87f5a610ea56ba56fe859"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ru/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9e5b0d0b02f36c0fd8789e246cb0beb0ced42bc2c33b4c4343db1334f0130103"; + sha256 = "774a98da6ecfc67e350499bbdca10e694734e77049d6813f3a11102ef2786b88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sat/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "83d9a18dc8f4b1aac931d75915e9d62ea944bb14a88caa45721a416761245f8e"; + sha256 = "3fc563859c2bb701e955646b03d5f8a3ce2d0a492e247416c7ea826f608b2831"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "3934e0fecb003b5c1985ab5c8c2140d3e0f54d04746e072d04f23972ba52ce17"; + sha256 = "256844a0a7e79bc42978c599caf07def4e7b56bdf0b6d62dad6304d27089fbb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sco/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5587e3365df2e3ec53e0e5fea88c173346df63ac4d4e4df515cc7a7dd0784771"; + sha256 = "55d6b8153cb07c56bac006a0180ff5ae52e3da539c907fa6fe15dd6f950a284f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/si/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "475a88aec14fdf8ae17441d93af180826cc4f3f82bd866f7b7a8536b732ea4d2"; + sha256 = "5aadfe21cdb8a6f8d590e98905b9a17ac5730825efcca007ccab8912cf25108a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2ef0fa47b80107d40f8ac84ad86d0649880b06f980f42f610f3dd2bdf2b147f2"; + sha256 = "a73b49d89cb5118f4e20ea7b14d90b5edc20371cc15356197a10c1f3b41745a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/skr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "1eb5150e259dab2ac1f8d6a9443ad59d23d7021eb44d168dac9d7115543cb375"; + sha256 = "0d0c1ed8d9386207385a76466aca1d177d4a516149b844ce84a8b132dc862529"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "cd22b0b06a6100edef085d36423e62e264c6fcddcf9fc3a230fc3f63168c79a2"; + sha256 = "b4ba523ae509389b0889fe4e68ebd4d1ac5b2f08ebc625e16f9dd6a836ea72e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/son/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "81b04faddf1af2d223c73411bf89adce219bc080a0560f645caa17cb3aaeabb5"; + sha256 = "795d063b0f00c2d5926642347faaa9ad422f75f1f4b241b617b8c52426b0b128"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sq/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "290cd6b1832178c9a48853f18c48b911fe27c6c4d4e45eacb33c4049e5eeb2ae"; + sha256 = "126cea5bf67d1acdd1067c2b58e358a9390857cbf9ca16248efe936809bdf36f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "eb55f8f489ea3dc4ee401e7571a03f104891578cb2c3ee10aa7eabb1584ac019"; + sha256 = "36d6b5b278c15f4e127a70554a2705c7058915379bf1ff3fe9badd14132425b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/sv-SE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6ff7990fe959f8c8e94704ab4a49ba47b09c63ccf86288df31d07f6185a4e17d"; + sha256 = "3fd7c4a21d6ab6784bbe9b0c01ef736347bb72e7f9565a97bc5ee7ee1eed461f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/szl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "61e03b1fccf6801e2af0a6c71a0d6e7dc87687c562deca3cc9a443ca24a51e03"; + sha256 = "9edc91448587a79b753df4a9e7feaed68311a49fad49c5789c3041a8f4d4b972"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ta/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1d554b2acda24fd6676f410d04595f9bbef3ad3868d9291b95220fa8e33ecca1"; + sha256 = "4b39cd843483758060b930362a30de1b7adde0a302c77391d41486df87c69fdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/te/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "f75107d57fc705f0805628788a0768431d7ce7f058b74ea21e436c6394559ab1"; + sha256 = "80f4fa70c6346e9f652d8b3c3aa95cb3a20944ee221a06c82ea071368bcc3f52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/tg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "32c90a02a756d5831441cf0afac51bd2405d46f6304b9213737796839569e845"; + sha256 = "c7de592f571c993eef41bab4b119a268ef0dc65b869b5fb66cfe822aef2c8a06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/th/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "a0435fb6cb07e6146348934bfecbdc1c0367fa440b5263a2b7f167dbb54a5099"; + sha256 = "6c1d86bc94fa30f43886b1738ec3461d89b7a86b9d092cc5196a2deb4e7376e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/tl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ca4a5ead572249bd35853620906413c26f87079804c050dab77ebf4d49bdfb0f"; + sha256 = "d878d17dc8a81b374cafe3859bfcef1d2a9fe7db63a274119c4193020948de8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/tr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f1cc876fb326acf05ee7131b99082e9a225a7bebd2ff04b2f99bfa461c39eff0"; + sha256 = "6648c0cca250c0cda65d2aab1a3f6499c8c6f3b1e4b02f718b241dcc301ddad7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/trs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "48e2294a3bdf51f36c6ac5d3d3e06a94958d7b089a1b64b86a3ebb2a8ff13705"; + sha256 = "b6f00626c19e71f33f1f36cf08725925092e96fead027299d3490951e034e352"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/uk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "58701ee6e7625050f3389ab2818097b98a18be0d6a9b8296704c4af093e447fe"; + sha256 = "646fc4c5329f9105141227ef69012a1e6cae85013e036cfece228a54b6877b18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/ur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "41fc8eee6cad9eed61fba05cfac6da4ca29a47a5fd10eeb7a27ccb99f951bdf7"; + sha256 = "bea7087f797cfcdb18329f0c86aafce64fdd73fba2229ec22685af49b595f4ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/uz/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "7a4b55869314674f90c1750c82aa4dbce86c65228daac474d3b27493b06e1543"; + sha256 = "7fecca7f57d7491e106f9e278f01b21d970a7ef69dcc8a24d32d18813b52751c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/vi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d139c631057f5aeafff892999c3fe27074fb1414fffed37b2e1162166ad5f5d3"; + sha256 = "9fa33db48f39195c7b7f285ae8586f8683d919e4f2e716e6a5f6b54850a93f7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/xh/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "22de6ca3bd5124e2099a2f5a3f339bcfcc0434a61c4d65e11b4955df9814251c"; + sha256 = "3fac756c551fb0dda8227f0ecaf9822c18782ba809abd3b0234c59e192756da4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/zh-CN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6bb3a293d4d90bc017c5becc001123cfcfa249fe61b0f95587202a97a1a805ad"; + sha256 = "df4cd8674914d5d79908a8d1cd2456b5bfe5b334118bc366e360c0216c93a79f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b2/linux-i686/zh-TW/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1953a07116edce3d7cb71c91f84fe31a0b090faa49fb7e6b0f3301a783c63075"; + sha256 = "d5cad971712572a8e1377c3cecfb8365f5ecc4f313e5101b89191b2e55f8c69f"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index e42c1bf202..6e28001ac2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1035 +1,1035 @@ { - version = "131.0b2"; + version = "131.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ach/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "a15b07e635c564459dff416d88c6ec1156392b3bc564682da44469ca0efa0b50"; + sha256 = "5d23fc3bbc20283397d0cbda4a92e15e872e6b2775a40c7449fa2e181c53d622"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/af/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b9debb19343c9a4e424c1f3aeea0d89c4e13fb2b1dd61c884d6462a49a0f45e5"; + sha256 = "dae4aa08599af741296083bb6684e0afb7b07dbcaa57b13461c2fa7fe293b1fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/an/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "988ab0191c6e92262f168db5ae5aed0100a375b19931038e619faecec0a8cd31"; + sha256 = "8cc59a067ffdd783c959765d1b766e0fa7a3944a3df9a0512a7f75164800151e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ar/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "dab93fdb53655ab5db8a74fcff6d3e1809d6c57200e99579242438993734296e"; + sha256 = "46a7ebface84fa533e02efba45ba3f79903c6dcf245c8bc83e94b4d764559cfc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ast/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "464f0b4a7b41553ac3f00358b5d5c96a30e5d34aa35a50ff106d8604bda1b439"; + sha256 = "01c8d108820f3dc05c6a20bbd4b4393ea790e902d7e862b313de5ee5f753a8e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/az/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "543d51109b379feb8b09903c9e467e9a52f9ab1e32baea10780ae4841c1664d9"; + sha256 = "62d852e798a9afadbd1071988121264e6f2edd535da26b6dced2f25046f62821"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/be/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5644efef5b52e5e22e48bb9a6c9c80ce042057ff767d070921bb504fe37844d9"; + sha256 = "6731243528fdb724cfc4b7c0788c36382566a0433680e90ba2fa2c3c72bca0ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/bg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "66d375b4b9932fe744a58c42e5b8c1c33810a9a0174d29ab7764cd226bd4f579"; + sha256 = "21a5b548853da294e6611306f8d1cf37aa423a1942a8916ed27c718f73f65389"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/bn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "dc45242a621c590d9e9ae9b437f0d9193529427a1fd0040ab109ba2b7b8eeb53"; + sha256 = "e0bbff5dee6e723709f1a6b00a6eb3a65087f86a55d2ad332dc04a97c9d1ef5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/br/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e1baf50c2bdbedf6df0841f9c3f2e6a3af28cabfd61979c1f5fc3d28db5294f2"; + sha256 = "46123ea811833fcbdfa8c829d35807bda86aa87135ee62786bdf56619de390f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/bs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "87d68057d0764a2016bdf3411170a40e710eac51201bd9624b7421ba6af30477"; + sha256 = "c9dcd5a31aec57425584613da9e1d681b42a9d2304582d215914694ec515edcd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ca-valencia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b535f50c13dcd5e3e78fd4372cd35e8d9578891b399b294cef308622066e86e2"; + sha256 = "bfbd17e8ee5bb1f0357c22b4f2b8ef6441199d1cdeabbf1d5609b66b5ce3e52c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ca/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b5894bcbaead1a13015540e96f6b64f244e318df2ae4e72344bbdd72dd4da535"; + sha256 = "63fd254507c9020d439105afe577b2d1b98686f3a2bd30d1bf822cd48b81a991"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/cak/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cf523b5a9adeeca511584f6c846b30389c7eab10424de816c59950f4fcac1062"; + sha256 = "fd5605b3c0509ed82750c392bc4d63d58549a6a098519e464fd75e770e5a8043"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/cs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "80ed0f2770921f6a5239a106b779157e0b55521dbb28f97a8eae2cdb92bf2e9b"; + sha256 = "4d654ce1bddcfbf9753f718f8babec3764a9f004d1e3313c1d313777f16b2e6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/cy/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b26793b06003647cdc5f5804301ab0990b6fc2d5f343bf134db879598fcdc5cd"; + sha256 = "35290ca239b98a9d3a8a7e3c8663713510d6f408a6f3f3fa0176b803be562cac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/da/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "527b091f5b32f537b652510d2decdf83c020b9ac0d96c0a74a324a9f83bb34cb"; + sha256 = "df722d1f24f74a68197d11a05ed0fde3171fd58c62f8866748190ca8723bffba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/de/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7e28733a2945165ceec86b109af4ebc29f11300041d9cf9b06ce4b2eb5fa2c44"; + sha256 = "bdcb5f662d993041ac07e3f8df43f12182625b530e16a8ffb8a93afc1438b550"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/dsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c4b300aaa22a9985f4cf4477b8c5104d610fcb1298e369128a4dddfdea4fb1cc"; + sha256 = "13dfae0e4209179d65ca6a5f34362a3d24a0845f8360c99efd832e29d0903493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/el/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "071b4bf002a3df848666f8b4cc9e8c4b7e5be7170568db55cf2b9bbd8868d3c7"; + sha256 = "91efa139db7bcb46958fe804d2c4b6e043310a0425c14b5d75b39f75b9a558a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/en-CA/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5d7ac8eba3a2ab679d1cf231f326df1a52e18689f2d39c0c79b23eb269d9d0b"; + sha256 = "5b43cf25b3f333267071048c09f5fcd23a8847193a21ed8e1cf6c18c03b8e8e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/en-GB/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b2cca72526ff4514e3549d052678e21f8dd040b9cbfcc1ceff3e8bbc9626b77f"; + sha256 = "17f4a3ecf88b33c38e0e2e71244c4e3e31006b8d4bab5344608ff7b9be7bc11f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/en-US/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "33cb2df923c068c823da9ca842da4508ba9aff67c877294afb27dfaf65541ef4"; + sha256 = "215b879b59ad0ea3dc40f13a97d3cf15abb98893f6b4c6e130c5f2a5cf91d2e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/eo/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "68e10ea2b958736b0dc630ac3b8d948ddb98a4311da8b0da92143518ee782950"; + sha256 = "3684b84ffb7285d9d8cd50466b138533ba7ca24d64fade2f1ac6dd9b67fd6176"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/es-AR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "38952e054c9890a0a37c181bd6a198ff14db04d6da97017da80271f08fcb427e"; + sha256 = "c1af34c2593df1aab4fa0aef07f05e28592fa45077f0dd6bd07193e04f40e448"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/es-CL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "21c20bab8e03a0e2824817f5281757c099563203396a8cc948d12abf5e045bb1"; + sha256 = "36d1b0301608898a9a44175f5c96476f75a56e238e1ba21efbaf17ba76d1dc93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/es-ES/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0a10508ffba6d20df24848263350e4566e8b9b1fbd475598e2c94e7bc9bf980"; + sha256 = "831cba83275db5a854bf466597a65959042b4508a8e7a3f2e15766b02a4076b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/es-MX/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "cc1c88722291bb59cf8792223360643a7e7e44b6cfe61175defa0fbdd818b144"; + sha256 = "9a237406b8b3d5ba31a2ed0cf37eee73a94f6dbb8eac5388f1be125ba7991d36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/et/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4dec05d4a7c0764d2a057c9609777bbe4f14cf83fd9910cc786fa6a211e0f200"; + sha256 = "ede90675c7b60b1119393f0bb44f43a66bcede102179a66ebcc3b2ee3fb003f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/eu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5b596006572bff1fe2f83e0ca845627c005808a8a003b2898856fcaf2de994b4"; + sha256 = "c5137ee601179644776e011a8556997336fa0e30269999bcd4a669c775343009"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/fa/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "27960d5d5080b501e6e3aa0452890d914543a3954df319a09ce7a2a11daa572d"; + sha256 = "10b9248d3cf3fa2047ef33c77d66af15be77db5b8d8a9ac3915d6873bd0a1096"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ff/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "07afb9b14e324f14d4a4f534533e0070bdab25e1dd526cb38f1207862ec9d1ff"; + sha256 = "e3f8473b8a630d634b1bfc7394d2c19419154e9d9aae4d98aee415b5c4c677f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/fi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "811056db75c5fc80a84adba0d2ab16e64340fd4ba234da8daf628f4aa4a15538"; + sha256 = "e37afad7d7adac7b752e9a2cb5747b37151bc8b750166950b97e583c5788276c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/fr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "de3f15c14e37febf9ea9577e32bcfe90b2f0fd9e439a12f181b518d8eeea3ccc"; + sha256 = "44cc3c181c8d43614e23c2c604869187ae5d4c42e2417d0279701159953b7e43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/fur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "0ea5889a93161719540bc44cba38c81c18552637486dc9b57c3b8a33cda19dca"; + sha256 = "a77eea411bbde78c913e154f9203411759ccdb9d4f5817b2f0b1c5363b6c110b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/fy-NL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f48d3ed4f51ec066f24da9ed43ee31ea8ffd25c1f9df48715ebd2960e2f830ef"; + sha256 = "57c5020319ca48d7ce3d4d4d641ff4c331de7e945790ecf66b9ca8bc74083d33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ga-IE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "94c2480312e1daf62452b4f6ecb62b4dd30e6bedd64d46314d6fc2860385dff0"; + sha256 = "7d52078700bba3faf5b61c9f8abcef8d0a43c3dfc634f2f586a6f18694118565"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/gd/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a244f79782b0bf6a985c085b6592ffa0613410049081cd1bc2da97cf4cea3cdb"; + sha256 = "90df77b9b18eef8d8edd9297b14262d08e04aea580c28755a9197c08766fb79a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/gl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "18a0e05f2ecad2df6393dda0be5a186225b6a1836c538a63f527dcd7d40c58d6"; + sha256 = "02f4408e5b740f22fd46cff693cb10027fabf3dbeca45323bdea971394a98f73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/gn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4e01f14c2f77fd1aaccd4d2ddb2233ff0800ffac906d3543ff77029fcc3d3298"; + sha256 = "5f3ce545a399088846c4be2944137caf651839485c5010c75e1a2e15e6d59ad8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/gu-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "85886fd743c31b8ad74bb6d4bf41b80cd50aa07cd0b7655a4cc41f3417bbac32"; + sha256 = "0c33796cf29d3d3e3dc98816d1423456ebd4ae2a278ca8fc93651345538557db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/he/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "2a5ec34fe9c968a35739b406ea0dec72f55aa61158d31ea484676e1abfbf8497"; + sha256 = "c341666c31e7398e878bdba16acced6430abd872797b39eddb6d26e536bdf845"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/hi-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a40b47f0f454616cc2a2eb872cc5c7e6cbc8b73ed1d8d0607d656e1b81d03e73"; + sha256 = "be681b246e18d59046560c2852094794ea5261d6c05d0c8fcca6b0f2f807abcf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/hr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "83249963c01e219065a466b80893343f572dbdd26b4b789c8a94b62217c53fdd"; + sha256 = "8b6c52bbfe03b134d57f6c70c1015803e02be668a146d9d46772fc9af9692ca5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/hsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "201a236eabad92261f18ee041ebc7e8dc38f349f0ee037396963d5e220f86dcd"; + sha256 = "efe5afcbc5c08948e45b741f7fecb39ebf849038212cdb0b15138b1df633d973"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/hu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "02565b7e00fb2b304333473cd76a102b58c6a336d793908e62916896a2651680"; + sha256 = "53511396b0b54237623e058755df8402ca2f9763dff3d0e72f2081f600c089a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/hy-AM/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "85a266c691b3b563786749714377d9a901029cc3504b15a1e8d23e5f44ffb157"; + sha256 = "ad74cb9d1aed355cce15604ffb0ddbf6b3a7beb08730a6b4b02d8d35308ba32f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ce7e7f6d02b5764c1803cdfd6096287b92ec206b75842553a078782432f2eef3"; + sha256 = "6eff25d61aef2e236097ba73b2f061376d48247ac58a6afd1cc274a032a4b4f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/id/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ba1277184a984f589e799203f52e218115170a34b6d18fb62b1c5b4cdd337263"; + sha256 = "1f5f7b6daf3d56107e2c2a21a4ee550e21adda704bc6bcf97a42ed6b100795e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/is/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d3434dc002b08eb5dae460d442a4363613baa6b2bd879b622d1aecee496e5a9c"; + sha256 = "39a639d414920e56ea15d1a4ef4d07669c1564d4592fc4f18b7ec32a6244e757"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/it/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6c91638eed03743a70ade67a854cede886ef38d355d9550a43f5d99bef47869a"; + sha256 = "1b2b683ee7891e9f80435a2907ed7e56fc2181924ce3ceea2bd117a0623a29a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ja/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b4b61c17b833d8b239072cd70156553df400c9f47025d56b34731650e63f6aff"; + sha256 = "bf4613f48cbc4babe62da9db153fab829a56d45e487e5a84aa8b893e43a2a320"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ka/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3bad61be00b2a89cac518ba91a6627afc0276010ca17f2b21cb79639002d08b1"; + sha256 = "a0b4ae597421b37dd05ac425df62b66b1c332d6570c7164fcc491bf783487348"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/kab/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "02fae0ff2f7f5ea81758a4f654e851c578d8465b833ccf0781fbb81cc4e29dbc"; + sha256 = "ec40e0ad8dce0ca44e586d9729121494c3d0335cf7d2a49e780b0863ac8e940c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/kk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "64049868349ea2e28608266166a655717ae6444a67b79d86e78c572a400f1d3d"; + sha256 = "15be145c49e78a637a56b947ff40238b0a8dacf7c0fa740d0376399fd8a9e4d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/km/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "ef3fc319a24b9c1e42749e59648a75b6d621c7a8f77540ad4f4871f117a3a260"; + sha256 = "f07dcc06f9924664f761fa7964a16faa5cb49f610a2300ce78e592ddd1ed241c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/kn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "6528d92766f33ce937dc2ab12c5a4fb71e6d09d5bda573e7d054ff093eb34a4c"; + sha256 = "3ba0c688d9994d1787b08781277b62b5a7f20c7211820532f8308b5914b32398"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ko/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "b2a73beb9efccf9132304a49b0e8c34e83d3aa41833b37c9a013869c53ebbe93"; + sha256 = "f827cefa00ab62f98a7eb4ea0465a1512afde10c46a44a090adc8e81af15b893"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/lij/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e5ec29d0161a03a5420994b36acd05f65cd2903c917eddf228a59167bca27a6d"; + sha256 = "f36747a714c88e5493739a7d466c2cfe09bd4d19b091433b944308271d97dd40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/lt/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "96c9fc5100deb445d4477da6595f501b5cf51c318087be0de9dd62e93ae75ae3"; + sha256 = "f1e295669af7a2ba813312702c537d3c29f87fb0c08a0505fd0bc3cd16df5892"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/lv/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f09c130cd53c9f4f508b0424ad40742ad6e8d7f5f27ffd79c6aec59054298b2b"; + sha256 = "b0b0842d8df5652feb8f05abe9da0f6ee2e0c97284bff212c1f0f21eb22a308c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/mk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e1e1a7ff241d79c1a0250cfed68a3c1c7dfe878f41f4c21a99f669475468f836"; + sha256 = "1cbc64f7677b16f1b97c4075656c16444ebbc5ee51127b53c9537a672ba3f9f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/mr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7fabf0258b09fc6e1612c3a1ec1883209cf31f1f46bcd1a7e9dca965c1e195c0"; + sha256 = "75f76a10b49db491fd6602d6b8079e5781529d0b53a3cddbcd8a31c390825592"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ms/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f328ae1ee5d985911c7915b01507d9b969f6e1314719326999c6e60b7d0e852e"; + sha256 = "2eca2edc3867dc8360149a1437370127f394ea6065b44fae22ea4016effe84fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/my/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d8d386a7be77cbe1da7e7277eb98311042c25738f6b4882f4fce6be397d80012"; + sha256 = "c6b56c8ad919462b543987e486a8f60c1636e8e2a1b3cdf1465db9cde5501d1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/nb-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5853a35d520682265d5d8166feff047072c1f6ebe765e5848ca1edfa3e680532"; + sha256 = "9312201d3b6e828161802a790cc04e0426c68d9fa943fc8dd95704bf91fd1a5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ne-NP/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a8ad6160a59ca2bf346f2f43d5271fa7515ff4b322f6880c90e7dca770e69a1c"; + sha256 = "151c1d81c4f9faea32900eb2ddca5ecd565e09be04f300c26c8210fe4a92bde6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/nl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0f692ddf58e19a6dbf36e1b54d05e6998577b84643a01b834a0b971f75ca42cc"; + sha256 = "4dd12d7ae84478954f2a9f35f7d7c4ea0cdc99614cba6230c9a278ca04981989"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/nn-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6eec25f4253b1e884fe56de4dbc4fd98c7b03687410bf4e792485b54ba88419c"; + sha256 = "9f3362d620af4311bf9b349903ad0b61320f4ecf4d4ca5d0326de5190d48f7d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/oc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d68c257852c79bb17eeae54cc6f25d4e18cfc976e18ee9fee1c0970133bac41f"; + sha256 = "2ee6e4ca52eed0ecca2464095e53f0688fa0522e44000d3ed47ade39115b129e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/pa-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "af3dc3e0de8c615ec3de9cf6210fddba9e55d3a3dc775709ef830b1a87be84bf"; + sha256 = "5457d47b7af9d2f7d819e5702d23df6128e10d38c74101928b58353bce9afe8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/pl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "129059ec6e5128d50859d88415c1e8ef735e34096b04b46d234e59db4cb00082"; + sha256 = "3bcff5f278d492a88c5b0b975d6c0c3d70bebff3a61b04a7fbc1e6fd332bac77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/pt-BR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d861f344d9e7048f0589e4b4d0bef292930e7acbfbe7e8c52ac46ab7adbfbcdf"; + sha256 = "183e23db5fb34ef93b05b7462a877f654462ebc56abd7e2c9314118978df80a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/pt-PT/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9e9fa1d06ceffbf2b2b09b4a48be4117711a79517669d712545ba66786a68d58"; + sha256 = "4014365d5231361d68e7e4959e12827345c0b80dd948e25eb3df2355e0943525"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/rm/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "81e3f85d6997d47efd8cfbc05ec11ea0a3a85515950b33206cb9117955445352"; + sha256 = "4ae1c4d6fd687b7d0327e734476a922a4b6520d25ee87ae3284a32a12f870279"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ro/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c7494460ee9204ad229b1d10ddf7577fa1193b36f2d0dc936ca4734a884f5216"; + sha256 = "1f42f2438b54dd695d3672fb097adf6855c400c980c4329bc53bca9d80c12c22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ru/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "72454b21ade5232858f351d498fac8fc887cbfeb6467496e9d5c6a69bc6acddc"; + sha256 = "345ee0426d557861b8b4c1be02b3429f77615eea3e66fd6bca455819c21d1058"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sat/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "b8d085c30e5cf5c596546c17336dad6ab45643c092fdeb2ec8fcc4e9bdc5878b"; + sha256 = "4d92c4a392be6012ddc9a5c815e066e4918e74f1ddc3d00ea1433b3f1bae52b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "32749b74e59fc497ca26736fc5f9089e582286b944e5b983f59c6b09567fb968"; + sha256 = "5c92a730192ff70822ea02bd0a1ecf3e9df0ecbc15c3b85da6150880fafd2e7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sco/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "bf30b861402dc23f0790163c98d618a6296ee65a7c9de79f53f9328bbf3f52d5"; + sha256 = "464335c80b3fc31fd418f2c58088af114d50d49f80b7bbebeeb24963387bc3a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/si/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0bccdfb28662414f59f0c82a7e25e8b5c53147f4292f89a805173b5d76daa994"; + sha256 = "ff7b9c7607d4991e8bf78a3e1010760c090867a8c0ebcdc4dfbfd726ec820a3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4444253292259a350cade5e1c02baf09eeeec51cb9effb92533c55675799bf01"; + sha256 = "015d7fc92041f3cc64a63d0ac1090c00cc0ccaab77af4268f986cda4a790260d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/skr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "1ba6b5cddbe419988ae776799e5d1c2d88eb3b0a54b5bd8f02a7d73f074130ee"; + sha256 = "3b78cfa124aa7d22737c0d7c3e4b076ca10bcf6f50ade071f41d2ffb7bbd54bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "48bc62dd3111b65040aecf7bd1cb86ec3477917ae1b790873d83ea89a9ab780f"; + sha256 = "1e4d45ffa94185fda9f83228820ac2624455ac1b41b16975b81497c9b8b019b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/son/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "181732570eb8975e0ebe0c84e625777b6d74deec014c1e72719d94a3aeb701f5"; + sha256 = "9a57563e84acf0815d1ba359e0b4d1c0d942456b2275a90c43fafd36aaf158b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sq/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e454e4108c605d3843482fffbfebd8115b8416ad984d70d2cb2f5a0b622f97d5"; + sha256 = "e17129b474e50f6cb8d378f79b7c130ecfdc9d367601a01e65eae1a5540c1dff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d4b563250b34b6075018e8cb4896772c5e5d9d33aaef6b1b08aa764cb008f4a8"; + sha256 = "5f0c52f956d17e194dc9da90ca1c7c034c6227ca7caa382057547ca048b71328"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/sv-SE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3ac78a84dab71d2f7a6442229201f766f28b05badcaf31c7daa529d7d9ac5d9c"; + sha256 = "086b7dbf44bb89dc41a3c71d59f5bb4becb9cc07db98ea8dbd9966113ec1fae4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/szl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "e7b03a02c813d3d9ddb9feb12aaa879cfe92e78074f72e01ae370310bb5cdee2"; + sha256 = "6e7b7660e050b19ef15626f472a9b50af497ffbc306ffe6bca959c10e68f3b68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ta/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "72e20f72ce648f4103947f87aa3de1bcf8667c6ae6e4652f1003af969d5f86eb"; + sha256 = "8c9075ec945fa0c4b7a096116f9e5b3f286b5d16afc8476f2592676f65308461"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/te/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "331fe2ea48e88ede83f8c8d83c77eaac5d83d060b75d9acf09b5e73371c81e1e"; + sha256 = "962cea48a963d71d5f629f26f847713149d05f81ed2fd79b0e7615208e652f0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/tg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "4c0e8e7f5d2b62a52599395f20ec9ed92b8971e63e8ef423674bc48a129c025f"; + sha256 = "09c8afe3bb1d0d3e8bf071d52795700ce4ce0e6f1c124f4e5a972929ed358d90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/th/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c7e31a6ebd5ca2dcb2ab9dd30e29a113cff303f9759956743fe5a205827b23fd"; + sha256 = "c4caf317e1312b71ead7ebf0b21d2cfa1678164d9b248a79484912e783e2f271"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/tl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7d93ed9784e5c36ecd2dc995489eff5515921b043ad6c13105c313921f605bf8"; + sha256 = "51bb699925ead8433d377b53d0de721ee32eecff70552b6ab61fdd957cf862b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/tr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "35becaf88914644712e191d7fcc62a747e9b5e17d62ee166487eb637968b7152"; + sha256 = "f7826876af8917cf652df4009ca6dc22884ce4d40247d3506bee90a7bd4687d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/trs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "6ac663d999a26efae3f903d7eeef86ee8a96bda91a1b3db013e3690bdff572cf"; + sha256 = "5fb6ae81bc8c1941ffc0ef38b06b31b78b186c426f394d4a67f9be4d63d050fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/uk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "72e28e842866ff1e9a2618b5550190005d6ff804a9c023b410726b2bd1d58d62"; + sha256 = "eefd6322c99a3ba93a4fa786d31f0f776eca34c9e63d0174318f1ba1a3f0d9d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/ur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "383cee83a49818872ec5af39dc73bd9a393517a74c72792d0481b4fb9b174911"; + sha256 = "8636ef350c3f91c8e69caa2b8470c16cdef28d578c2a6938db0ab8b456f174c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/uz/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e912580ee1df1a9475e9fcaed09525a55523b3dc91d54bc0a497f114be634076"; + sha256 = "2dfe1c15b9080bd8779eba2e0eea8c4e04231aa7e0608151b8bd17c40dd20c0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/vi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "70f1df480dd19fc3d7094a74de3c84e56bc96ae2e37009e0fcb34478629d0b40"; + sha256 = "2f1784e6c2ecee4b1633e3ea76df75514bd6b16e4f4fafcbdf3777598a2f2c77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/xh/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a32aff9f32dcae91587970ba18f8738ddec94ad2e4644d57b717aee3fe84db55"; + sha256 = "ed6fbbebef7c75c3816413bef61a580a663b8d37e38b519facb26ed4b77cf53f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/zh-CN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "46273e6146b077dfb06bd0ddf930627d39c1b1b7ec9d3aa99f47b0ecab8c7349"; + sha256 = "3a637f025f932a7e5101901d16c8e216d3db8015924c5abcb50d019c5c21bc47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-x86_64/zh-TW/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "637f30d282e441e4de1e1207deb575041fce4c588efef018804d759da31c87cb"; + sha256 = "6eea1f043278ede18f67308566e2dd642504700be6c16a7259225de5a604505b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ach/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "10d1a6abe789a7fcc452b4100af6e8e6b2065fa7a622763f51b819e6349c887f"; + sha256 = "50fc2e2a82193e3268084a03d6498bf9b5e7c1d20479fc40efb251e879c06b22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/af/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f68d38fe0e630e332522cc6a4c64b6dbb84ef5df431b4dae1724ce55a4512b6d"; + sha256 = "5f9bc2c288b8bb864aa211b0d2f49814a99c3a098726e5ae6ce1b0b42fd5eb6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/an/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "bde24baceebe1f9fb0905d1d0115b4b03b95cd48acbf10edcd0d6d670efbd0e1"; + sha256 = "76a0c952bc1c8365645011a19fd1c75e825766f3c40c46c2fc743c10b9a0eb7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ar/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "788761f8366cb8ef5a3552df4f447842a5fbac3ecace966200848bef8c165931"; + sha256 = "09ac88d33dd97c815fd39010e7dbcacb24a509879401fa2f91ca0e79f54fb238"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ast/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "30367f4f3b9c6716abb0c8c9842054d3e05750ab5f773bd35d4edf31c15e2e9a"; + sha256 = "fadcc3d4873885a5c93c0f4c861b4ece2148696a5dc8997110a782008b922048"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/az/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0b841b48bdeafed1675bdae7d139ed6d31bb4e35188fdd9af8fc281fef4e8a95"; + sha256 = "4cdf4e03d5d9b731769fca3ccb1eab680ca662407f4375bc2c9b152001ea242a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/be/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "aa93452e5faae865e93ed23c9c308d2bbb8b2570e3f852ed42bcf563c26a2824"; + sha256 = "ced88b8e0c8850d0c4452a199a6716061380d22596e4e24e6511be176c7181f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/bg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a466a2b421b4653322fffb9f6507796e4d0220d2fc1a0d746d457a8b54f00c74"; + sha256 = "034377422b59cf060c8bb7bddaa196f16917f4b70c11c1a566f0bf4fc5fcb40c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/bn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e4b94d81854d089a0c2f2d311287fcba418dba4e6d38114b0489211729dfaaa4"; + sha256 = "af909704445b29982a81a34d5bb0cba22edb464905cad4c92e77489913fc32a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/br/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "94d75f5d9252b7a6de90dac31098eb44d13a0f9b41725883e4124e7f1f3e7784"; + sha256 = "54cc7cd3b036d57c9a5c0e5fc0ab225585a80bf787bfec394acdf63849715bbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/bs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "36b19d3ec09ed6060f40cfebb18c6050273fecf004323514bd223b67c2da9632"; + sha256 = "5840cb0fd187509740d69939419cc44a3e25ec567cf92355c4cefc2ff209d135"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ca-valencia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1bf357de13fb22aea5a73cd9ca979b5f266c77e48fc6127f44ffc2e95e15d1e5"; + sha256 = "cbd42bb1ecc25d4ffbcb8d8cba9953cc0d55358f76d13ce1db7691953e6c1f68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ca/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b1216e350a620ee2c6d23e19a742a59c2fcb89c55283cbbb574b5ab082c8d825"; + sha256 = "d8edea663dd8452b9fad221430d6ab71305d28734ece2ee79d8e8b29c875114a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/cak/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c602b8829f268684a06347dcda8228ab3244bbd3c5a14831be95bacc41813455"; + sha256 = "fb08af9b0ac43b2cc8aedfcef69996f80fcab1664fa4031ac52bf9236bcf9c59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/cs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "38a407cd2ee815eb835b8e59677ae2bac2dda0e41cc7f30aa97d9972c63c98b4"; + sha256 = "6369dfe17841c9de4b3b5a93032c559d35e67c137cde1e4181aad414e06c5723"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/cy/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "dbcc3f8421dc05c66ab8628a98b84f1339f09d9ee2f0ec732507ff506be20c26"; + sha256 = "0bf424ed838344a98f81933de64b033726cf66ed9c8eb3142c21a10c8fb01f0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/da/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5633332913e7723362eb35e3b6ae0b9338f794e59d363ac4b958e15b294b2a67"; + sha256 = "1bdb66957a5540f3768ffea9c0c23c2293fd0fd3a66aa72a2fd47768854015fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/de/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2b605709900dd9000be03cadca3dcd9d91eeb09305a687b17853afa9b4869f85"; + sha256 = "88a3d26cd16051096179b93d3e048e6fdb07a66453e037ede38ce7b4ddc63c47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/dsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "cbba7735e63e5f898dad4d7c055407bc788009da536f329252589ba3fc08293c"; + sha256 = "bc33daf72d1f2f53baa59cc247ad7ec81fbed391f310bade3a944378b48d712d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/el/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "596154d0f45838c99c8583597fc013b5a972ce35884b4b89b7bdd3f592a3c8c9"; + sha256 = "6e67db3cc25ea6524d27d061802fd927cfa30161fb7a6fbe0e0503be6ba90073"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/en-CA/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3100646892274154e1d3473d69a7fa1dc2929487063879ba2302fee3b9f76f5c"; + sha256 = "74080ce1da63f5597e2bcb2cec2aa293e514dcf80832188c2ea38e0c9b247dd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/en-GB/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f0395c8052f7990011a48ae91f3dde8ab2062ca74ae7d06b617f524c22d9a8e4"; + sha256 = "71f04becacd320bf673342a72de1f68136048c489ced4a31afee8ebeab2e0db9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/en-US/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "950f1b9d764c60ff8c29d305a8a723954a962a2d6429d1e47db9d0a73b390409"; + sha256 = "ff0ae00d7685165a47ca2e6c29980d3fd24a2889a36c066993a86930022f8d0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/eo/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c53e5beeaed680414d83ee901984fb075fe485989bc68fec3d8b48412b1de823"; + sha256 = "b3bf81f117985d8baddd5b14529c139eaca9a9a7473526aa89f63465fae63689"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/es-AR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ed5a4b0f8ab26ab009f22e1d3296a48303df423b4cab9817e52d829c04e1f3a5"; + sha256 = "a45a2fb851b0f5cc16abb0a8db6cbc24f63c5670e00bdc03197d42c3700aeb4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/es-CL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4e7ec9cd826698a8f6dc2157b488f06c21486b67af4674fe5f8f7deb24aeb4be"; + sha256 = "f6b399aeaae4afd02ff9ef1470c4ac643f35ec291e63da1d0bca35ee80441838"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/es-ES/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "f8be33749ca8ac02c8b3342cd7306ffd07e6417d11a3b18f24a1e250efeb856b"; + sha256 = "1cf8e064fbe3018a46083120d7a0ed54273a50608c2f3c4f193d5454128668db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/es-MX/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "0267e502cea015f33729f1182f16661a411a33454de05744222d6e5b8da50a40"; + sha256 = "47771d5c6a450babe2df7392edaf3db890e74cc0ff2a840fa3073f147b00b692"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/et/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "817099d19f2b1b12ea788dd5fbff56140dea3c1d270c5b49b0f1a5ba64a79fe2"; + sha256 = "c945c1707ecb99efe28f1c954e8b24a30d7ced8efef70e12aafc27573ffb8eba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/eu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fecad9bd4b0d2c71b0f960386f50cf4cd3f32e195c644e705de47c651e47301b"; + sha256 = "a7dfd698b4ddb847190e5433be60c2f4e439eca168a4069f772f258f741f52b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/fa/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c56b76077b8d14876913b192462331afb70ff3dba348e8756bd7bcbb9db949ee"; + sha256 = "45240bf84f0f36ba76eacd45eaaa50764dc31b50024516a108bc7a0874ed7fd2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ff/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9c8aaeb5d66ea7a5179200f1d41381de3a583d16685aaab26c83f29da7dd8341"; + sha256 = "4c7437671123c8166010004550c4f537b7781a7f0cb613b2d410c8f22b9e9e69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/fi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4f7e981ae58cfda0000aa2858297584e408c2e6ebe771f6bafe599bf4ab69e05"; + sha256 = "0deeec3c2641dcf2fae91ab2ca9f7bfc2baa4da60e17d4f3222f771d9e164da9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/fr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8629bc2b792d80536ee2b1641dae70f072d5aa1c0e428dc5177f13809c7230a4"; + sha256 = "21c640f55ab1eadebce4d95126362dbc133f4354dc8eca23cf77041bcfd8f621"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/fur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "90f4980c0457e46ee9366e8b7f7cfa02b07a4c5c998fbbf499da16746544722a"; + sha256 = "60ceaeb0cba8de73fad46fc8804f1f53fc332824636de54fc25860385f332e8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/fy-NL/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "88b8ffbdf5d64531dfc6db58bc4e631abb295c1156626bdb8b4e4b3af2906053"; + sha256 = "9c3d979d24bde8a5b942243144c2e99efbf49dbc0b53f467646f4ada4d95beb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ga-IE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0c0d2132c33fd4ef2d7862d6cd88ee45b5dbc44098f7783c6956dc1a09bf1266"; + sha256 = "aaedb9933a1d01338d4d22f907948b00c9a88fa83e80530e709bcd3272c5aaec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/gd/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0a7c71cc6198c13116fa4b04d0386b83ee51224d9a6c6478e1844a3d3d35b5bc"; + sha256 = "85ffbc7193f6957c07173c8522e70fe313dd116bee3da52588f61bf3cddff1e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/gl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7c1d002f57dda8c08d3064a96ea160a3d1bafb940d77287d1545dd798e0945d8"; + sha256 = "54a8bb50e9d497728bc455285ff40b53c7ac663e6b12531e17dbe18019bce19d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/gn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e66cdaf9f93bce4f2fd3849c06a264f02dec6b7f4dbe2d059080064f0f35dc39"; + sha256 = "348a0de7fa8d1a8a44d0a4b3de48e7f377e5af3a6ee1a6c5c87d5f3e67e394f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/gu-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9e51855ef23101aaf18f6286b79ae9de0edde1e0cd41c88f7ddcec2e1af97794"; + sha256 = "4c5bec0040ba7c7c86327da0936fb82873986535be12aa61085b5fe2fd292a83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/he/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1dd1c0b40e50190ab2465a927a6c65a5d1053faf09f9c77220c2b187ee208edc"; + sha256 = "2706293c91fd55de743916430cf4bc410a53efbe563f5c8794b6fa212b767870"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/hi-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7fb6f3d6d2904d8743d250d44fa830d860ba92999cd9bea11a7dedfa62b4dbaf"; + sha256 = "620034e178aa1688c851bf618ed05c238e89a4611652d8907bb56858b0a88874"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/hr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "573b83f58efeaed4d1256debf984d6735666afd4114dd92fdbf0acb7a262eb8d"; + sha256 = "b168e24590ae4e74620ac279982d3277105f01e57b4c7b014965e941596960fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/hsb/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "3eb00f5e7589d1279fda9ab9e09934fa1b5f26fb2b35fc847da07ce88f5084fb"; + sha256 = "6a1b831ca8b7400962a051e2308c67b231dad5f331daf371440b73f02f15e305"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/hu/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "352a5ed506e40fe46d515fb457dd541c73c289abb3e3f9b549636bfe8e2fd336"; + sha256 = "c2db40b3fa0759bae7fcde219b91cb8c9d80548fd8f58ef006ed58696b0272f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/hy-AM/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2df706367aeb9f6884d8d07cb0343d32907f7e70f1260eece86a60fb9ac850cd"; + sha256 = "e59f4ab6b761122b271f600ce3e3b2045b3264793ef4ba0a5f786f90de227a7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ia/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "b64e205b1ad8242e19c7fa0ccb4bf0c92d62f98ea6f0c78afd43ee45caa8f08c"; + sha256 = "cf212e24c3be50a4a82f4e85a4363b1c9561441a98e2711eba4035f3d70e37a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/id/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d0dc6f47ced3c80a8a045f4f58597226d9d3c509009fdbc3a57804286d80d203"; + sha256 = "1ac9397f213d1563840b1644c93cac4e9fbabce5d64d34d0d26cb2ad9cfb4e5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/is/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b4b72fa5ddf6d9e41e03700fb5e47086b315a0ea051e6a353ac9bb03320d3a50"; + sha256 = "4b35afb37dd26bcfb2d1085ed52729624522c71d28429266896234be6d4f4c01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/it/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2b1eb137615cc2da443e62acba9c5794c39c18d78a5baa2aa1f30f0276b24d8f"; + sha256 = "49cfd104dfb6990e0d710e5f00b0a2261e219306ba79ec4c0c781a7c7434e7c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ja/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "46fee266296716aa877d627ab2d67a65fb0fa787e17ae1fa93ab8dd50e6b8799"; + sha256 = "f22221daeaedae3617119c7f20967fa4da9d31e3dafcaa7caaef2373a3aa6c9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ka/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1021d74c233895173b7a05d1c341fcec6e845343844b84af1d7b4715ee209918"; + sha256 = "fc2f5b3f2d5ce8ca01e8a99dcee1711d1ee4023abb8731de5ea46692c4a61290"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/kab/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "9050a2091fe9be789d3057d408e80581163e165c735bb2123a776cac71b602fd"; + sha256 = "055280c45f00288396d36c256526a5dd64adebcf3bfe440e9c9ab2202e55ab5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/kk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1863174d5320cae7d318c0734cce48de96939b20547cd33dd19e18b64b77b99d"; + sha256 = "0a5317894efdd746f0e8d40707b0c0f33b8b84edc05df0c4f9002c884902e081"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/km/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "de40bdd0637872ea249b452ca60a7bd1032af46ae86b6683bb2ac0961deaa1b6"; + sha256 = "8c60941a34c898b3856ea187e975a7d6dbbb73a505d5ebaeece645d35106ca59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/kn/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d1542e0a9ec3d72ba1927a1008329e858b1d4d7de02d0e35049b544ae5c3d6e5"; + sha256 = "93513224080c9949528812a3da30f0a6e178240214fde3c97d1fd9cabbf08598"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ko/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3c78598a3c93acaa407da2c77c94ba8c1da2710ce2e5fd10584f77572a4819aa"; + sha256 = "5dd5a0d16fc17f9e4cd252f2ab18a12c457a224b2acd163329cb1bd705f05bc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/lij/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "584fe2ee7f78d02d63b1e1e06460291f7f8dbb1e834f61fd13aa145ea564aa2e"; + sha256 = "c54c0e099ec3dfb6355a79e1ae2ffa1298a21d786e6b5e04fa9a428872a4f717"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/lt/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "11d4564be84f3e00e2d4b7fe78e71a5f6bdc7a1e8b3863a9595b93b7a335d6bb"; + sha256 = "c955b89c4d53075394cbb4d1a68e3864522e7e2fb24422917828079ae431f216"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/lv/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "df0e6b1a0e81d2d5c73e83452a78335e0cedb48d90bf5b0f247d53f549881e08"; + sha256 = "21b15d4bc68237c8ca60b7fcbbe166c2bc31330b5d77d333e25066e671f545ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/mk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d57a3c54a5fa8d2c1d9fee72441b1ffdbb6200733beb91179db903a5a7abffad"; + sha256 = "1ce9a53f0dba2c1f93a31c72228c6df2ef70e74cfa155058f764ec2ce05d3e91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/mr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "551673a0614e0f1b1160415be3333e7b562b223aaf8bc36a493bb8d940e5ca86"; + sha256 = "b2a70628f72f662edaee06a767fba449a91af37387f0aac0d5c8b40a7c61571e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ms/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "836c1f26e6408cfcef357c7d1c41d4311bc47cccdab678332aa9e8e09e32c5fe"; + sha256 = "c4b7453d3606d8a92acd7848e9e8e9f6aa2e54db11942a09b004b5017a50ef2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/my/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "586d4990023be0ab9f40e13ff2d6c5cfb5e221d99dbf772225ea0ddad4ef3bbf"; + sha256 = "c7d0ad3715681816ed5466640315d50fbbd841516c56c6828e8e1a777207f967"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/nb-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "a95bb4c7b0fd7e1cee5deb40bed71acc7986b8131eee8578ed4885c158468a23"; + sha256 = "2d2d14fc9a898ffbc755ac2b8d7cc67e006fce444c28785adf65f2663deb0815"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ne-NP/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "6ba957aa35c9f33c187ac6f035bd967e0e657756ad5a7c9e8aa34749b704d101"; + sha256 = "4b3da73c884d15c4ab8be803ce8fdc6048e5c64def9f4dc9364b5df49774b67b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/nl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7600cc7b72c6c2438a21a43db4f1f86af5cafcae7d1094cfbd7cf4739449dc99"; + sha256 = "a240f5ec34f358af7f0c5e1d15f6a9626d9a3e2a39cf75b2427f594be5045fa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/nn-NO/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ae91a1f19c8e1c45ed3c806260fc81674c9dbaf68b3c5a9e411592f87a415276"; + sha256 = "b4cecd431906789f1a1fbbd617ab332a6a007573c1c5ba5210af4a7de7262ba9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/oc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "4a9360273c6893c8277daa3cab3c891944b77ffa9dd78566d7652196510987ae"; + sha256 = "71230c3129a6ede7cd78fa9bbcd5868aaa1e43747a901645daedd0792aad3b39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/pa-IN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "7d14678b0961213188d185efb4cb718a68f483f191fb4e712ad43c34ebf8e4f5"; + sha256 = "fdc719499aca5931cafb78b12b779d744239e9321e4b7cedeebec3a86ddcc4ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/pl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "67b9a3f2db54c6571b919f15ec91880acb785c248aa52502b6f3f0278d86e1d9"; + sha256 = "c0d2437eb209648346e69b674482b7f3d5e95ac3ccb012ec1ecddc7ebb9bd203"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/pt-BR/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "db51270393e9f07bf63b0191276a5b994e8b339b60e593df5c3a0f20fa2b6501"; + sha256 = "07a5dae4cbdfcf6d2b8d5e34eb0cc95f55884e58a7f6cb3d8183f95225f53c66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/pt-PT/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6a13b148f0779ec618d77e160059372e6c3eda0cfd0dc1a51d2d0722e75b33ba"; + sha256 = "4701a683a54da5ad32765979155a5115e9b4a8310029bdba587650255cc911d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/rm/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "85df972145522687fb572b0dbec8851dc511121cecae55fe8d10c238d00840b2"; + sha256 = "004a519addc3af848ad71f4d4b85afff5787104006f650748bdaaf3fed861f81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ro/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7005a41cfbf96a11f49db3e79901887346a848223d143799b999571eefa4d227"; + sha256 = "2c65bd5d604b3e3f4e431911a4f38ef903060c7cd5d79882287c027b4696e04d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ru/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "7869c441c647bd4f782211e4624d7705305aea35e0a9cd49bbfac249093ea32c"; + sha256 = "b4ac9db58806c4a2f636a912663007268234a9d2c86dcf4be565b194e8ff7aa4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sat/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "eb6fc8b87f4341818279dc329a0c3e68bd875cacb76a9d4a2887728a82c3992a"; + sha256 = "4fd9453ad511871ed46ae1c5890071945724e7876fcd1ea818b3aa34360a4260"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sc/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "da01ee280894e994d63fc055c082c162fd5a1a177b2ee94687726d1e1ed99f69"; + sha256 = "1e2d3dfe585ce3c4472055ea644b75eb4ece0b60c8b5c05781a122d4c2958ae5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sco/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "8a214a72561c17801a97038a127b0cd5208d17ff6ddad5cb08417eba9f41f8f2"; + sha256 = "7e697b48056401689864604fb64f1344fb2e5be303a09f5e2a35fc1cc665d6a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/si/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1aae3cd1359bc2008ef5bbdbfc7aa88089b2c5eff58aded851f8c0e6f2b57331"; + sha256 = "a4b8095c01c86f30049085a68631372a563de6941b4af7b31a5ba9502ae49b49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e1778c4fb21b9526d5a98a94a0f5aa7d1ac4e4cdb602cdf886eb537b3d6990ed"; + sha256 = "1c915b7b06aea488410bb1d0b466ca77c204123f83988cd1466f7f33c77b6165"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/skr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "3e579f18b769a74e449e9d9d1306ed214168594e7fc4d798ec1746b1a4e321c6"; + sha256 = "4e0d908d97ddb16722b16226982fb1c3593ddb4d1ef2c89530da6a6822333522"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7e86d23e63ac18eac7f6273aeef5545e47ac2c7c66e940bbaa3872449a8f4326"; + sha256 = "64f294228a9df9540bf2669a13aeeedb1591ee5371513819096fe7c7a04efb6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/son/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a622fa9ee23a422733d7a0eb096dc82439f740ecd47a4254909fc1775df2ea0a"; + sha256 = "fb28e25eaf88766f9b52a6bfdff1e918b443a62e128536c6b20ef4b2792f208b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sq/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5232f4e33691495b5194483895bed9c75177c340d7431249c8b531d19f8ba82b"; + sha256 = "778718548b29c64c6282a2a4ffd3686b0f059e7e32eb54bee2392c34fef5d7e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6ffea9cc1ba43c3f7ccf0958e81860e6870303d24865aa0cede8974a73ea3ac8"; + sha256 = "63ee43ca2eb024f95da7d4305b725131a5370f35815e18fcb0892bae864c42e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/sv-SE/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4b64684a5cf45f8b9b32c18448a86121edf30b8f823f3aba3e917df70a8a1c5e"; + sha256 = "987541c3b2aa680c095bd8c2d7d638bb2d64212da2bbebe3efa2125f966264ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/szl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d0c3decc69dc1e3daba5bdbc12c68c90217aad6877c98b391a253300b81f16f4"; + sha256 = "2b0d0e51c4c060e0e9a3b9b3e1fda018ade61b37054b06953440bd3627af476c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ta/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3efbc1ee432cf9b57c68a38572cd8a8b5a05c99ff9e384d0b7a838a402b3930e"; + sha256 = "95ca89286b0845f752d2dd1da6ee87b3f7b4167099a369652b31ecb831d8d407"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/te/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9af99e9257c638db0fc467d39a0e72c11f69d9c29fe50164fee634b2c7731dfa"; + sha256 = "21087362b9b7f82cbbe094ee1dd1744a379759dcd7400f423dfc5482bb2922f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/tg/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "c66f1f14247ceebf4f02377affdf411d2bf69d0ae138f96c88936b111450ed6a"; + sha256 = "af3d65fe8cc61128e0fec89eedac704733beb47ce9d4db71f9ffe07019f90f1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/th/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "35629b25cd87ce02ec6033cbd145356a7aa12bda7de10747c98dc5551ef955b5"; + sha256 = "3f198213cb7c8221d858c1c824d3fe10dd4d8835b237c0740d46510f0c95df14"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/tl/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6a94a6aee9c1dd95ff0f89086a40710cebcceafc24d121bb81961eb429d14914"; + sha256 = "f8615bc06132b22c170a0ba552c9412ccd6c4c9f3b6a760a77e26208d03c5cc1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/tr/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "106eed89ffbf91c723a4f2041af3e83e390fedc3c70c862a6551d90991cceb5f"; + sha256 = "e1362f8b285d082ef2299be9af67bcb65fb58f9620ed19b8f2eb97d902733409"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/trs/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "9600de720445c363fc83126ffee0987dce8041c16e30341c13727c0504130e6b"; + sha256 = "6cb91ad15348984db6bf9bb11259640ea0beaf36bf06afcf82a7d90d66587776"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/uk/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ec31ff64fc08e0f486f58dae7ca9def8378fc9cfdef758e8df4e11b6cfa07219"; + sha256 = "0acc83a27be732fbf9e6d94650fcc0c467b7d653fd6dd65f34668831c43fa16b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/ur/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "de2ea32f555e450de6b89d4ae9388d406532bbb4cf8ff187fbcc02d0a83ebc32"; + sha256 = "c99a6852c0840f36fd6cde0de174ccbb6516672ea5cf556e40c622a8381e49ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/uz/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f986658cc1f3510412a7be1dd0bc8a0fa53d784a01b9807c571cc351ac1bcbc8"; + sha256 = "6172ea33ceb1fb782a47f014a64b1cd71050e05e4d8dddcf6270575acae422af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/vi/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1ad3097b38b0f8ffd91a6ed0d37b4c44e2dba98c1f9cf7207e35a8a83b599ef9"; + sha256 = "08880e6ef6d4e967d24ead60208830b61c1ae193ffe8908d1b8e09381e369d81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/xh/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "0b77e69cdfefed65d40b1c50a03cae9e13cf043a080a66a47632ee990cc47156"; + sha256 = "e74fd0ec0f1779a26a57b410c95e1e25c52828cf0bac4467815583cd6c426ea4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/zh-CN/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f877f2c2ce638383deeefdf7f922f5f72cf9e297e0fd1402688beca6b19d11d8"; + sha256 = "cf169eaed6e207160ee5ae11d3e9c7f6d61eb4bcc827b0d56bd6216a5e45d5c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b2/linux-i686/zh-TW/firefox-131.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1f5da9dd3c35f3f9b35f21e71beb3539908f0c9431386438f8fb46dada259b1c"; + sha256 = "e8bd7755a146032ec5c5dcc816b355fe40da168008570316dd04161767043cce"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 3787c618a6..77e020ff0c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,20 +94,20 @@ in , debugBuild ? false # On 32bit platforms, we disable adding "-g" for easier linking. -, enableDebugSymbols ? !stdenv.is32bit +, enableDebugSymbols ? !stdenv.hostPlatform.is32bit ## optional libraries -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , ffmpegSupport ? true , gssSupport ? true, libkrb5 -, jackSupport ? stdenv.isLinux, libjack2 +, jackSupport ? stdenv.hostPlatform.isLinux, libjack2 , jemallocSupport ? !stdenv.hostPlatform.isMusl, jemalloc -, ltoSupport ? (stdenv.isLinux && stdenv.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages -, pgoSupport ? (stdenv.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run +, ltoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages +, pgoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run , pipewireSupport ? waylandSupport && webrtcSupport -, pulseaudioSupport ? stdenv.isLinux, libpulseaudio -, sndioSupport ? stdenv.isLinux, sndio +, pulseaudioSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +, sndioSupport ? stdenv.hostPlatform.isLinux, sndio , waylandSupport ? true, libxkbcommon, libdrm ## privacy-related options @@ -363,7 +363,7 @@ buildStdenv.mkDerivation { # please get your own set of keys at https://location.services.mozilla.com/api. echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") - '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' + '' + lib.optionalString (enableOfficialBranding && !stdenv.hostPlatform.is32bit) '' export MOZILLA_OFFICIAL=1 '' + lib.optionalString (!requireSigning) '' export MOZ_REQUIRE_SIGNING= @@ -406,7 +406,7 @@ buildStdenv.mkDerivation { ] # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" + ++ lib.optional (ltoSupport && (buildStdenv.hostPlatform.isAarch32 || buildStdenv.hostPlatform.isi686 || buildStdenv.hostPlatform.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ [ @@ -424,7 +424,7 @@ buildStdenv.mkDerivation { (if debugBuild then "--enable-profiling" else "--enable-optimize") # --enable-release adds -ffunction-sections & LTO that require a big amount # of RAM, and the 32-bit memory space cannot handle that linking - (enableFeature (!debugBuild && !stdenv.is32bit) "release") + (enableFeature (!debugBuild && !stdenv.hostPlatform.is32bit) "release") (enableFeature enableDebugSymbols "debug-symbols") ] ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] @@ -540,7 +540,7 @@ buildStdenv.mkDerivation { install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini install -Dvm644 ${defaultPrefsFile} $out/lib/${binaryName}/browser/defaults/preferences/nixos-default-prefs.js - '' + lib.optionalString buildStdenv.isLinux '' + '' + lib.optionalString buildStdenv.hostPlatform.isLinux '' # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-* diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 9100af6116..ba7bf76eae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,11 +35,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "131.0b2"; + version = "131.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1716b4189600d5eea9957c1ad2325a635f1f1178fb6e836bc9fe07d3ee2a71d5186af9511ad3e494403023834b58f7acb0b2716ee2acd5300797e2e8680b7cb8"; + sha512 = "043f983a295fa27d3641f6db231da2e3a88d43609f9c1f4fbd0d98356ab902e802b20a81ae8bbf3812d8ae6776fd6ea557f19cc083f09aae42b8cd98424430dc"; }; meta = { @@ -64,13 +64,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "131.0b2"; + version = "131.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "704d30f4c5d2a7cddda53f572551cc5fe49bc380388bda5c0eceac121c7d91ee616f586231a33539bb277aa4ea4e963a0d7f4d40f9738d4d30e4a3da75233d97"; + sha512 = "f1f56bd121ecdf1f659ce85ea77a9b1abe983583081f6cadaaf4c57695148b481eed1ecfa7ac2d3449fbc1a0c8560a8a5665e309722a5fc5455df740cf639989"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index bbc88581e1..6a34a531c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -86,7 +86,7 @@ let else []) ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] + libs = lib.optionals stdenv.hostPlatform.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix index 2cbd81d7ab..c0fb48dc83 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix @@ -2,10 +2,8 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, buildMozillaMach, nixosTests, - python311, }: ( diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix index 3515f0e30e..f228c97306 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/kristall/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "src/kristall.pro" ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv kristall.app $out/Applications '' else '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix index 15ed027ded..60157ca262 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,9 +10,9 @@ , cmake , ninja , pkg-config +, curl , libavif , libjxl -, libtiff , libwebp , libxcrypt , python3 @@ -58,13 +58,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-09-08"; + version = "0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "8d6f36f8d6c0aea0253df8c84746f8c99bf79b4d"; - hash = "sha256-EB26SAh9eckpq/HrO8O+PivMMmLpFtCdCNkOJcLQvZw="; + rev = "44f672bacf6779f6bbe5972d84e210f953f14598"; + hash = "sha256-Qku6W1kETOXQh8Kxn0wabe0Xc4gkpxrGbDFwIik34eY="; }; postPatch = '' @@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = with qt6Packages; [ + curl ffmpeg libavif libjxl @@ -144,9 +145,9 @@ stdenv.mkDerivation (finalAttrs: { simdutf skia woff2 - ] ++ lib.optional stdenv.isLinux [ + ] ++ lib.optional stdenv.hostPlatform.isLinux [ qtwayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -157,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { # Disable network operations "-DSERENITY_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DCMAKE_INSTALL_LIBEXECDIR=libexec" ]; @@ -166,14 +167,14 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications $out/bin mv $out/bundle/Ladybird.app $out/Applications ''; # Only Ladybird and WebContent need wrapped, if Qt is enabled. # On linux we end up wraping some non-Qt apps, like headless-browser. - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; passthru.tests = { nixosTest = nixosTests.ladybird; @@ -187,6 +188,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; # use of undeclared identifier 'NSBezelStyleAccessoryBarAction' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 7a486ec65f..d6770a8513 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ the-foundation ] ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ] ++ lib.optionals enableTUI [ ncurses sealcurses ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cmakeFlags = lib.optionals enableTUI [ "-DENABLE_TUI=YES" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; - installPhase = lib.optionalString (stdenv.isDarwin && !enableTUI) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableTUI) '' mkdir -p $out/Applications mv Lagrange.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index 9fe4fe7e37..12968f2f56 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -2,9 +2,9 @@ , gpm, openssl, pkg-config, libev # Misc. , libpng, libjpeg, libtiff, librsvg, libavif # graphic formats , bzip2, zlib, xz # Transfer encodings -, enableFB ? (!stdenv.isDarwin) +, enableFB ? (!stdenv.hostPlatform.isDarwin) , enableDirectFB ? false, directfb -, enableX11 ? (!stdenv.isDarwin), libX11, libXt, libXau # GUI support +, enableX11 ? (!stdenv.hostPlatform.isDarwin), libX11, libXt, libXau # GUI support }: stdenv.mkDerivation (finalAttrs: { @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libev librsvg libpng libjpeg libtiff libavif openssl xz bzip2 zlib ] - ++ lib.optionals stdenv.isLinux [ gpm ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ] ++ lib.optionals enableX11 [ libX11 libXau libXt ] ++ lib.optionals enableDirectFB [ directfb ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 3946aff885..7c903058c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "129.0.2792.21"; + version = "129.0.2792.52"; revision = "1"; - hash = "sha256-NrDRroKyjY9zC9KoMWaEPAPnu+JNNDZwLVbuDvoUG1M="; + hash = "sha256-KurkG/OxoKOcBcFXj9xhQVSidc2L6bzrDY8c2OmSQro="; }; dev = import ./browser.nix { channel = "dev"; - version = "130.0.2808.0"; + version = "130.0.2835.2"; revision = "1"; - hash = "sha256-6mqStxS9HJvfKbrGqQGlqQKXc2SnvOycirPihfnkaLI="; + hash = "sha256-szxMnqw7tUvASsxsYacrQ3StofUJHBWHIhF3EfGIVAs="; }; stable = import ./browser.nix { channel = "stable"; - version = "128.0.2739.67"; + version = "129.0.2792.52"; revision = "1"; - hash = "sha256-Y8PxyAibuEhwKJpqnhtBy1F2Kn+ONw6NVtC25R+fFVo="; + hash = "sha256-tiq6PwDrH8ZctfyDza9W3WOsj7NArv4XyMPGWU7fW7A="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix index cd1b78fc29..2397145a21 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-fcommon"; - env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; patchPhase = lib.optionalString stdenv.cc.isClang '' runHook prePatch diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 36327e5219..429923f626 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "111.0.5168.61"; + version = "113.0.5230.47"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-O2QqosmhhFk6KfiAdlpDYOsZUqGhvtwzYFi2I90Hemo="; + hash = "sha256-0RQTcROUv85yE6ceLkyF09/++WrvK828h5hoN1QYpCE="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 3f676ecd6c..64fee95385 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -3,7 +3,7 @@ , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt , withPdfReader ? true -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , pipewire , qtwayland , qtbase @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qtbase glib-networking - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 652cf97de4..6e6299fb55 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -15,7 +15,7 @@ , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, widevine-cdm ? null , commandLineArgs ? "" -, pulseSupport ? stdenv.isLinux, libpulseaudio +, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio , kerberosSupport ? true, libkrb5 }: @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.9.3447.41"; + version = "6.9.3447.46"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-Up2n7G3vatsQC9JKF1A1jAIBbdWm9UhL/75AXuxDCsg="; - x86_64-linux = "sha256-Hcd8W8bDlRUT/zPYP+aiJnUmepS38KuK0wRFYB3uW1Y="; + aarch64-linux = "sha256-r0u7u5R0lMI65zsTxIU0y5A+swJYLAj42ptJWVvFdxs="; + x86_64-linux = "sha256-hIdgyh6c+SbeeT6uY1aN7OCPY+U2GGX6V7eHdwgyuzc="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { ++ lib.optional kerberosSupport libkrb5; libPath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.is64bit) + + lib.optionalString (stdenv.hostPlatform.is64bit) (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs) + ":$out/opt/${vivaldiName}/lib"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix index 827202ae38..8ea48ffbad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl -, graphicsSupport ? !stdenv.isDarwin, imlib2 +, graphicsSupport ? !stdenv.hostPlatform.isDarwin, imlib2 , x11Support ? graphicsSupport, libX11 -, mouseSupport ? !stdenv.isDarwin, gpm-ncurses +, mouseSupport ? !stdenv.hostPlatform.isDarwin, gpm-ncurses , perl, man, pkg-config, buildPackages, w3m , testers, updateAutotoolsGnuConfigScriptsHook }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { hash = "sha256-upb5lWqhC1jRegzTncIz5e21v4Pw912FyVn217HucFs="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isSunOS "-lsocket -lnsl"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lsocket -lnsl"; # we must set these so that the generated files (e.g. w3mhelp.cgi) contain # the correct paths. diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index f2d841a419..5b297129c3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -69,7 +69,7 @@ buildGoModule rec { --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { tests.simple = callPackage ./tests.nix { inherit version; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 0d004cbb94..815ac16a85 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.10"; + version = "3.5.11"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-35Hp5lISQuFNsbSOKsLRcD695ZRCgQue+H8rKEPma5M="; + hash = "sha256-Yw61BCcMLl/zkmPm79SI0AdT6Nj2bxQkt6IKRBu0FmQ="; }; - vendorHash = "sha256-dGDXDpjf1kWcqBhCMKLXGXax6ApOL9eIiiem86CxdGs="; + vendorHash = "sha256-QwQasJMSEnHvBxyxCjLuinPt47XAhERch3j60KXGxa4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 246327a443..a484da72b6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.24"; + version = "0.11.26"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-9g3SGfJLzn+WIkBGcCwgOaJSuSUSFSU8d/9NZlN0h8E="; + hash = "sha256-p3rLQQwuJ/5AUzsQfGA9JSoifYaG4vAE2NaNfTf6/uk="; }; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix index d5afb17288..509a0385c8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.28.1"; + version = "3.28.2"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-IQGDuxk3ZDtrY/RLp2DfdCWtBNMTYPOitcVCcxH7HoY="; + hash = "sha256-ZENlUmSLI+aY33a69LNsfer/TLz8gmzxEv8Gddz6faU="; }; - vendorHash = "sha256-F44n+n9jfGYBQC1I33ylp8ZJtMi+uzjOLeG+5MbVePs="; + vendorHash = "sha256-6ZHb4SUa22/KfN4B2hg710FOSpg69rlT9FbZ/wCjpDc="; inherit doCheck subPackages; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix index de8e4b3875..a471c5827c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fcJTxZX9mdF4oFl/Cn1egczRy+yhWt2zLKsdLKz6Q+s="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix index 98fb309942..b103450942 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ]; # Trusted by this computer: no: x509: “cert-manager” certificate is not trusted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' mv $out/bin/ctl $out/bin/cmctl diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 1fe57a4466..2cadbd5530 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.17.6"; + version = "1.17.8"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-uuT/3MU9qdtdCaELkwKCLdif9MqAt2gDnwjH1LrsF8U="; + hash = "sha256-xHAxrAhKrGyH10yOmXRUnR8iI/Bapjx1XKUfklTZKzw="; }; - vendorHash = "sha256-C8zzNMHA4tKIUncqUJRE3VZFJO8KEX8GbOcTvbOnmU0="; + vendorHash = "sha256-zT6AVDYzDf+8DuPoJxu0RZ4djVIOq9dZDTHcjldE95Y="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index d9f20411a5..02acad93a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,6 @@ , zlib , zstd , openssl -, glibc , nixosTests , sparkSupport ? true , spark @@ -32,26 +31,26 @@ let version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" - + lib.optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + + lib.optionalString stdenv.hostPlatform.isAarch64 "-aarch64" + ".tar.gz"; inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) hash; }; doCheck = true; # Build the container executor binary from source # InstallPhase is not lazily evaluating containerExecutor for some reason - containerExecutor = if stdenv.isLinux then (callPackage ./containerExecutor.nix { + containerExecutor = if stdenv.hostPlatform.isLinux then (callPackage ./containerExecutor.nix { inherit (finalAttrs) version; inherit platformAttrs; }) else ""; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; installPhase = '' mkdir $out mv * $out/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do ln -sf "$n" $out/bin done diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index bc9082351e..94828973bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.9.10"; + version = "3.9.11"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-umb8f0qCqFVN8K5T441Koyl2pq7VOskDxKCXlqB5UoA="; + hash = "sha256-DwZZi7A6/UsKiFJSgMdo/zqlsRFz9RkFy8+s8RTumXg="; }; - vendorHash = "sha256-pWynrkL/d6TPojeyCJ6RjLNel4qA21UP+jzWnC8DnB8="; + vendorHash = "sha256-3TtUpwg8HLHp/fILH5/qBnMKFmBlALOGSSYoEg3s1h0="; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index 9d71c20707..9bb95b36da 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.10.154"; + version = "3.10.155"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-BrCErGsHJq9h2AijwhG8MwCxXGJ9sCDpCOqazsmi8hs="; + sha256 = "sha256-9dRYPeVWwJCbxkjPVI0B4FLaFNHRyGIdKd/ubJbP9tI="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; @@ -33,7 +33,7 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Command line tool for installing and using Jenkins X"; mainProgram = "jx"; homepage = "https://jenkins-x.io"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix index 9162251ce4..37c256b714 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix @@ -15,13 +15,13 @@ let in buildGoModule rec { pname = "k3d"; - version = "5.7.3"; + version = "5.7.4"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; rev = "refs/tags/v${version}"; - hash = "sha256-G9z4yJ7Oa2zmxYTRIMCiXlBPLlc3vGPUqUOoIohDKU8="; + hash = "sha256-z+7yeX0ea/6+4aWbA5NYW/HzvVcJiSkewOvo+oXp9bE="; }; vendorHash = "sha256-lFmIRtkUiohva2Vtg4AqHaB5McVOWW5+SFShkNqYVZ8="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix index 1fb10c82dc..8d66882a8a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix @@ -150,9 +150,9 @@ let # a shortcut that provides the images archive for the host platform. Currently only supports # aarch64 (arm64) and x86_64 (amd64), aborts on other architectures. airgapImages = fetchurl ( - if stdenv.isAarch64 then + if stdenv.hostPlatform.isAarch64 then imagesVersions.${findImagesArchive "arm64"} - else if stdenv.isx86_64 then + else if stdenv.hostPlatform.isx86_64 then imagesVersions.${findImagesArchive "amd64"} else abort "k3s: airgap images cannot be found automatically for architecture ${stdenv.hostPlatform.linuxArch}, consider using an image archive with an explicit architecture." diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 8e91f641a7..5bd085f2bb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { vendorHash = "sha256-U/tIsYpoog3S8V2yQGGqaQ+Av7TfvCYt3zn74qWuQKs="; # TODO investigate why some config tests are failing - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # Required to workaround test check error: preCheck = "export HOME=$(mktemp -d)"; # For arch != x86 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix index d7aa86fd7d..ccccec1c85 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { homepage = "https://googlecontainertools.github.io/kpt/"; license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock index 7d780f0e93..a191225654 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,36 +1,37 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) bigdecimal (3.1.8) colorize (0.8.1) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) domain_name (0.6.20240107) drb (2.2.1) ejson (1.4.1) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake - google-cloud-env (2.1.1) + google-cloud-env (2.2.0) faraday (>= 1.0, < 3.a) googleauth (1.11.0) faraday (>= 1.0, < 3.a) @@ -46,7 +47,7 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) i18n (1.14.5) @@ -55,7 +56,7 @@ GEM multi_json jwt (2.8.2) base64 - krane (3.6.1) + krane (3.6.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -64,7 +65,7 @@ GEM jsonpath (~> 1.0) kubeclient (~> 4.9) multi_json - statsd-instrument (>= 2.8, < 4) + statsd-instrument (>= 2.8, < 3.9) thor (>= 1.0, < 2.0) kubeclient (4.12.0) http (>= 3.0, < 6.0) @@ -74,13 +75,12 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) - minitest (5.24.1) + mime-types-data (3.2024.0903) + minitest (5.25.1) multi_json (1.15.0) - mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) @@ -93,16 +93,17 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) + securerandom (0.3.1) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) statsd-instrument (3.8.0) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (0.13.0) + uri (0.13.1) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix index e8bf7ffd74..39b8783c3a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; + sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; type = "gem"; }; - version = "7.1.3.4"; + version = "7.2.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -107,10 +107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; + sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6"; type = "gem"; }; - version = "2.10.1"; + version = "2.11.0"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -118,10 +118,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f49frpfdr8czwm2mjkfny4pini6fy49b6hamw4jrppl4vsg14ys"; + sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; type = "gem"; }; - version = "3.1.1"; + version = "3.3.0"; }; ffi = { groups = ["default"]; @@ -150,10 +150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; + sha256 = "0vlwifnhih8nq5441pfbnzc7w4z8rmy7j54pfixpm9yvlq11428j"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; googleauth = { dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i20j9wgxk4k47g54jiphb02xdhrwvadf4a0jjq5mzr1dwcx64vp"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.6"; + version = "1.0.7"; }; http-form_data = { groups = ["default"]; @@ -247,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002nf72l4b9h0lmpxzd5zm7dwakjs9f9cxrmkrx77qdyj4vy4g48"; + sha256 = "07f87rzlr0yamji5ns2isf5f554jal5b9v62lijhsafmq9545f42"; type = "gem"; }; - version = "3.6.1"; + version = "3.6.2"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -300,20 +300,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzvh906sk9zqfd4bvpjjgw856i769d2abjp3cibh5w73r9g70zj"; + sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; type = "gem"; }; - version = "3.2024.0806"; + version = "3.2024.0903"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.24.1"; + version = "5.25.1"; }; multi_json = { groups = ["default"]; @@ -325,16 +325,6 @@ }; version = "1.15.0"; }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; - }; net-http = { dependencies = ["uri"]; groups = ["default"]; @@ -407,6 +397,16 @@ }; version = "2.1.0"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; groups = ["default"]; @@ -433,10 +433,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -454,9 +454,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 25e1104325..8f912c2670 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index baa070a176..e7d879a83a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fGCllV07YustUIX1XiSvsC42obDOgl2yV5ruQMT2R0c="; + sha256 = "sha256-DHg46t0gMypK6Nj428gpOMtPuA+XcW4IJU39CHTVGPw="; }; subPackages = ["."]; - vendorHash = "sha256-wtxSoRSpmRwuIOdKGmCRR+QLwOvONiiltg6KL6t2cf8="; + vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix index 3e59a1fc23..98c9ca2d17 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix @@ -35,7 +35,7 @@ let platforms = builtins.attrNames sources; }; -in if stdenv.isDarwin then +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version src meta; } else callPackage ./linux.nix { inherit pname version src meta; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix index 4a68ce6468..5b43a6c962 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix @@ -9,9 +9,10 @@ in appimageTools.wrapType2 { inherit pname version src meta; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index 00ec65791a..e857ba1838 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.8.3"; - sha256 = "05ynk7p86pa81nyfj9vkfmvgss0nfz3zszrlm967cakhanc5083g"; - vendorHash = "sha256-Edn5w264IU3ez47jb2wqX5zXeKiLtewWs05LXYr5q50="; + version = "24.9.2"; + sha256 = "0bac5pwh741z7ly8abz92mydrhps2rlp4nkf3a4yxm7gj25gbqb1"; + vendorHash = "sha256-zKKgMcuHowU3Sft8QX0VJF+zXCVRyNC10k8nXwzTfYs="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index ad018b0b5e..a367c8bc3a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -29,14 +29,14 @@ buildGoModule rec { }; postPatch = ( - lib.optionalString (withQemu && stdenv.isDarwin) '' + lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" '' ) + ( - lib.optionalString (withQemu && stdenv.isLinux) '' + lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ @@ -46,7 +46,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; - buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; + buildInputs = if stdenv.hostPlatform.isDarwin then [ vmnet ] else if stdenv.hostPlatform.isLinux then [ libvirt ] else null; buildPhase = '' make COMMIT=${src.rev} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix index d9d31d94ac..88c426565f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -19,13 +19,13 @@ let }; plugins = ps: _super: with ps; rec { - nixops-aws = callPackage ./plugins/nixops-aws.nix { }; nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; + nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs"; nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs"; nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs"; nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs"; @@ -42,7 +42,7 @@ let selectedPlugins = []; # selector is a function mapping pythonPackages to a list of plugins - # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-digitalocean ]) withPlugins = selector: this.extend (this: _old: { selectedPlugins = selector this.availablePlugins; @@ -109,8 +109,6 @@ in # Not recommended; too fragile. nixops_unstable_full = minimal.withPlugins (ps: [ - # currently broken - # ps.nixops-aws ps.nixops-digitalocean ps.nixops-encrypted-links ps.nixops-hercules-ci diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix deleted file mode 100644 index 895794d3e0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, boto -, boto3 -, nixops -, nixos-modules-contrib -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-aws"; - version = "1.0.0-unstable-2024-02-29"; - pyproject = true; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nixops-aws"; - rev = "d173b2f14ec767d782ceab45fb22b32fe3b5a1f7"; - hash = "sha256-ocTtc7POt1bugb9Bki2ew2Eh5uc933GftNw1twoOJsc="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - boto - boto3 - nixos-modules-contrib - typing-extensions - ]; - - pythonImportsCheck = [ "nixops_aws" ]; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; { - description = "AWS plugin for NixOps"; - homepage = "https://github.com/NixOS/nixops-aws"; - license = licenses.lgpl3Only; - broken = true; # fails with `nose-1.3.7 not supported for interpreter python3.12` - maintainers = nixops.meta.maintainers; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 4daed56dd9..e30d89a9a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -20,15 +20,15 @@ buildGoModule rec { # Linux-only feature. See 'ENABLE_JOURNALD' upstream: # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile subPackages = [ "cmd/nodeproblemdetector" ] ++ - lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; + lib.optionals stdenv.hostPlatform.isLinux [ "cmd/logcounter" ]; preBuild = '' - export CGO_ENABLED=${if stdenv.isLinux then "1" else "0"} + export CGO_ENABLED=${if stdenv.hostPlatform.isLinux then "1" else "0"} ''; - buildInputs = lib.optionals stdenv.isLinux [ systemd ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; - tags = lib.optionals stdenv.isLinux [ "journald" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "journald" ]; ldflags = [ "-X k8s.io/${pname}/pkg/version.version=v${version}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix index f83347d053..1b2b5568cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ''; # Tests fail in Darwin sandbox. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' installShellCompletion --cmd ocm \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix index ca33219670..66bd0f480b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.20.2"; + version = "5.20.3"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-JMpqZnlFMHC6b+nQ6UIcOF0HKz4VE8/YXEnofUMHhxY="; + hash = "sha256-WbXIg453VewOejX/hyGi1DEi0cSwcQ+hKUFG8Ne4cPE="; }; vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/builder.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/builder.nix index 58a9d6c629..21941ad8ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/builder.nix @@ -91,7 +91,7 @@ buildGoModule rec { package = rke2; version = "v${version}"; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) rke2; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/testing/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/testing/versions.nix index 1801831584..5cf0039d5a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/testing/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/testing/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.31.0-rc1+rke2r1"; - rke2RepoSha256 = "0mfl01rv6xn2kg2739215j9hsyym16mgp92bqsz0hkpfm61dd96j"; - rke2Commit = "3acd10e9389fa930860896ca6ed925a15dff61a3"; - rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE="; - k8sVersion = "v1.31.0"; - k8sImageTag = "v1.31.0-rke2r1-build20240815"; + rke2Version = "1.31.1-rc3+rke2r1"; + rke2RepoSha256 = "1j09f95d99xk1jbsy08cl1rw5y1ljnrmq3nv1rixlc4hgqwz56pm"; + rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613"; + rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI="; + k8sVersion = "v1.31.1"; + k8sImageTag = "v1.31.1-rke2r1-build20240912"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.31.0-dev."; - golangVersion = "go1.22.5"; + ccmVersion = "v1.31.0-build20240910"; + dockerizedVersion = "v1.31.1-dev."; + golangVersion = "go1.22.6"; eol = "2025-10-28"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix index f717ec9226..86e98c3a41 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix @@ -2,9 +2,7 @@ , stdenv , fetchzip , makeWrapper -, jdk8 , python3 -, coreutils , hadoop , RSupport ? true , R diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index fd805916ab..047a9b6c8f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "tanka"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4ChTYwRp9R8U97hH1Bgrxr5a/5IoWRAmFgJbD7oJpO4="; + sha256 = "sha256-MDZXnI0FAeQJI7GbPT5/EB4ldOtGSnFEbojXzE9ll+Q="; }; - vendorHash = "sha256-u2l3cX8PKHUCPkHuCOyED2LLWygYCDJEhfTjycEBzHI="; + vendorHash = "sha256-N4zGZ+fYQA7UdPI8ie55gG3FnFrI/XvyJJiZ3D40qlQ="; doCheck = false; + # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK + env.GOWORK = "off"; subPackages = [ "cmd/tk" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix index 3e36eda8e6..101d3baa6c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -41,7 +41,7 @@ let ]; # Tests fail with x86 on macOS Rosetta 2 - doCheck = !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); preCheck = '' export HOME="$(mktemp -d)" diff --git a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix index 12e6f432c5..88f0b34fd2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin + doCheck = !stdenv.hostPlatform.isDarwin; # check-dnstap.sh failing on Darwin nativeCheckInputs = [ cbor-diag cddl diff --git a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix index 6087392666..d933516578 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.39.6"; + version = "1.40.1"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-IiwS+NsjXW4kVAaJnsI8HEAl2pPRQr3K2ZpC7n/VjU4="; + hash = "sha256-wb7/g1g7gxKhZyK7GW+6aGwuD+Dkcdg2Zpc0JCxVPjM="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-wpTXuyeUIPg6WPzVyOIFadodlKHzr5DeDeHhDRKsYbY="; + vendorHash = "sha256-8o3jXkhfRIGGPtw8ow+NyAYAuCJNrBlSyfdSI0pjvDQ="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix b/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix index 6afe93fee4..356f8f622c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-HoIkozwRV0xz14mOTM4BXDzPShRAp8a3quhvtWwnQ2I="; + sha256 = "sha256-iZln/cgYGSFYwXDvD1CkQdfwBDXj897X1il1m5HfFJs="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-KA2hwaEhY2G+H4+xVgin6xhmRfnGcJBBWj9xWtD0h9I="; + cargoHash = "sha256-5PPI7fnG71xkQCY+OLLk83XZb+4DoPX81bAtKRp/H8U="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix index d9da9e48c7..a4c84ee7e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { # AssertionError "test_null_dummy" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # The tests that spawn a server using Bottle cannot be run on # macOS or Windows as the default multiprocessing start method # on those platforms is 'spawn', which requires the code to be diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index 43f3c565d2..144634d60d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-0z3G8j0Qk0HEDUKA7fmjFfNW956rRtzKO+0ltNQR4es="; # TODO: Check if that's still needed - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Allow other ncurses versions on Darwin substituteInPlace config.sh \ --replace "ncurses5.4" "ncurses" @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config asciidoctor gettext - ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation libiconv gettext ]; postBuild = '' make -j $NIX_BUILD_CORES prefix="$out" @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' make -j $NIX_BUILD_CORES prefix="$out" install - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix index 524e8d76b6..cecad11a4f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; }; - buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix index 832f888dcf..3fbaa2108d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/russ/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { # tests are network based :( doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices AppKit ]); diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/tuifeed/default.nix index 0465fc31cf..16bb0324d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 10cf454dc6..e8a1f90fbf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { wxGTK32 gtk3 xdg-utils - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; - preBuild = lib.optionalString (stdenv.isDarwin) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export MACOSX_DEPLOYMENT_TARGET=11.0 ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gdrive3/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gdrive3/default.nix index 4e7fea1296..3fc7af9b14 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gdrive3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gdrive3/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix index 9f835c8535..a74f94eceb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk="; nativeBuildInputs = [ installShellFiles pkg-config scdoc which ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' make manual diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix index dc4ed20d72..92907d8a11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libressl ]; - CFLAGS = lib.optionals stdenv.isDarwin [ + CFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-D_DARWIN_C_SOURCE" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix index 14dbdacd72..f654a96cb7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = lib.optional stdenv.is64bit ./bpf_stubs_workaround.patch; + patches = lib.optional stdenv.hostPlatform.is64bit ./bpf_stubs_workaround.patch; postPatch = '' substituteInPlace ./configure \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix index 49a13cdb26..0fcdd5048c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ./0001-Fix-include-path-in-exported-CMake-targets.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" "" ''; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; meta = with lib; { description = "Zeek's Messaging Library"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index e1ac462330..8286c46bcb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { openssl zlib python - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libkqueue - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; @@ -78,11 +78,11 @@ stdenv.mkDerivation rec { "-DZEEK_STATE_DIR=/var/lib/zeek" "-DZEEK_SPOOL_DIR=/var/spool/zeek" "-DDISABLE_JAVASCRIPT=ON" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; postInstall = '' for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index cadfe432b2..f82ae2ac42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -18,7 +18,7 @@ let sha256 = "sha256-WMT4yrLjDSMsI/lFbYODu3/0whcF+++4ShoChfMyLfQ="; }; in -(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { +(if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; }; meta = oldAttrs.meta // { platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index ca8a163fd5..be7862611f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { boost openssl libsecret - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" '' + '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index b818baa899..dd5f8f54c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Undefined symbols for architecture arm64: "_gpg_strerror" - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lgpg-error"; doCheck = true; checkPhase = '' @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { # will load # # See https://github.com/dino/dino/wiki/macOS - postFixup = lib.optionalString (stdenv.isDarwin) '' + postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) '' cd "$out/lib/dino/plugins/" for f in *.dylib; do mv "$f" "$(basename "$f" .dylib).so" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index b62be88b13..939716d9b5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,10 +1,10 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = - if stdenv.isLinux then { + if stdenv.hostPlatform.isLinux then { stable = "0.0.67"; ptb = "0.0.105"; - canary = "0.0.483"; + canary = "0.0.492"; development = "0.0.28"; } else { stable = "0.0.318"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-AWYRQxD0FPqRo1TXUR9wWhZTUr34MRFaBTXzhNcwGKI="; + hash = "sha256-NjcNgKYm1Twm8nN3sFlZCG/3x5fcSmX7X2On7CeZm0M="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -65,7 +65,7 @@ let mainProgram = "discord"; }; package = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix; @@ -85,17 +85,17 @@ let }; ptb = rec { pname = "discord-ptb"; - binaryName = if stdenv.isLinux then "DiscordPTB" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordPTB" else desktopName; desktopName = "Discord PTB"; }; canary = rec { pname = "discord-canary"; - binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordCanary" else desktopName; desktopName = "Discord Canary"; }; development = rec { pname = "discord-development"; - binaryName = if stdenv.isLinux then "DiscordDevelopment" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordDevelopment" else desktopName; desktopName = "Discord Development"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 3739368122..fc40e11dca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { }; nativeBuildInputs = [ yarn fixup-yarn-lock nodejs makeWrapper jq ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; inherit seshat; @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { mimeTypes = [ "x-scheme-handler/element" ]; }; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' cp build/icon.icns $out/Applications/Element.app/Contents/Resources/element.icns ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 7d17d58276..958a80fb47 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation rec { nodejs python3 pkg-config npmHooks.npmConfigHook ] - ++ lib.optional stdenv.isDarwin xcbuild; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; npmDeps = fetchNpmDeps { inherit src; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index bc163fb50a..e8e88491c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -17,7 +17,7 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/seshat-node/native"; nativeBuildInputs = [ nodejs python3 yarn fixup-yarn-lock ]; - buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; npm_config_nodedir = nodejs; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix index e259c6b60f..b71395ad93 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-largp"; meta = with lib; { description = "Console XMPP client"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix index 82cfb3126c..6b4528dfe2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -21,7 +21,7 @@ buildGoModule { passthru.tests.go-neb = nixosTests.go-neb; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extensible matrix bot written in Go"; mainProgram = "go-neb"; homepage = "https://github.com/matrix-org/go-neb"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 64b971b235..510f577a50 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { }/* $out/ substituteAllInPlace $out/share/applications/* wrapProgram $out/bin/gomuks \ - --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \ + --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ libnotify pulseaudio ])}" \ --set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \ --set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga" ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 7d934aabbc..ae7001fe7b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -38,9 +38,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; PROTOC = "${pkgsBuildHost.protobuf}/bin/protoc"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix index 655a20c12a..02a632a9f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix index 313d45a982..a3df5958be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { "--disable-resample" "--disable-libwebrtc" "--with-gnutls=yes" - ] ++ lib.optionals stdenv.isLinux [ "--enable-epoll" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-epoll" ]; buildInputs = old.buildInputs ++ [ gnutls ]; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 88b9baeacf..619759df2f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -30,18 +30,18 @@ buildNpmPackage rec { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; # robotjs node-gyp dependencies - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpng libX11 libXi libXtst zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreFoundation ApplicationServices @@ -84,7 +84,7 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/jitsi-meet-electron cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/jitsi-meet-electron @@ -97,7 +97,7 @@ buildNpmPackage rec { install -Dm644 resources/icons/512x512.png $out/share/icons/hicolor/512x512/apps/jitsi-meet-electron.png ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"Jitsi Meet.app" $out/Applications makeWrapper "$out/Applications/Jitsi Meet.app/Contents/MacOS/Jitsi Meet" $out/bin/jitsi-meet-electron diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 3938d03447..eeb5f582f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -79,18 +79,18 @@ with mikutterPaths; stdenv.mkDerivation rec { }; nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ atk gtk2 libnotify which # some plugins use it at runtime wrappedRuby - ] ++ lib.optionals stdenv.isLinux [ alsa-utils ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-utils ]; scriptPath = lib.makeBinPath ( [ wrappedRuby libnotify which ] - ++ lib.optionals stdenv.isLinux [ alsa-utils ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-utils ] ); postUnpack = '' @@ -123,7 +123,7 @@ with mikutterPaths; stdenv.mkDerivation rec { let infoPlist = mkInfoPlist { inherit version; }; in - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p ${appBinDir} ${appResourceDir} install -Dm644 ${infoPlist} ${appPrefixDir}/Info.plist ln -s $out/bin/mikutter ${appBinDir}/mikutter diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix index 0e3c7f6803..b9183b2d76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { readline sqlite zlib - ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation ]; cmakeFlags = [ "-DHAS_WHATSAPP=OFF" # go module build required diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix deleted file mode 100644 index 5dc09ae1f3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, perl, perlPackages, coreutils, -fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "oysttyer"; - version = "2.10.0"; - - src = fetchFromGitHub { - owner = "oysttyer"; - repo = "oysttyer"; - rev = version; - sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perl - ]; - - propagatedBuildInputs = with perlPackages; [ - DateTimeFormatDateParse - TermReadLineTTYtter - TermReadKey - ]; - - installPhase = '' - ${coreutils}/bin/install -Dm755 \ - oysttyer.pl \ - $out/bin/oysttyer - - wrapProgram $out/bin/oysttyer \ - --prefix PERL5LIB : $PERL5LIB - ''; - - meta = with lib; { - description = "Perl Console Twitter Client"; - homepage = "http://oysttyer.github.io/"; - maintainers = with maintainers; [ woffs ]; - license = with licenses; [ ffsl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 3255b99cf7..8a6391892a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { ]; # darwin has difficulty communicating with server, fails some integration tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' installManPage docs/man/*.[1-9] diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9300a73b17..c2c8f98251 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -79,14 +79,14 @@ let ] ++ lib.optional withOpenssl openssl ++ lib.optionals withGnutls [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] - ++ lib.optional stdenv.isDarwin gtk2-x11; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 gtkspell2 farstream ] + ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; propagatedBuildInputs = [ pkg-config gettext ] ++ (with perlPackages; [ perl XMLParser ]) - ++ lib.optional stdenv.isLinux gtk2 - ++ lib.optional stdenv.isDarwin gtk2-x11; + ++ lib.optional stdenv.hostPlatform.isLinux gtk2 + ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; patches = [ ./add-search-path.patch @@ -107,7 +107,7 @@ let ] ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] - ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gtkspell" "--disable-vv" ] ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ]; enableParallelBuilding = true; @@ -121,7 +121,7 @@ let # In particular, this detects missing python imports in some of the tools. postFixup = let # TODO: python is a script, so it doesn't work as interpreter on darwin - binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; + binsToTest = lib.optionalString stdenv.hostPlatform.isLinux "purple-remote," + "pidgin,finch"; in lib.optionalString doInstallCheck '' for f in "''${!outputBin}"/bin/{${binsToTest}}; do echo "Testing: $f --help" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix index 1a1fd3b409..26c67b070e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "-U__ARM_NEON__" ]); meta = with lib; { homepage = "https://github.com/ars3niy/tdlib-purple"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 09240ae471..84b24dab2d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -53,10 +53,10 @@ mkDerivation rec { pcre qrencode sqlcipher - ] ++ lib.optionals stdenv.isDarwin [ AVFoundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation ]; nativeBuildInputs = [ cmake pkg-config qttools ] - ++ lib.optionals stdenv.isDarwin [ perl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ perl ]; cmakeFlags = [ "-DGIT_DESCRIBE=v${version}" @@ -67,7 +67,7 @@ mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qt Tox client"; mainProgram = "qtox"; homepage = "https://tox.chat"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 2a0bfce756..ef6bc08616 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv $out/bin/quaternion.app $out/Applications rmdir $out/bin || : diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index 9310154d04..995284672b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-YaLvqd0yr0wlsvjtoN/9GXoZIpjH26DInhWC0Vg62Rs="; + hash = "sha256-pm4Ji1gv5vNMgB9ZWNKMLZSUE9wBklQ/MnFOKHP+Rcc="; }; desktopItem = (makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 17aef03835..d20ef1f181 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { hash = "sha256-OTKXLcLktWiSdRhGe7ioL2ViJQQcCjR1+2LlGoMnSgE="; }; - buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmatthew_java dbus dbus_java ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli - '' + (if stdenv.isLinux then '' + '' + (if stdenv.hostPlatform.isLinux then '' makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \ --set JAVA_HOME "${openjdk21_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version - doInstallCheck = stdenv.isLinux; + doInstallCheck = stdenv.hostPlatform.isLinux; installCheckPhase = '' export PATH=$PATH:$out/bin diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 1277c57527..40666c4eca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.24.1"; + version = "7.25.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ="; + hash = "sha256-KcVCQkDSpI+eq2/wvPZxq6ILLQk3xe+wrKfbnJnTQTo="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 7e381c1205..c35ad2d2ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -14,27 +14,27 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240913"; + version = "20240924-2"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-Rtoxa0LYL2ElBtt6KxRmKAkRDc8PNvRCoP0s51h+sIM="; + hash = "sha256-YnblQjZpKsnphbaRQ6FyHhssnns7U5VoNe/r3goQ0g8="; }; nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = [ openssl sqlite - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 1256916395..9359480b0e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -207,6 +207,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 577589f6a4..f77da2638c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let - arch = if stdenv.is64bit then "amd64" else "x86"; + arch = if stdenv.hostPlatform.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; version = "3.13.7"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; - sha256 = if stdenv.is64bit + sha256 = if stdenv.hostPlatform.is64bit then "sha256-d1pXMamAmAHkyPkGbNm8ViobNoVTE5wSSfKgdA1QBB4=" else "sha256-aMEDOnvBeKfzG8lDFhU8I5DYgG53IsCDBMV2MUyJi2g="; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index b19e3efa8a..102500c1c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -42,7 +42,7 @@ let inherit stdenv; }; - mainProgram = if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"; + mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; in stdenv.mkDerivation rec { pname = "kotatogram-desktop"; @@ -61,20 +61,20 @@ stdenv.mkDerivation rec { ./macos-opengl.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; # Wrapping the inside of the app bundles, avoiding double-wrapping - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ pkg-config @@ -83,11 +83,11 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook removeReferencesTo - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # to build bundled libdispatch clang gobject-introspection - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { tg_owt microsoft-gsl boost - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland kcoreaddons alsa-lib @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { hunspell jemalloc wayland - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { "-DTDESKTOP_API_TEST=ON" ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r ${mainProgram}.app $out/Applications ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index e2f3c4ba88..c136d121aa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ @@ -64,7 +64,7 @@ stdenv.mkDerivation { crc32c libvpx abseil-cpp - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXtst libXcomposite @@ -78,7 +78,7 @@ stdenv.mkDerivation { mesa libdrm libGL - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa AppKit IOKit diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 6aefc520c7..e3e8a3b3f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { ./scheme.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ --replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; @@ -105,11 +105,11 @@ stdenv.mkDerivation (finalAttrs: { ninja python3 wrapQtAppsHook - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gobject-introspection wrapGAppsHook3 extra-cmake-modules - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { microsoft-gsl rlottie ada - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland gtk3 glib-networking @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { hunspell webkitgtk_6_0 jemalloc - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -180,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { libicns ]); - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; @@ -198,20 +198,20 @@ stdenv.mkDerivation (finalAttrs: { export GI_GIR_PATH="$XDG_DATA_DIRS" ''; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix index 7cdbda355d..d23ee405ef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { ]; # Fix notifications on platforms other than darwin by providing notify-send - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 4054219850..70612f5294 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib dbus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 92daa59ae4..5d4bfc5eab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config libxslt makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoreconfHook gtk-doc ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix index e90b8b6971..2a42692e41 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { mimeTypes = [ "application/x-chat" ]; }; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 31ef96cf80..8d3b360718 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 50be0777ae..60ed9d60b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -71,4 +71,4 @@ let cp -r *.app $out/Applications ''; }; -in if stdenv.isDarwin then darwin else linux +in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9d41b0455a..22bf7fb11e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -187,6 +187,6 @@ let }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/communi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/communi/default.nix index 84940c288b..9c25ece855 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/communi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/communi/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin # Wrapper hook thinks it's a binary because it's in $out/Applications, wraps it with a shell script # So we manually call the wrapper script on just the binary - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; preConfigure = '' export QMAKEFEATURES=${libcommuni}/features @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor" "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications" "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" - "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.isDarwin then "Applications" else "bin"}" + "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.hostPlatform.isDarwin then "Applications" else "bin"}" ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' # Nix qmake does not add the bundle rpath by default. install_name_tool \ -add_rpath @executable_path/../Frameworks \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index 2fc2e05859..c456875d01 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt @@ -79,7 +79,7 @@ perlPackages.buildPerlPackage rec { ln -s $AUTO_SHARE_PATH/public/assets $out/assets cp -vR templates $out/templates cp Makefile.PL $out/Makefile.PL - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/convos '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix index 2331eaa459..c3a10cc39e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Darwin needs libiconv, tcl; while Linux build don't buildInputs = [ openssl ncurses libxcrypt ] - ++ lib.optionals stdenv.isDarwin [ libiconv tcl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ]; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix index 729afb831d..0abeec1593 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; }; - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; buildInputs = [ sqlite ]; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix index 583723c0d1..fa8f3edf5a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix @@ -4,10 +4,10 @@ , fetchFromGitHub , pkg-config , Foundation -, dbusSupport ? stdenv.isLinux, dbus +, dbusSupport ? stdenv.hostPlatform.isLinux, dbus # rustls will be used for TLS if useOpenSSL=false -, useOpenSSL ? stdenv.isLinux, openssl -, notificationSupport ? stdenv.isLinux +, useOpenSSL ? stdenv.hostPlatform.isLinux, openssl +, notificationSupport ? stdenv.hostPlatform.isLinux }: rustPlatform.buildRustPackage rec { @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AhQCfLCoJU7o8s+XL3hDOPmZi9QjOxXSA9uglA1KSuY="; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; buildFeatures = lib.optional notificationSupport "desktop-notifications"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 42090534bc..8ac356b918 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -3,14 +3,14 @@ , zlib, curl, pkg-config, libgcrypt , cmake, libobjc, libresolv, libiconv , asciidoctor # manpages -, enableTests ? !stdenv.isDarwin, cpputest +, enableTests ? !stdenv.hostPlatform.isDarwin, cpputest , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl , pythonSupport ? true, python3Packages , rubySupport ? true, ruby , tclSupport ? true, tcl -, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2 +, phpSupport ? !stdenv.hostPlatform.isDarwin, php, systemd, libxml2, pcre2, libargon2 , extraBuildInputs ? [] }: @@ -29,7 +29,7 @@ let { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; } { name = "php"; enabled = phpSupport; cmakeFlag = "ENABLE_PHP"; buildInputs = [ php-embed.unwrapped.dev libxml2 pcre2 libargon2 - ] ++ lib.optional stdenv.isLinux systemd; } + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd; } ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; @@ -57,19 +57,19 @@ let "-DENABLE_DOC_INCOMPLETE=ON" "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" ] - ++ lib.optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] + ++ lib.optionals stdenv.hostPlatform.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; buildInputs = [ ncurses openssl aspell cjson gnutls gettext zlib curl libgcrypt ] - ++ lib.optionals stdenv.isDarwin [ libobjc libresolv ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc libresolv ] ++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error - + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); + + (lib.optionalString stdenv.hostPlatform.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); postInstall = '' for p in ${lib.concatMapStringsSep " " (p: p.name) enabledPlugins}; do diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index e51e6f061b..22eb0849cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { # As of 2019-06-30, all of the dependencies are available on macOS but the # package itself does not build. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix index c059babffe..c046a0c2d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "IRC channel management bot written purely in C/C++"; longDescription = '' Wraith is an IRC channel management bot written purely in C/C++. It has diff --git a/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix b/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix index e3cd1999d8..ba87e0f293 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-t1re2vpxGZkC45n0jUytqe2SPAC/+fh4Itq1h9znYnM="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix index 54ae2551ca..d44fafb3be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -63,7 +63,7 @@ let fs-repo-9-to-10 fs-repo-8-to-9 fs-repo-7-to-8 - ] ++ lib.optional (!stdenv.isDarwin) # I didn't manage to fix this on macOS: + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) # I didn't manage to fix this on macOS: fs-repo-6-to-7 # gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2 ++ [ fs-repo-5-to-6 diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix index b62b30ae60..b479a01d0d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "115.9.0"; + version = "115.14.0"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb26-build2"; + rev = "${version}-bb31"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-0RlI30zxiueeXdLEXPZevc8QyKr667juHk0bTcqBB1w="; + hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -50,7 +50,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-Kut3ynA43289MG+cPSpOphWvDtzw9ykCFcpfMMEpDlc="; + hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -79,7 +79,8 @@ in ((buildMozillaMach { fi # requires vendored icu, fails to link with our icu - if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch ]]; then + # feature-506064 depends on those icu patches + if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch || $patch == feature-506064-match-diacritics.patch || $patch == feature-506064-match-diacritics-m-c.patch ]]; then continue fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index ddc47d1800..d0345f9466 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -18,7 +18,7 @@ , enableLdap ? true, openldap , enableNetworkManager ? true, networkmanager , enableLibetpan ? true, libetpan -, enableValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind +, enableValgrind ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind , enableSvg ? true, librsvg # Configure claws-mail's plugins diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mmh/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mmh/default.nix index 95c101002e..edcc48386a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { homepage = "http://marmaro.de/prog/mmh"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ kaction ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 588cd4326a..b70512a9d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -2,7 +2,6 @@ , pkg-config, gnupg , xapian, gmime3, sfsexp, talloc, zlib , doxygen, perl, texinfo -, notmuch , pythonPackages , emacs , ruby @@ -157,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: { paths = with ruby.gems; [ mail ]; pathsToLink = [ "/lib" "/nix-support" ]; }; - tests.version = testers.testVersion { package = notmuch; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; updateScript = gitUpdater { url = "https://git.notmuchmail.org/git/notmuch"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 48d14d78d8..9e765743dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; meta = with lib; { homepage = "https://sylpheed.sraoss.jp/en/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 6b13616ee1..e3a370c352 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -60,8 +60,8 @@ in rec { }; thunderbird-128 = common { - version = "128.1.1esr"; - sha512 = "91e17d63383b05a7565838c61eda3b642f1bb3b4c43ae78a8810dd6d9ba2e5f10939be17598dd5e87bdf28d6f70ff9e154e54218aaf161bd89a5a6d30b504427"; + version = "128.2.3esr"; + sha512 = "f852d1fe6b8d41aa2f0fbc0fceae93cccf1e5f88d9c0447f504de775283289b82b246b79a01e8eb26e9c87197fb33138fb18c75ecc3f5f1bcfefa3920a7c7512"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mhost/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mhost/default.nix index 435f58d068..777ea44dc7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mhost/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mhost/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-d2JYT/eJaGm8pfmjsuSZiQxlzcsypFH53F/9joW0J6I="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix index f6364f5ba5..b0df1210b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix @@ -25,7 +25,7 @@ let packages = [ nodejs ffmpeg youtube-dl -] ++ lib.optionals stdenv.isLinux [ pulseaudio ]; +] ++ lib.optionals stdenv.hostPlatform.isLinux [ pulseaudio ]; in python3Packages.buildPythonApplication { @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; }; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; propagatedBuildInputs = with python3Packages; ([ pychromecast psutil @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication { postInstall = '' substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/video.py \ --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm 755 -t $out/bin bin/audiodevice substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/audio_devices.py \ --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' diff --git a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix index 7370ddd6e2..5e41ef5d2a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optional stdenv.isDarwin Security + lib.optional stdenv.hostPlatform.isDarwin Security ++ lib.optional gsaslSupport gsasl ++ lib.optional idnSupport libidn ++ lib.optional (sslLibrary == "gnutls") gnutls @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { (lib.withFeature idnSupport "idn") (lib.withFeature gsaslSupport "gsasl") "--with-tls=${sslLibrary}" - ] ++ lib.optional stdenv.isDarwin "--with-macosx-keyring"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-macosx-keyring"; meta = with lib;{ description = "POP3 mail retrieval agent"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix index 6bd0f38ba6..15cd369ae3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -48,10 +48,10 @@ let inherit version src meta; configureFlags = [ "--sysconfdir=/etc" "--with-libgsasl" ] - ++ optionals stdenv.isDarwin [ "--with-macosx-keyring" ]; + ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ]; buildInputs = [ gnutls gsasl libidn2 ] - ++ optionals stdenv.isDarwin [ Security ] + ++ optionals stdenv.hostPlatform.isDarwin [ Security ] ++ optionals withKeyring [ libsecret ]; nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix index d89c173550..8ee04ef196 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ notmuch - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "JMAP integration for notmuch mail"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix index 0dcfeaabf6..af2a2d2e49 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix @@ -31,7 +31,7 @@ openvpn.overrideAttrs (oldAttrs: ]; buildInputs = oldAttrs.buildInputs or [ ] - ++ optional stdenv.isLinux [ libnl.dev ]; + ++ optional stdenv.hostPlatform.isLinux [ libnl.dev ]; configureFlags = [ # Assignement instead of appending to make sure to use exactly the flags required by mullvad @@ -52,7 +52,7 @@ openvpn.overrideAttrs (oldAttrs: "--disable-lz4" "--enable-comp-stub" ] - ++ optional stdenv.isLinux [ + ++ optional stdenv.hostPlatform.isLinux [ # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35 "--enable-dco" # requires libnl "--disable-iproute2" diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 40e1b8f101..4fd9c7d7de 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}"; - description = "Nextcloud themed desktop client"; + description = "Desktop sync client for Nextcloud"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes SuperSandro2000 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix index a2b2731b3b..3f97981528 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; buildInputs = [ ncurses ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix index fc2095caaf..41fe108b99 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; checkType = "debug"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix b/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix index 081f7d96c1..89853c8a08 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libmrss ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo - ++ lib.optional (!stdenv.isLinux) libiconv; + ++ lib.optional (!stdenv.hostPlatform.isLinux) libiconv; # Workaround build failure on -fno-common toolchains: # ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path'; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile \ --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)' - '' + lib.optionalString (!stdenv.isLinux) '' + '' + lib.optionalString (!stdenv.hostPlatform.isLinux) '' sed 's/#EXTRA/EXTRA/' -i Makefile '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed 's/^PDF/#PDF/' -i Makefile diff --git a/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix b/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix index 808df455a4..1efcd98b46 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; license = licenses.mit; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 18d791f534..9e7152393a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -102,9 +102,9 @@ rec { export HOME="$(mktemp -d)" ''; - disabledTests = lib.optionals stdenv.isLinux [ + disabledTests = lib.optionals stdenv.hostPlatform.isLinux [ "test_get_tor_paths_linux" # expects /usr instead of /nix/store - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires meek-client which is not packaged "test_get_tor_paths_darwin" # on darwin (and only on darwin) onionshare attempts to discover diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 67dab32e11..61501dbeb2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { GetoptLong TermShellUI ])) ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; cmakeFlags = [ "-DDBUS_NOTIFY=ON" diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix index e8432b4c5c..5074690228 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "BitTorrent client written in C++"; mainProgram = "ctorrent"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix index 81a625e521..d83a33833b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Client for many p2p networks, with multiple frontends"; homepage = "https://github.com/ygrek/mldonkey"; license = lib.licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix index 795f6969ff..240dc41998 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -5,7 +5,7 @@ , pyrosimple , python3 , testers -, withInotify ? stdenv.isLinux +, withInotify ? stdenv.hostPlatform.isLinux }: python3.pkgs.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1ec2cbac9c..c9ff194687 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.5"; + version = "4.6.7"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-umJObvPv4VjdAZdQEuhqFCRvi1eZQViu1IO88oeTTq8="; + hash = "sha256-vUC8YIuyoGnl46FajfJG/XFXG+2lM9EaHWl2Hfo3T7c="; }; nativeBuildInputs = [ @@ -52,11 +52,11 @@ stdenv.mkDerivation rec { qtbase qtsvg qttools - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals guiSupport [ dbus - ] ++ lib.optionals (guiSupport && stdenv.isLinux) [ + ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qtwayland ] ++ lib.optionals trackerSearch [ python3 @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"} mkdir -p $out/{Applications,bin} cp -R $APP_NAME.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix index 9ab60d5a18..120afed45d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--all" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index dd27a22168..25296efe69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -55,7 +55,7 @@ let zlib ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]); + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); in stdenv.mkDerivation (finalAttrs: { @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_MAC" false) # requires xcodebuild (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6)) (cmakeBool "INSTALL_LIB" installLib) - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16. "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; @@ -145,8 +145,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ]) ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ] - ++ optionals stdenv.isDarwin [ libiconv Foundation ]; + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; postInstall = '' mkdir $apparmor diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix index 8f3b2c6e35..98ab36dac0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.hostPlatform.isDarwin , xclip ? null , pbcopy ? null , useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat @@ -7,7 +7,7 @@ let wrapperPath = lib.makeBinPath ( lib.optional x11Support xclip ++ - lib.optional stdenv.isDarwin pbcopy + lib.optional stdenv.hostPlatform.isDarwin pbcopy ); in python3Packages.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix index f27a570123..047e86036d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix @@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: { openssl libsamplerate ] - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreFoundation Security @@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: { env = lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } - // lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; }; + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-headerpad_max_install_names"; + }; preConfigure = '' export LD=$CC @@ -86,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { python -m installer --prefix $py dist/*.whl ) '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # On MacOS relative paths are used to refer to libraries. All libraries use # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to # rewrite these to use absolute ones. diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index edb42aa79e..16c2bcf66c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-3nEf9maHDd2LmRpgRqvFOub2DQNvjP3iEBRUlpvo8yg="; + hash = "sha256-rwESt2s/TCAFNkf+JwMa7sfYpRvMT8FoIii4EzR/Z6U="; }; - vendorHash = "sha256-c8KNdENF0wRQ0Ssv6mgnZkY4BOcEoY7r80/hd7XJ5yo="; + vendorHash = "sha256-jmXh53KwzPvmu7RP1F1Ein9/EfJ5m/GGVAqjJVcEVsE="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index 9484a1c42d..c60fe44d24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -16,8 +16,6 @@ proton-vpn-killswitch-network-manager, proton-vpn-logger, proton-vpn-network-manager, - proton-vpn-network-manager-openvpn, - proton-vpn-network-manager-wireguard, proton-vpn-session, pycairo, pygobject3, @@ -67,8 +65,6 @@ buildPythonApplication rec { proton-vpn-killswitch-network-manager proton-vpn-logger proton-vpn-network-manager - proton-vpn-network-manager-openvpn - proton-vpn-network-manager-wireguard proton-vpn-session pycairo pygobject3 diff --git a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index 01e471c97d..1105933a9a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { fetchSubmodules = true; }; - postPatch = lib.optionals stdenv.isDarwin '' + postPatch = lib.optionals stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/platforms/macos.cmake \ --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt ''; @@ -76,7 +76,7 @@ mkDerivation rec { maintainers = with maintainers; [ poscat rewine ]; platforms = platforms.all; # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "qv2ray"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 18c3da84c3..b59a82f720 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { message = '' In order to use Citrix Workspace, you need to comply with the Citrix EULA and download - the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: + the ${if stdenv.hostPlatform.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: ${homepage} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 1b0826c4d2..2b5d0e9d7b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -3,9 +3,9 @@ let mkVersionInfo = _: { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: { inherit homepage; - version = "${major}.${minor}.${patch}.${if stdenv.is64bit then x64suffix else x86suffix}"; - prefix = "linuxx${if stdenv.is64bit then "64" else "86"}"; - hash = if stdenv.is64bit then x64hash else x86hash; + version = "${major}.${minor}.${patch}.${if stdenv.hostPlatform.is64bit then x64suffix else x86suffix}"; + prefix = "linuxx${if stdenv.hostPlatform.is64bit then "64" else "86"}"; + hash = if stdenv.hostPlatform.is64bit then x64hash else x86hash; }; # Attribute-set with all actively supported versions of the Citrix workspace app diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix index 31d5b2beee..49b412bf76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix @@ -152,13 +152,13 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image uriparser zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib fuse3 systemd wayland wayland-scanner - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AVFoundation Carbon @@ -179,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { WITH_CUPS = cups != null; WITH_FAAC = withUnfree && faac != null; WITH_FAAD2 = faad2 != null; - WITH_FUSE = stdenv.isLinux && fuse3 != null; + WITH_FUSE = stdenv.hostPlatform.isLinux && fuse3 != null; WITH_JPEG = libjpeg_turbo != null; WITH_KRB5 = libkrb5 != null; WITH_OPENH264 = openh264 != null; @@ -194,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { WITH_X11 = true; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-error=incompatible-function-pointer-types" ]); - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-framework AudioToolbox" ]); diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 988986812e..7490066c73 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -64,7 +64,7 @@ let dir = "libfreerdp/crypto/test"; file = "Test_x509_cert_info.c"; } - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ { dir = "winpr/libwinpr/sysinfo/test"; file = "TestGetComputerName.c"; @@ -140,11 +140,11 @@ stdenv.mkDerivation rec { pcre2 pcsclite zlib - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ alsa-lib systemd wayland - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AVFoundation Carbon @@ -185,7 +185,7 @@ stdenv.mkDerivation rec { WITH_X11 = true; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" @@ -193,7 +193,7 @@ stdenv.mkDerivation rec { "-Wno-error=incompatible-function-pointer-types" ]); - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-framework AudioToolbox" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix index 82f096699b..585f48d3a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/putty/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkg-config copyDesktopItems ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ gtk3 ncurses - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; enableParallelBuilding = true; desktopItems = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix index a544984ee7..b92822b17d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1 , nettle, gnutls, pkg-config, autoreconfHook, libiconv -, enableCredssp ? (!stdenv.isDarwin) +, enableCredssp ? (!stdenv.hostPlatform.isDarwin) } : stdenv.mkDerivation (rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] ++ lib.optional enableCredssp krb5 - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; configureFlags = [ "--with-ipv6" diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index c960d0b473..eb926ff1c0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -10,8 +10,8 @@ , wayland # The themes here are soft dependencies; only icons are missing without them. , adwaita-icon-theme -, withKf5Wallet ? stdenv.isLinux, libsForQt5 -, withLibsecret ? stdenv.isLinux +, withKf5Wallet ? stdenv.hostPlatform.isLinux, libsForQt5 +, withLibsecret ? stdenv.hostPlatform.isLinux , withWebkitGtk ? false, webkitgtk_4_1 , withVte ? true, vte }: @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ curl @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { openssl adwaita-icon-theme json-glib libsodium harfbuzz python3 wayland - ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ] @@ -65,13 +65,13 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" "-DWITH_CUPS=OFF" "-DWITH_ICON_CACHE=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" ]); @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { gappsWrapperArgs+=( --set-default SSL_CERT_DIR "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''} ) diff --git a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix index 08c5243414..70b446db8a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { libXinerama libXrandr libXxf86vm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 192f8f02c7..c4b6ffdba0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-CJ9ZkoQmZlDI9mgZkEOWuJn66Dvt2f1DjPGf140qJDg="; + hash = "sha256-oIRMzifp/MVw+0s/QjhZpW7HEjNPHiCyEoNQq6ZRBGE="; }; modRoot = "./agent"; - vendorHash = "sha256-QWscqQlkvpfvJnI4C74qqD2P9V7ZAY29kCLF1WTTJ7Q="; + vendorHash = "sha256-qqh9KdhOt6KDgwUhf6lzb6I7YAhocBSZ7UeyBT0e0eM="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/qtwirediff/default.nix index 7cadaee0e2..ad71c217db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -27,17 +27,17 @@ stdenv.mkDerivation { buildInputs = [ qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r qtwirediff.app $out/Applications makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 -T qtwirediff $out/bin/qtwirediff wrapProgram $out/bin/qtwirediff \ --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index 191924ac70..04f62befcc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -51,7 +51,7 @@ , qt6 ? null }: let - isAppBundle = withQt && stdenv.isDarwin; + isAppBundle = withQt && stdenv.hostPlatform.isDarwin; in assert withQt -> qt6 != null; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -126,13 +126,13 @@ stdenv.mkDerivation rec { qtmultimedia qtsvg qttools - ]) ++ lib.optionals (withQt && stdenv.isLinux) [ + ]) ++ lib.optionals (withQt && stdenv.hostPlatform.isLinux) [ qt6.qtwayland - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl sbc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices gmp SystemConfiguration @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString isAppBundle '' mkdir -p $out/Applications mv $out/bin/Wireshark.app $out/Applications/Wireshark.app - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' local flags=() for file in $out/lib/*.dylib; do flags+=(-change @rpath/"$(basename "$file")" "$file") diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix index 79df10e207..146c0941e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libpcap openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib expat fontconfig @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit rustPlatform.bindgenHook ]; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { --replace 'Exec=/usr/bin/sniffnet' 'Exec=sniffnet' ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/sniffnet \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 libxkbcommon wayland ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix index bfc2d1e84d..3528c48a18 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stc"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "tenox7"; repo = pname; rev = version; - sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U="; + sha256 = "sha256-Hv8md27LUB/d1MNqNEw7UX7r3tMYdguuGP3xOI2LWBk="; }; - vendorHash = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8="; + vendorHash = "sha256-TnWCviLstm6kS34cNkrVGS9RZ21cVX/jmx8d+KytB0c="; meta = with lib; { description = "Syncthing CLI Tool"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix index fe2d7b07ac..b1a946f244 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix @@ -66,12 +66,12 @@ rustPlatform.buildRustPackage rec { libadwaita librclone pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Security ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ]); diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix index bdb1b69289..66fa5665cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Special flags needed on Darwin: # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; dontUseCmakeBuildDir = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index df4001e1d0..87f7080f2f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "rclone"; - version = "1.68.0"; + version = "1.68.1"; outputs = [ "out" "man" ]; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "rclone"; repo = "rclone"; rev = "v${version}"; - hash = "sha256-xLTzfS3/9XBqh0B7/VeRKYEHAgc4rY3QcIUS3f1/e0M="; + hash = "sha256-qVk1l6PLB2S9KlUiccBN60wbaApZnPXTjq1LYsf7pyE="; }; vendorHash = "sha256-vZxdayoKTo/fs5PgEdT4gepNq0kNNmLQhlybWY5kpx0="; @@ -23,13 +23,13 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = lib.optional enableCmount (if stdenv.isDarwin then macfuse-stubs else fuse); + buildInputs = lib.optional enableCmount (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse); tags = lib.optionals enableCmount [ "cmount" ]; ldflags = [ "-s" "-w" "-X github.com/rclone/rclone/fs.Version=${version}" ]; - postConfigure = lib.optionalString (!stdenv.isDarwin) '' + postConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace vendor/github.com/winfsp/cgofuse/fuse/host_cgo.go \ --replace-fail '"libfuse.so.2"' '"${lib.getLib fuse}/lib/libfuse.so.2"' ''; @@ -51,7 +51,7 @@ buildGoModule rec { # filesystem helpers ln -s $out/bin/rclone $out/bin/rclonefs ln -s $out/bin/rclone $out/bin/mount.rclone - '' + lib.optionalString (enableCmount && !stdenv.isDarwin) + '' + lib.optionalString (enableCmount && !stdenv.hostPlatform.isDarwin) # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount3, # as the setuid wrapper is required as non-root on NixOS. '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix index f25fcb8786..07548fbe66 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.111.4"; + version = "1.113.4"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-WwqB0la3JBJ5074Y0erOIC60++pLLbFF3LhekbRBUWA="; + hash = "sha256-nf2fNnkY6Z0T5dfSRUmqYpstV5yP+dJiZqB/AF3NR94="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-dA/XMBnFRDBqBlYz3j0Q6E7asmrixG71Vv52F9WX8ew="; + vendorHash = "sha256-NnFCs64xUoFFHFQs/3YtdJkUurd3TxNieZJ96VqnJaU="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix index 956dd598d4..f7d0fdeb5c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix @@ -28,11 +28,11 @@ buildPythonApplication rec { ./trusted_certificates.patch ]; - buildInputs = lib.optionals enableGUI [ (if stdenv.isLinux then qt6.qtwayland else qt6.qtbase) ]; + buildInputs = lib.optionals enableGUI [ (if stdenv.hostPlatform.isLinux then qt6.qtwayland else qt6.qtbase) ]; propagatedBuildInputs = [ certifi pem twisted ] ++ twisted.optional-dependencies.tls ++ lib.optional enableGUI pyside6 - ++ lib.optional (stdenv.isDarwin && enableGUI) appnope; + ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope; nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 99934a9646..b87752f041 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -24,7 +24,7 @@ let vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4="; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when # run from Launch Agents/Daemons, even on x86 devices where it has a # more lax code signing policy compared to Apple Silicon. So just sign @@ -87,7 +87,7 @@ in install -Dm644 "$mf" "$mandir/$(basename "$mf")" done - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/lib/systemd/{system,user} substitute etc/linux-systemd/system/syncthing@.service \ @@ -109,7 +109,7 @@ in stname = "syncthing-relay"; target = "strelaysrv"; - postInstall = lib.optionalString (stdenv.isLinux) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/lib/systemd/system substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix index 0c2f6c1d5a..fb930edd14 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix @@ -78,4 +78,4 @@ let cp -R 'Synology Drive Client.app' $out/Applications/ ''; }; -in if stdenv.isDarwin then darwin else linux +in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix index 9537ab4c17..dfab962499 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2024.98.119300"; + version = "2024.263.131851"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-N0cabYHaF5H1EeriQRQL7bN5UM85oOGrm9pxGr1AlEk="; + hash = "sha256-8rmTGCHROdq+g+IsuZUMbhXfQEKfiy0riSXjLZ2yDhA="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix b/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix index 5af5c568e4..5f87a73954 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/umurmur/umurmur"; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "umurmurd"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix index d7f64031c9..c41cc99df4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation ]; @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.all; mainProgram = "warp"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix index 15e46e291b..58d818bbe2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-25FFXrUE1NvIXlOFR9KZyjD3w8xuvPlpqz/KkUTt1TQ="; + x86_64-linux = "sha256-l7uu101UcY5AGMh6BzMvXvPMw1tlaX6grus9eL9Kxf8="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "11.2"; + version = "11.3"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix b/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix index 238bedd52b..d2fa2778fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # ld: unknown option: --export-dynamic - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "yaup"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix index 5f47ca9bbe..fa7acd9310 100644 --- a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; installPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix index a7a979ed82..f3a7ea76c5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper copyDesktopItems - ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ gtk3 @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; installPhase = - lib.optionalString stdenvNoCC.isLinux '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' runHook preInstall cd AppFlowy/ @@ -67,7 +67,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall '' - + lib.optionalString stdenvNoCC.isDarwin '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/{Applications,bin} @@ -77,17 +77,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; preFixup = - lib.optionalString stdenvNoCC.isLinux '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' # Add missing libraries to appflowy using the ones it comes with makeWrapper $out/opt/AppFlowy $out/bin/appflowy \ --set LD_LIBRARY_PATH "$out/opt/lib/" \ --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}" '' - + lib.optionalString stdenvNoCC.isDarwin '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' makeWrapper $out/Applications/AppFlowy.app/Contents/MacOS/AppFlowy $out/bin/appflowy ''; - desktopItems = lib.optionals stdenvNoCC.isLinux [ + desktopItems = lib.optionals stdenvNoCC.hostPlatform.isLinux [ (makeDesktopItem { name = "appflowy"; desktopName = "AppFlowy"; diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix index 2749f3577c..0d122cfbf3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qttools - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals useMupdf [ freetype diff --git a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix index c8883f3633..5679c44ca2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix @@ -30,14 +30,14 @@ , WebKit , System , waylandSupport ? false -, x11Support ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux , testers , espanso }: # espanso does not support building with both X11 and Wayland support at the same time -assert stdenv.isLinux -> x11Support != waylandSupport; -assert stdenv.isDarwin -> !x11Support; -assert stdenv.isDarwin -> !waylandSupport; +assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport; +assert stdenv.hostPlatform.isDarwin -> !x11Support; +assert stdenv.hostPlatform.isDarwin -> !waylandSupport; rustPlatform.buildRustPackage rec { pname = "espanso"; version = "2.2-unstable-2024-05-14"; @@ -69,20 +69,20 @@ rustPlatform.buildRustPackage rec { "modulo" ] ++ lib.optionals waylandSupport [ "wayland" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "vendored-tls" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "native-tls" ]; buildInputs = [ wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl dbus libnotify libxkbcommon - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { xdotool ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace scripts/create_bundle.sh \ --replace-fail target/mac/ $out/Applications/ \ --replace-fail /bin/echo ${coreutils}/bin/echo @@ -119,12 +119,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh '' else '' wrapProgram $out/bin/espanso \ --prefix PATH : ${lib.makeBinPath ( - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ libnotify setxkbmap ] ++ lib.optionals waylandSupport [ diff --git a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix index f87eaf6d9e..32cbcf088c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ant jdk wrapGAppsHook3 makeWrapper stripJavaArchivesHook ]; - buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib libXtst ] - ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ gtk2 glib libXtst ] + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; dontWrapGApps = true; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${jre}/bin/java $out/bin/jameica \ --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ - lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' + lib.optionalString stdenv.hostPlatform.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ --chdir "$out/share/java/" \ diff --git a/third_party/nixpkgs/pkgs/applications/office/kitsas/default.nix b/third_party/nixpkgs/pkgs/applications/office/kitsas/default.nix index f8f32ecec6..9821cdd2f2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/kitsas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/kitsas/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { qmakeFlags = [ "../kitsas/kitsas.pro" ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv kitsas.app $out/Applications - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm755 kitsas -t $out/bin install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix index d2e62f8e5c..aeab3da08d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix @@ -16,7 +16,7 @@ , gnugrep # Configuration options for the wrapper , extraMakeWrapperArgs ? [] -, dbusVerify ? stdenv.isLinux +, dbusVerify ? stdenv.hostPlatform.isLinux , dbus }: diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix index 46c318ffbd..8fd6b2dd52 100644 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ yarnBuildHook copyDesktopItems makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix b/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix index 14f3c40981..b88f702258 100644 --- a/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; }; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" - '' + lib.optionalString (stdenv.isLinux && !stdenv.isx86_64) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64) '' substituteInPlace 3rd/CMakeLists.txt \ --replace "-msse4.2 -maes" "" ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config wrapGAppsHook3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sqlite wxGTK32 gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "-Wno-unused-parameter" ]); - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/mmex.app $out/Applications makeWrapper $out/{Applications/mmex.app/Contents/MacOS,bin}/mmex diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 9e8f2e6f6a..b0e51f5a8e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -25,13 +25,13 @@ }: let - version = "2.11.6"; + version = "2.12.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-RNX+KS2h9zrOK8QzeQWH55pkNPTDW4gic2HLG+XXLRg="; + hash = "sha256-txqwVGLUel74ObCqwMWSqa4Nd2eDRf0SqAIes5tlMDg="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -76,18 +76,18 @@ let cd src-ui ''; - npmDepsHash = "sha256-ML1Yp3JIMbRF6kVu190ReoY7oDUtUfNkHE7dHF6YUAE="; + npmDepsHash = "sha256-hb2z2cPMTN5bHtUldTR5Mvgo4nZL8/S+Uhfis37gF44="; nativeBuildInputs = [ pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib darwin.apple_sdk.frameworks.CoreText ]; @@ -116,16 +116,22 @@ let in python.pkgs.buildPythonApplication rec { pname = "paperless-ngx"; - format = "other"; + pyproject = false; inherit version src; + postPatch = '' + # pytest-xdist makes the tests flaky + substituteInPlace src/setup.cfg \ + --replace-fail "--numprocesses auto --maxprocesses=16" "" + ''; + nativeBuildInputs = [ gettext xorg.lndir ]; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ bleach channels channels-redis @@ -192,7 +198,7 @@ python.pkgs.buildPythonApplication rec { ''; installPhase = let - pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + pythonPath = python.pkgs.makePythonPath dependencies; in '' runHook preInstall @@ -203,7 +209,7 @@ python.pkgs.buildPythonApplication rec { makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "${pythonPath}" \ --prefix PATH : "${path}" - makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ + makeWrapper ${lib.getExe python.pkgs.celery} $out/bin/celery \ --prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \ --prefix PATH : "${path}" @@ -225,7 +231,6 @@ python.pkgs.buildPythonApplication rec { pytest-httpx pytest-mock pytest-rerunfailures - pytest-xdist pytestCheckHook ]; @@ -254,7 +259,7 @@ python.pkgs.buildPythonApplication rec { "test_rtl_language_detection" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { inherit python path frontend tesseract5; diff --git a/third_party/nixpkgs/pkgs/applications/office/planify/default.nix b/third_party/nixpkgs/pkgs/applications/office/planify/default.nix index ebc72aa2aa..7c10b9953c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/planify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.11.2"; + version = "4.11.4"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-yEe8zBaczCCY5Cs9lIc2J3GYSeDwmB1vsX9cANXQIC0="; + hash = "sha256-ADNMSXvfeAT53coAtCu3CVCU5XUFhLbvAH3WPFoKJVE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix index 8ada870912..f370ecec9d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix @@ -7,9 +7,9 @@ , gobject-introspection , libcanberra-gtk3 , poppler_gi -, withGstreamer ? stdenv.isLinux +, withGstreamer ? stdenv.hostPlatform.isLinux , gst_all_1 -, withVLC ? stdenv.isLinux +, withVLC ? stdenv.hostPlatform.isLinux }: python3Packages.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix index c091f61dff..4fd2e741ad 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix @@ -47,7 +47,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` + broken = stdenv.hostPlatform.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 2b8d0d0892..71b574ee38 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { pkg-config installShellFiles xvfb-run - ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ qtbase @@ -45,7 +45,7 @@ stdenv.mkDerivation { qtsvg qtwebsockets botan2 - ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; cmakeFlags = [ "-DQON_QT6_BUILD=ON" @@ -61,11 +61,11 @@ stdenv.mkDerivation { --fish <(xvfb-run $out/bin/${appname} --completion fish) '' # Create a lowercase symlink for Linux - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' ln -s $out/bin/${appname} $out/bin/${pname} '' # Wrap application for macOS as lowercase binary - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/${appname}.app $out/Applications makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix b/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix index 408f026bc5..3edbbe1a50 100644 --- a/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix @@ -2,7 +2,7 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix (extraArgs // { }) else callPackage ./linux.nix (extraArgs // { }) diff --git a/third_party/nixpkgs/pkgs/applications/office/scribus/default.nix b/third_party/nixpkgs/pkgs/applications/office/scribus/default.nix index 85c0afe9db..f95ac14c67 100644 --- a/third_party/nixpkgs/pkgs/applications/office/scribus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/scribus/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { mit publicDomain ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix index b52dc1dc83..a696ab5412 100644 --- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shopt -s extglob mkdir -p $out/{share/treesheets,bin} mv $out/!(share) $out/share/treesheets diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix index 9681c5fc9b..13a291f458 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix @@ -96,4 +96,4 @@ let }; in - if stdenv.isDarwin then darwin else linux + if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix b/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix index 3647d8ea8e..c3b2aaf42a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "OBJDIR=$TMP/wg-build" ]; - preBuild = lib.optionalString stdenv.isLinux '' + preBuild = lib.optionalString stdenv.hostPlatform.isLinux '' makeFlagsArray+=('XFT_PACKAGE=--cflags={} --libs={-lX11 -lXft}') ''; @@ -38,17 +38,17 @@ stdenv.mkDerivation rec { ncurses readline zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXft ]; # To be able to find - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix index 0f4017dbbc..77eaaa16b9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix @@ -55,6 +55,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; mainProgram = "zim"; - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix index 02c4e74eb8..abeb83c927 100644 --- a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libpng libusb1 zlib - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # upstream mentions these are not needed for Mac # see: https://github.com/michaelrsweet/pappl#requirements avahi diff --git a/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix b/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix index 6cb0f40f12..3c1fa511ae 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; cmakeFlags = - lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; meta = with lib; { homepage = "https://github.com/airspy/airspyone_host"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix index af05cb61e8..65bbdbb05d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libsamplerate ]; - hardeningDisable = lib.optional stdenv.isAarch64 "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "format"; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = teams.c3d2.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix index 839fc9ceaa..2677795dc0 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libGL libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix index e55f895d24..6cd591fcbd 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] - ++ lib.optionals stdenv.isDarwin [ portaudio ] + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ] ++ lib.optionals gpsdSupport [ gpsd ] ++ lib.optionals hamlibSupport [ hamlib ] ++ lib.optionals extraScripts [ python3 perl espeak ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix index 39c7f832e0..c34e18be86 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ncurses rtl-sdr soapysdr-with-plugins - ] ++ lib.optional stdenv.isLinux limesuite; + ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix index 2390a4f8c0..0a7edb7aed 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { portaudio libsndfile libsamplerate - ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libpulseaudio alsa-lib udev ]; env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/flex-ndax/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flex-ndax/default.nix index ff2aedf600..e45604856a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/flex-ndax/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/flex-ndax/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/kc2g-flex-tools/nDAX"; description = "FlexRadio digital audio transport (DAX) connector for PulseAudio"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix index 27da63dd40..d53f670316 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix @@ -16,7 +16,7 @@ , hamlib_4 , wxGTK32 , sioclient -, pulseSupport ? config.pulseaudio or stdenv.isLinux +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , AppKit , AVFoundation , Cocoa @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace-fail "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ macdylibbundler makeWrapper darwin.autoSignDarwinBinariesHook @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { wxGTK32 sioclient ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AVFoundation Cocoa @@ -74,13 +74,13 @@ stdenv.mkDerivation rec { "-DUSE_PULSEAUDIO:BOOL=${if pulseSupport then "TRUE" else "FALSE"}" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DAPPLE_OLD_XCODE" ]); doCheck = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/FreeDV.app $out/Applications makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix index 67cc2d6c8e..b611ef66b8 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix @@ -150,8 +150,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index e7efa57428..f9113b0a23 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -170,8 +170,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix index fe75f6037f..75a2a97e0d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix @@ -88,7 +88,7 @@ in { remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' # Clang references in InstalledDir - + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) '' + + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.hostPlatform.isDarwin) '' remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' ; @@ -116,7 +116,7 @@ in { dontWrapQtApps = true; # On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if # find libgnuradio-runtim.3.*.dylib . - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d) export QT_QPA_PLATFORM=offscreen diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix index f468aadb27..4ffe42593e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix @@ -127,7 +127,7 @@ let unwrapped.qt.qtbase.qtPluginPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" @@ -137,7 +137,7 @@ let unwrapped.qt.qtbase.qtQmlPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" diff --git a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix index d8d7bcd22d..9190896d8e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gnuplot libusb1 soapysdr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ GLUT ] ++ lib.optionals withGui [ fltk diff --git a/third_party/nixpkgs/pkgs/applications/radio/m17-cxx-demod/default.nix b/third_party/nixpkgs/pkgs/applications/radio/m17-cxx-demod/default.nix index d6663fbc42..47a7d103e7 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/m17-cxx-demod/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/m17-cxx-demod/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.c3d2.members; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index 70f3da3118..f71af7e648 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-irKpVerxzjJIiLofoTdySk/PzojuVLgMq2DYF0qPaAM="; }; - buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libX11 ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix b/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix index 267be192f4..1f1140e5fd 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix @@ -25,11 +25,11 @@ buildGoModule rec { installShellFiles ]; - buildInputs = lib.optional stdenv.isLinux [ libax25 ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ]; # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 - tags = lib.optionals stdenv.isLinux [ "libax25" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "libax25" ]; postInstall = '' installManPage man/pat-configure.1 man/pat.1 diff --git a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix index 2ebc0d30ff..442828a763 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix @@ -16,7 +16,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix index 86da4b081e..dacdfcbb27 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { qtwebchannel hamlib qtkeychain - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ cups ]); diff --git a/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix index f0bbba9b0a..6cb25feb98 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix @@ -13,7 +13,7 @@ let nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ libusb1 ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" "-DWITH_RPC=ON" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrplay/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrplay/default.nix index 9d9ee298e0..d19ed4b027 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrplay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrplay/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }: let arch = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isi686 then "i686" - else if stdenv.isAarch64 then "aarch64" + if stdenv.hostPlatform.isx86_64 then "x86_64" + else if stdenv.hostPlatform.isi686 then "i686" + else if stdenv.hostPlatform.isAarch64 then "aarch64" else throw "unsupported architecture"; version = "3.07.1"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrpp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrpp/default.nix index 3ce8f1f7f4..151a967d94 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrpp/default.nix @@ -8,7 +8,7 @@ , hackrf_source ? true, hackrf , limesdr_source ? true, limesuite , perseus_source ? false # needs libperseus-sdr, not yet available in nixpks -, plutosdr_source ? stdenv.isLinux, libiio, libad9361 +, plutosdr_source ? stdenv.hostPlatform.isLinux, libiio, libad9361 , rfspace_source ? true , rtl_sdr_source ? true, rtl-sdr-osmocom, libusb1 # osmocom better w/ rtlsdr v4 , rtl_tcp_source ? true @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glfw glew fftwFloat volk zstd ] - ++ lib.optional stdenv.isDarwin AppKit - ++ lib.optional stdenv.isLinux libX11 + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit + ++ lib.optional stdenv.hostPlatform.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf ++ lib.optional bladerf_source libbladeRF diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix index 289a20d281..9d198ad15e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ airspy soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyaudio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyaudio/default.nix index 7434791b69..86921754d6 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyaudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyaudio/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hamlib rtaudio libjack2 libusb1 soapysdr ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreAudio ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix index 0f2b445b96..15c4650735 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbladeRF soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix index be621c0d31..3f385a4b72 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hackrf soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyremote/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyremote/default.nix index c6e7cddd09..4191b8ae95 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyremote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyremote/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-include sys/select.h" ]); meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix index 80ea41e4f9..f0a5194a4a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix index 9220df3f5f..de7b7be855 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ uhd boost soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/splat/default.nix b/third_party/nixpkgs/pkgs/applications/radio/splat/default.nix index 59d0fc1fde..1bf4e738c7 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/splat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/splat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz"; license = licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix b/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix index 62e645fb6d..2d8b9f8579 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbtbb libpcap libusb1 bluez ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=TRUE" "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DUDEV_RULES_GROUP=${udevGroup}" diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix index 947d7d4810..ce668c4530 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 - ] ++ optionals stdenv.isAarch32 [ + ] ++ optionals stdenv.hostPlatform.isAarch32 [ "-DCMAKE_CXX_FLAGS=-Wno-psabi" ]; @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # many tests fails on darwin, according to ofborg - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # Build only the host software preConfigure = "cd host"; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index 3b31f069b0..eafc631ef9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -22,17 +22,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); patches = [ ./wrapper.patch ] - ++ lib.optionals stdenv.isDarwin ([ ./clang.patch ./cpp-darwin.patch ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ ./clang.patch ./cpp-darwin.patch ]); env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 - env.GAG_CPP = lib.optionalString stdenv.isDarwin "${gfortran.outPath}/bin/cpp"; + env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix index 070ce96fd5..b734ea9750 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/gak/gravit"; description = "Beautiful OpenGL-based gravity simulator"; mainProgram = "gravit"; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 87118beec9..7ddaf5357e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' @@ -72,22 +72,22 @@ stdenv.mkDerivation (finalAttrs: { libnova exiv2 nlopt - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; preConfigure = '' export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major finalAttrs.version}0101 +%s) - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export LC_ALL=en_US.UTF-8 ''; # fatal error: 'QtSerialPort/QSerialPortInfo' file not found - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-F${qtserialport}/lib"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib"; dontWrapGApps = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Stellarium.app/Contents/MacOS/Stellarium $out/bin/stellarium ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix index 21dbf69407..b42eb791d2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ itk vtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix b/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix index 48537a568e..1e3975f9f5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix @@ -35,9 +35,9 @@ in stdenv.mkDerivation { inherit pname version src; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ]; + buildInputs = [ python3 perl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ zlib bzip2 glib libxml2 ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix index 407d38970b..791d6049ad 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # perl is necessary in buildInputs so that installed perl scripts get patched # correctly buildInputs = [ coreutils perl gawk zlib bzip2 cpio ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; hardeningDisable = [ "format" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix index c339baf446..0a2d2c8d20 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib ]; # see https://github.com/bwa-mem2/bwa-mem2/issues/93 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/memset_s/memset8_s/g' ext/safestringlib/include/safe_mem_lib.h sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset16_s.c sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset32_s.c diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix index d7d23dd2d4..1263f8194c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ (lib.optionalString stdenv.cc.isGNU "-std=c++11") (lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing") - (lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite") + (lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite") ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix index 34ea942b4f..ec1f8612cc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { htslib xz zlib - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; makeFlags = [ "EBROOTHTSLIB=${htslib}" diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix index a3ac4eb542..ce6218449a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost eigen zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/iv/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/iv/default.nix index ba1b91298b..a4b408b14a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/iv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/iv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { break fi done - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix index 0762dcd364..88db919046 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-WA0R1V83xlUFSDR4B95BX7VpzLUVF4U7f+t+x+lt30o="; + sha256 = "sha256-/dpHUrigO0wnWay0jIkg6eG75ynrVXd7zcIAss6DhSs="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix index 3812e9980c..24b9a96019 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.3"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-TlB7Hj4pVN4p4VanACWjQBeTxP9/DvRvdCdgelrXx60="; + hash = "sha256-Hgh1ianEdITRUIDKLiLW32kQlPlXKIfN4PSv3cOXTGI="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix index 53fc807776..aceb010875 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix index 5597b55046..1c523a9092 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - makeFlags = lib.optionals stdenv.isAarch64 [ "arm_neon=1" "aarch64=1" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "arm_neon=1" "aarch64=1" ]; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix index 64eafa0f69..e17aa3ca03 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/MRtrix3/mrtrix3"; description = "Suite of tools for diffusion imaging"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix index 86067538b1..33a56d6e26 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix @@ -20,7 +20,7 @@ gccStdenv.mkDerivation rec { installPhase = let target = - if gccStdenv.isDarwin + if gccStdenv.hostPlatform.isDarwin then "Darwin" else "Linux"; in diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix index 96418346ee..9714f015f7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.cython ] ++ lib.optional withMpi mpi - ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = with python3.pkgs; [ numpy diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix index e54d3c9ba7..fe5de3c68f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { flex git ] ++ optionals useCore [ perl gsl ] - ++ optionals stdenv.isDarwin [ xcbuild ]; + ++ optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = optionals useIv [ xorg.libX11.dev diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix b/third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix index f415c9c391..53aa177307 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.cython cmake ]; - postPatch = lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace setup.py \ --replace "'-msse2'," "" ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix index f742e33e15..1e21d18242 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_POSIX_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_POSIX_C_SOURCE"; preBuild = '' cd ./src/ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix index b91655ac8f..b66bed97a9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; }; - buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; + buildInputs = [ zlib ] ++ (if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Comprehensive update to the PLINK association analysis toolset"; mainProgram = "plink"; homepage = "https://www.cog-genomics.org/plink2"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix index e5e0193f79..9b38171b34 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile \ --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \ --replace "CC= gcc" "CC = $CC" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX" ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix index c195563188..b6291ea852 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix index 62ea61af91..d2ee518883 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = '' cd src - cp Makefile.${if stdenv.isLinux then "Linux" else "MacOS"} Makefile + cp Makefile.${if stdenv.hostPlatform.isLinux then "Linux" else "MacOS"} Makefile ''; makeFlags = [ "CC_EXEC=cc" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "High-performance read alignment, quantification and mutation discovery"; license = licenses.gpl3; maintainers = with maintainers; [ jbedo ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix index fec5a5a3b9..cdb6c4f9c8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Structural variant and INDEL caller for DNA sequencing data, using genome-wide local assembly"; mainProgram = "svaba"; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix index a69b39f4e0..6c8bb21df6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Short read sequence mapper"; license = licenses.gpl3; homepage = "https://github.com/refresh-bio/whisper"; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix index ec8f8e7ffb..766e4dcbd5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { suitesparse blas python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl libiconv ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/default.nix index d56b8a02a2..844fe5fea7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix index cc80cb058d..dc03eac510 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://github.com/gennaro-tedesco/element"; license = licenses.asl20; maintainers = [ maintainers.j0hax ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix index 3ee33cf19b..ceaeb33364 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-linalgebra-templates" "--enable-performance" - ] ++ lib.optional stdenv.isx86_64 "--enable-sse-intrinsics"; + ] ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-intrinsics"; LDFLAGS = "-lblas -llapack"; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix index 9e64ee7afe..c7440e3fad 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -11,7 +11,7 @@ zlibSupport ? true, zlib, libuniqueSupport ? true, libunique, libpngSupport ? true, libpng, - openglSupport ? !stdenv.isDarwin, libGL + openglSupport ? !stdenv.hostPlatform.isDarwin, libGL }: stdenv.mkDerivation rec { @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; maintainers = [ ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix index ae6c0df879..0ec45053bf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -7,6 +7,7 @@ , pkg-config , xorg , autoreconfHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-gFGstyq9bMmBaIS4QE6N3EIC9GxRvyJYUr8DUvwRQBc="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook4 ]; buildInputs = [ wxGTK32 libGL diff --git a/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix b/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix index 7fc5da8dfa..3a70478262 100644 --- a/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { yaml-cpp ncurses accelergy - ] ++ lib.optionals stdenv.isLinux [ gpm ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ]; preConfigure = '' cp -r ./pat-public/src/pat ./src/pat @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { substituteInPlace ./SConstruct \ --replace-fail "env.Replace(AR = \"gcc-ar\")" "pass" \ --replace-fail "env.Replace(RANLIB = \"gcc-ranlib\")" "pass" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # prevent clang from dying on errors that gcc is fine with substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override" @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { sconsFlags = # will fail on clang/darwin on link without --static due to undefined extern # however, will fail with static on linux as nixpkgs deps aren't static - lib.optional stdenv.isDarwin "--static" + lib.optional stdenv.hostPlatform.isDarwin "--static" ++ lib.optional enableAccelergy "--accelergy" ++ lib.optional enableISL "--with-isl"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix index 5d6c83f5df..48a94468ef 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ boost fftw qtbase qtsvg libusb1 libzip python3 - ] ++ lib.optional stdenv.isLinux qtwayland; + ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; meta = with lib; { description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix index e15ef3277a..ef6f297c63 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' sed -i "s/-pg//g" {,src/Apps/TaMaDi/}CMakeLists.txt ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix index 9eb7b50445..04ca24861c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { quazip libngspice clipper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; @@ -93,7 +93,7 @@ stdenv.mkDerivation { "phoenix.pro" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/Fritzing.app $out/Applications/Fritzing.app cp FritzingInfo.plist $out/Applications/Fritzing.app/Contents/Info.plist diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index d28a5cf809..5649b6bb5a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] - ++ lib.optional stdenv.isDarwin gtk-mac-integration; + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; # fix compilation under Darwin # remove these patches upon next release diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index c193352eb4..acf52931c7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -38,7 +38,7 @@ let hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; }) ]; - postPatch = prev.postPatch + lib.optionalString stdenv.isAarch64 '' + postPatch = prev.postPatch + lib.optionalString stdenv.hostPlatform.isAarch64 '' # https://github.com/igraph/igraph/issues/1694 substituteInPlace tests/CMakeLists.txt \ --replace "igraph_scg_grouping3" "" \ @@ -136,7 +136,7 @@ in stdenv.mkDerivation rec { cmakeBuildType = "MinSizeRel"; # some plugins depend on other plugins and need to be able to load them - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do patchelf --set-rpath "$(patchelf --print-rpath "$f"):$out/lib/hal_plugins" "$f" done diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 310f9b1c60..3d39261bc7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ] # wanted by configuration on linux, doesn't seem to affect performance # no effect on closure size - ++ optionals (stdenv.isLinux) [ + ++ optionals (stdenv.hostPlatform.isLinux) [ util-linux libselinux libsepol diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 4dd8fa7431..a5cceb4925 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -22,7 +22,7 @@ , pname ? "kicad" , stable ? true , testing ? false -, withNgspice ? !stdenv.isDarwin +, withNgspice ? !stdenv.hostPlatform.isDarwin , libngspice , withScripting ? true , python3 @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? installPhase = let - bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; + bin = if stdenv.hostPlatform.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ]; in @@ -286,7 +286,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ evils ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "kicad"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix index 327f77d1c4..4a3e40a316 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix @@ -1,6 +1,5 @@ { lib, stdenv , cmake -, gettext , libSrc , stepreduce , parallel diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix index d4c3c68991..1f483034d2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { qt6.qtbase ]; - buildInputs = lib.optional stdenv.isLinux qt6.qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; propagatedBuildInputs = with python3.pkgs; [ cython diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index f0d49ac11f..0c557fbeca 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.13.3"; + version = "1.14.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-u+EmZ+h+TVBHEmrELgU4s1C+Z8Cfp3gN9BnQruwCsYU="; + hash = "sha256-xaJt3zMAv+Op7cQAaKJOyI28oEssMw/7zvEnfReS4aw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix index 60ee6cef77..a3a906c25c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook3 ]; - buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapGApp "$out/bin/${pname}" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix index b6d40a19a1..3a40b10781 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config qttools wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ glib @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pcre python3 qtsvg - ] ++ lib.optionals stdenv.isLinux [ bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix index 58ecf986cf..928cf30593 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # TODO: a mysterious linker error occurs when building the unittests on darwin. # The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "SystemVerilog compiler and language services"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix index f20ce5e0ac..03883652e6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, bison, flex, imake, xorgproto, gccmakedep }: let - libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; - libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; + libiconvInc = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.dev}/include"; + libiconvLib = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { pname = "tkgate"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 1bed876157..b7f2abd37b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # cmake ]; - doCheck = stdenv.isLinux; # darwin tests are broken for now... + doCheck = stdenv.hostPlatform.isLinux; # darwin tests are broken for now... checkTarget = "test"; preConfigure = "autoconf"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix index 826181139c..72f4687f5c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Schematic capture and netlisting EDA tool"; longDescription = '' Xschem is a schematic capture program, it allows creation of diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix index 85cdafb660..56fc59c080 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "High-performance analog circuit simulator"; longDescription = '' Xyce is a SPICE-compatible, high-performance analog circuit simulator, diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index 03787a3a08..73dcd65960 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -28,7 +28,7 @@ ocamlPackages.buildDunePackage { inherit pname version src; - nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; + nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); meta = { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/boolector/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/boolector/default.nix index 1fd6bf7dc5..30e3cf5002 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/boolector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/boolector/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; doCheck = true; preCheck = - let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + let var = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in # tests modelgen and modelgensmt2 spawn boolector in another processes and # macOS strips DYLD_LIBRARY_PATH, hardcode it for testing - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp -r bin bin.back install_name_tool -change libboolector.dylib $(pwd)/lib/libboolector.dylib bin/boolector '' + '' @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { patchShebangs .. ''; - postCheck = lib.optionalString stdenv.isDarwin '' + postCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' rm -rf bin mv bin.back bin ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix index 5aca699f9d..2b547eeb92 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0ncl4xwms8d656x95ga8v8zjybx4cmdl5hlcml7dpcgm3p8qj4ks"; }; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; installPhase = '' mkdir -p $out $dev/include/btor2parser/ $lib/lib diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix index c980e84f9d..0bfb512737 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; # error: no member named 'aligned_alloc' in the global namespace - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index fd20908c93..c45ee7190e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 +{ lib, stdenv, fetchzip, fetchurl, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12 , ocamlPackages_4_14 @@ -62,7 +62,7 @@ let }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix - { inherit lib stdenv fetchzip; } + { inherit lib stdenv fetchzip fetchurl; } { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } args.version; version = fetched.version; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix index 2dc12b7ab7..c44b495f2c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ] - ++ lib.optionals (!stdenv.isDarwin) [ cln ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cln ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" "--with-readline" "--with-boost=${boost.dev}" - ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--with-cln" ]; prePatch = '' patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix index d43ae16a64..04c5f746f6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; buildInputs = [ curl zlib openssl ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; buildFeatures = [ "no-self-update" ]; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ # Run patchelf on the downloaded binaries. # This is necessary because Lean 4 is now dynamically linked. (runCommand "0001-dynamically-patchelf-binaries.patch" { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix index 20267e6071..bfaf2489bd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix @@ -14,9 +14,9 @@ buildDotnetModule rec { nugetDeps = ./nuget.nix; projectFile = "Src/CommandLine/CommandLine.csproj"; - postFixup = if stdenv.isLinux then '' + postFixup = if stdenv.hostPlatform.isLinux then '' mv $out/bin/CommandLine $out/bin/formula - '' else lib.optionalString stdenv.isDarwin '' + '' else lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix index f23dce326d..883eb4331c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Interactive theorem prover based on Higher-Order Logic"; longDescription = '' HOL4 is the latest version of the HOL interactive proof diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix index 0cd5e90cbb..d97eb42b40 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; # tests are broken on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index f0bd2ba777..4df1d6eb8a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace $out/bin/leanpkg \ --replace "greadlink" "${coreutils}/bin/readlink" ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix index e30b8af047..83cada9e30 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "lean"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix index 3d86c8cafd..465360a202 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper copyDesktopItems unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix index d278f1e784..951d5b22de 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper copyDesktopItems unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix index c26e5f2e76..a0cbdabc5a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Toolset for model-checking concurrent systems and protocols"; longDescription = '' A formal specification language with an associated toolset, diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/nuXmv/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/nuXmv/default.nix index ad40902e92..5726796bfa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/nuXmv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/nuXmv/default.nix @@ -5,21 +5,21 @@ stdenv.mkDerivation rec { version = "2.0.0"; src = fetchurl { - url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${if stdenv.isDarwin then "macosx64" else "linux64"}.tar.gz"; - sha256 = if stdenv.isDarwin + url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${if stdenv.hostPlatform.isDarwin then "macosx64" else "linux64"}.tar.gz"; + sha256 = if stdenv.hostPlatform.isDarwin then "sha256-48I+FhJUUam1nMCMMM47CwGO82BYsNz0eHDHXBfqO2E=" else "sha256-Gf+QgAjTrysZj7qTtt1wcQPganDtO0YtRY4ykhLPzVo="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ gmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gmp ]; installPhase= '' runHook preInstall install -Dm755 -t $out/bin ./bin/nuXmv runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/nuXmv --prefix DYLD_LIBRARY_PATH : ${gmp}/lib ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix index 2290ff2922..798643acc1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "State-of-the-art MaxSAT and Pseudo-Boolean solver"; mainProgram = "open-wbo"; maintainers = with maintainers; [ gebner ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix index 1a031e8d1e..0ebbbc663c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Satisfiability modulo theory (SMT) solver"; mainProgram = "opensmt"; maintainers = [ maintainers.raskin ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix index 1fef05069a..23fc2776ba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; - makeFlags = lib.optional stdenv.isDarwin + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix index bd3e9d3e83..0f7d05a882 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; # error: invalid suffix on literal; C++11 requires a space between literal and identifier - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-reserved-user-defined-literal"; installPhase = '' mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { cp -r coq* "$out/lib/satallax/" ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix index 2aa92118b0..e621b36a77 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -108,7 +108,7 @@ mkDerivation (common "tamarin-prover" src // { executableToolDepends = [ makeWrapper which maude graphviz ]; postInstall = '' wrapProgram $out/bin/tamarin-prover \ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ '' + '' --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 9dbbe8455d..ca495dcc28 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index b6fa984e7d..2b3bd27760 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { gfortran.cc.lib lapack openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index b6fac3cca9..f2825e1356 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu bison imake which blas lapack curl tcl tk jdk tzdata - ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: # https://github.com/NixOS/nixpkgs/issues/146131 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace "-install_name libRblas.dylib" "-install_name $out/lib/R/lib/libRblas.dylib" \ --replace "-install_name libRlapack.dylib" "-install_name $out/lib/R/lib/libRlapack.dylib" \ @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { RANLIB=$(type -p ranlib) r_cv_have_curl728=yes R_SHELL="${stdenv.shell}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' --disable-R-framework --without-x OBJC="clang" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix index 0f36c4783d..f82cef9d88 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { ++ lib.optional ncclSupport nccl ++ lib.optionals leveldbSupport [ leveldb snappy ] ++ lib.optionals pythonSupport [ python numpy ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ] ; propagatedBuildInputs = lib.optionals pythonSupport ( # requirements.txt let pp = python.pkgs; in ([ pp.numpy pp.scipy pp.scikit-image pp.h5py - pp.matplotlib pp.ipython pp.networkx pp.nose + pp.matplotlib pp.ipython pp.networkx pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six ] ++ lib.optional leveldbSupport pp.leveldb) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/cemu-ti/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/cemu-ti/default.nix index c8d5bea6f6..547b57b312 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/cemu-ti/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/cemu-ti/default.nix @@ -1,39 +1,39 @@ { stdenv , lib , fetchFromGitHub -, qmake +, cmake , pkg-config -, wrapQtAppsHook +, qt6 , libarchive , libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "CEmu"; - version = "unstable-2022-06-29"; + version = "2.0"; src = fetchFromGitHub { owner = "CE-Programming"; repo = "CEmu"; - rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9"; - hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-fohsIJrvPDMmYHoPbmYQlKLMnj/B3XEBaerZYuqxvd8="; fetchSubmodules = true; }; + sourceRoot = "${finalAttrs.src.name}/gui/qt/"; + + nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + qt6.wrapQtAppsHook pkg-config ]; buildInputs = [ + qt6.qtbase libarchive libpng ]; - qmakeFlags = [ - "gui/qt" - ]; - meta = with lib; { description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; mainProgram = "CEmu"; @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix index 768366cc5d..591ac3281e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ - "--enable-openmp=${if stdenv.isLinux then "yes" else "no"}" + "--enable-openmp=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" "--enable-examples=no" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ecm/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ecm/default.nix index 222db0e98e..ed1c07d87e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ecm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ecm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; # See https://trac.sagemath.org/ticket/19233 - configureFlags = lib.optional stdenv.isDarwin "--disable-asm-redc"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-asm-redc"; buildInputs = [ m4 gmp ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix index 00b69e03f1..8a3ff56e1f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "3.27-unstable-2024-08-24"; + version = "3.27-unstable-2024-09-15"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "92ae1a3f9c9f6808f3faefa10ae66c0ff480dab2"; - hash = "sha256-AHZ9p7yyYENHywNppsSTfaM3KFqpX5ehxfjPwocHv5Q="; + rev = "ba00d77289f1c9ce64108b1bbcee02c71ce48633"; + hash = "sha256-yFzsMNVjQK64uQSfjQKC8LbdQu7/97hDolRMBc4Womc="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix index 5fa4862bb9..1d5fa4a9ef 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix @@ -95,6 +95,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwinPkg else linuxPkg diff --git a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix index 40169a72e4..d57175daff 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -97,4 +97,4 @@ let }; }; in -if stdenv.isDarwin then darwinPkg else linuxPkg +if stdenv.hostPlatform.isDarwin then darwinPkg else linuxPkg diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix index 4c0d7235ef..ce009975c1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { # when fltk is disabled. disable these tests for now. echo > check/chk_fhan2 echo > check/chk_fhan9 - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' # these cover a known regression in giac, likely due to how pari state # is shared between multiple giac instances (see pari.cc.old). # see https://github.com/NixOS/nixpkgs/pull/264126 for more information @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "--enable-ao" "--enable-ecm" "--enable-glpk" ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-nls" ] ++ lib.optionals (!enableGUI) [ "--disable-fltk" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix index d9d12cbf38..d2713befed 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cln ]; buildInputs = [ readline ] - ++ lib.optional stdenv.isDarwin gmp; + ++ lib.optional stdenv.hostPlatform.isDarwin gmp; nativeBuildInputs = [ pkg-config python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index 3e88e7f94b..2219815824 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack gmm fltk libjpeg zlib opencascade-occt - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE diff --git a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix index 773f1f3c08..67d7bfdba9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; env = { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; - } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { NIX_LDFLAGS = "-headerpad_max_install_names"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildPhase = let - ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; + ccc = if stdenv.hostPlatform.isDarwin then "ccc.osx" else "ccc"; in '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix index 9e25524787..9d0a308f44 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix @@ -53,8 +53,8 @@ let versions = callPackage ./versions.nix { }; matchesDoc = v: builtins.match (if webdoc - then ".*[0-9]_LINUX.sh" - else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null; + then ".*[0-9]_LIN(UX)?.sh" + else ".*_B[Nn][Dd][Ll].sh") v.src.name != null; in @@ -71,7 +71,7 @@ callPackage ./generic.nix { homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ herberteuler rafaelrc ]; + maintainers = with maintainers; [ herberteuler rafaelrc chewblacka ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix index c1c10f8937..6bf8992308 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix @@ -157,9 +157,15 @@ in stdenv.mkDerivation { mkdir -p "$out/lib/udev/rules.d" - # Patch MathInstaller's shebangs and udev rules dir - patchShebangs MathInstaller - substituteInPlace MathInstaller \ + # Set name of installer file + if [ -f "MathInstaller" ]; then + INSTALLER="MathInstaller" + else + INSTALLER="WolframInstaller" + fi + # Patch Installer's shebangs and udev rules dir + patchShebangs $INSTALLER + substituteInPlace $INSTALLER \ --replace /etc/udev/rules.d $out/lib/udev/rules.d # Remove PATH restriction, root and avahi daemon checks, and hostname call @@ -169,13 +175,13 @@ in stdenv.mkDerivation { s/^\s*checkAvahiDaemon$/:/ s/^\s*installBundledInstall$/:/ s/`hostname`/""/ - ' MathInstaller + ' $INSTALLER # NOTE: some files placed under HOME may be useful XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ - ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y + ./$INSTALLER -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y - # Check if MathInstaller produced any errors + # Check if Installer produced any errors errLog="$out/libexec/Mathematica/InstallErrors" if [ -f "$errLog" ]; then echo "Installation errors:" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix index 98e65d376b..a88aca6f12 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix @@ -7,6 +7,20 @@ */ let versions = [ + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns="; + installer = "Wolfram_14.1.0_LIN.sh"; + } + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310="; + installer = "Wolfram_14.1.0_LIN_Bndl.sh"; + } { version = "14.0.0"; lang = "en"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix index a3b54b78f9..0db35ba89a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "format" ]; - patchPhase = lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace GNUmakefile --replace gcc cc ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index a27d7c1ffd..306d6141ac 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix index b1db5ce31a..2cde634498 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; buildInputs = [ libqalculate qtbase qtsvg ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; postPatch = '' substituteInPlace qalculate-qt.pro\ --replace "LRELEASE" "${qttools.dev}/bin/lrelease" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/qalculate-qt.app $out/Applications makeWrapper $out/{Applications/qalculate-qt.app/Contents/MacOS,bin}/qalculate-qt diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix index f2aa1aac26..4aaed4a1b0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - buildFlags = lib.optionals stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix index f6ec20faff..a4d3dc52e0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lp_solve ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix index f6da205313..e3ca7bef52 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix @@ -100,4 +100,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix index 6ec1c9a2b7..fff9c7dfaf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { latex2html texinfo texliveSmall - ] ++ lib.optionals stdenv.isDarwin [ getconf ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { -i '{}' ';' ''; - hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; doCheck = true; # very basic checks, does not test any libraries diff --git a/third_party/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix index 021c1bedc3..ed7339ab56 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix @@ -32,6 +32,6 @@ mkDerivation rec { ''; maintainers = with maintainers; [ gebner j0hax ]; inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix index d6ec352d32..f215ec0037 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { autoreconfHook ]; + # clang warning: passing arguments to '...' without a prototype is deprecated + # in all versions of C and is not supported in C23. + CFLAGS = "-std=c99 -Wno-deprecated-non-prototype"; + enableParallelBuilding = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix deleted file mode 100644 index a64c973914..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, dpkg -, fahviewer -, fetchurl -, makeWrapper -, python2 -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; - - python = python2.withPackages - ( - ps: [ - ps.pycairo - ps.pygobject2 - ps.pygtk - ] - ); -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahcontrol"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "1vfrdqkrvdlyxaw3f6z92w5dllrv6810lmf8yhcmjcwmphipvf71"; - }; - - nativeBuildInputs = [ - dpkg - makeWrapper - ]; - - buildInputs = [ fahviewer python ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = "cp -ar usr $out"; - - postFixup = '' - sed -e "s|/usr/bin|$out/bin|g" -i $out/share/applications/FAHControl.desktop - wrapProgram "$out/bin/FAHControl" \ - --suffix PATH : "${fahviewer.outPath}/bin" \ - --set PYTHONPATH "$out/lib/python2.7/dist-packages" - ''; - - meta = { - description = "Folding@home control"; - homepage = "https://foldingathome.org/"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix deleted file mode 100644 index bb2c3c0abe..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv -, autoPatchelfHook -, dpkg -, fetchurl -, libglut -, gcc-unwrapped -, libGL -, libGLU -, makeWrapper -, zlib -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahviewer"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "00fd00pf6fcpplcaahvy9ir60mk69d9rcmwsyq3jrv9mxqm9aq7p"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - ]; - - buildInputs = [ - libglut - gcc-unwrapped.lib - libGL - libGLU - zlib - ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - sed -e "s|/usr/bin|$out/bin|g" -i usr/share/applications/FAHViewer.desktop - ''; - - installPhase = '' - cp -ar usr $out - ''; - - meta = { - description = "Folding@home viewer"; - homepage = "https://foldingathome.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix index ae7681a7a3..72504246b6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix @@ -80,6 +80,6 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gplates.org"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 + broken = stdenv.hostPlatform.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 }; }) diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix index a5055220e9..88fc3a8c0e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Visualisation tool for the creation and analysis of graphs"; homepage = "https://graphia.app"; license = licenses.gpl3Only; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix index f622f87d2e..a535f436dd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; description = "Library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix index 57c4367d2a..689ce1ad55 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; # SSE is enabled by default - cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; + cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86_64) "-DOpenMVS_USE_SSE=OFF"; buildInputs = [ boostWithZstd diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix index 6d169db23b..60615b6f09 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/openrefine/default.nix @@ -120,7 +120,7 @@ in maven.buildMavenPackage { fromSource binaryBytecode # maven dependencies ]; - broken = stdenv.isDarwin; # builds, doesn't run + broken = stdenv.hostPlatform.isDarwin; # builds, doesn't run mainProgram = "refine"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix index 5491593cc7..015b5c97eb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix index ae51d55168..c0b33b3cbe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; buildInputs = [ ncurses ] - ++ (if stdenv.isDarwin then [ curl libiconv Security ] else [ openssl ]); + ++ (if stdenv.hostPlatform.isDarwin then [ curl libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix index 80f2df0688..62f80ee480 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre python3 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; setupHook = ./setup-hook.sh; @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "Data analysis framework"; platforms = platforms.unix; - broken = !stdenv.isx86_64 || stdenv.cc.isClang or false; + broken = !stdenv.hostPlatform.isx86_64 || stdenv.cc.isClang or false; maintainers = with maintainers; [ veprbl ]; license = licenses.lgpl21; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index fd998f7328..98fee17478 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -109,8 +109,8 @@ stdenv.mkDerivation rec { tbb xrootd ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa CoreSymbolication OpenGL ] ; patches = [ @@ -149,11 +149,11 @@ stdenv.mkDerivation rec { -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ --replace "-F/System/Library/PrivateFrameworks " "" - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { "-Dvdt=OFF" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" # fatal error: module map file '/nix/store/-Libsystem-osx-10.12.6/include/module.modulemap' not found diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix index 37c7fb3a2a..40202b8dba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix @@ -115,6 +115,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 68204d0fa4..07cc2ceaed 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -1,8 +1,6 @@ { lib , fetchPypi -, fetchpatch , python3 -, runtimeShell , stress }: diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix deleted file mode 100644 index 9142676fff..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, rsync -}: - -python3.pkgs.buildPythonApplication rec { - pname = "toil"; - version = "5.12.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "DataBiosphere"; - repo = pname; - rev = "refs/tags/releases/${version}"; - hash = "sha256-cTpbQo9tPZifUO59vbnIa3XUinFJ2/5Slfe4yszglFM="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - addict - dill - docker - enlighten - psutil - py-tes - pypubsub - python-dateutil - pytz - pyyaml - requests - typing-extensions - ]; - - nativeCheckInputs = [ - rsync - ] ++ (with python3.pkgs; [ - boto - botocore - flask - pytestCheckHook - stubserver - ]); - - pytestFlagsArray = [ - "src/toil/test" - ]; - - pythonImportsCheck = [ - "toil" - ]; - - disabledTestPaths = [ - # Tests are reaching their timeout - "src/toil/test/docs/scriptsTest.py" - "src/toil/test/jobStores/jobStoreTest.py" - "src/toil/test/provisioners/aws/awsProvisionerTest.py" - "src/toil/test/src" - "src/toil/test/wdl" - "src/toil/test/utils/utilsTest.py" - "src/toil/test/cwl/cwlTest.py" - "src/toil/test/lib/test_ec2.py" - "src/toil/test/lib/aws/test_iam.py" - "src/toil/test/lib/aws/test_s3.py" - ]; - - disabledTests = [ - # Tests fail starting with 5.7.1 - "testServices" - "testConcurrencyWithDisk" - "testJobConcurrency" - "testNestedResourcesDoNotBlock" - "test_omp_threads" - "testFileSingle" - "testFileSingle10000" - "testFileSingleCheckpoints" - "testFileSingleNonCaching" - "testFetchJobStoreFiles" - "testFetchJobStoreFilesWSymlinks" - "testJobStoreContents" - "test_cwl_on_arm" - "test_cwl_toil_kill" - ]; - - meta = with lib; { - description = "Workflow engine written in pure Python"; - homepage = "https://toil.ucsc-cgl.org/"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix index 9808a57283..590b429e73 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake wrapQtAppsHook ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ]; qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # fatal error: 'Python.h' file not found "-I${python3}/include/${python3.libPrefix}" # error: format string is not a string literal (potentially insecure) diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 93cd928632..1eed4ff7c3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { cudaPackages.cuda_cudart cudaPackages.libcufft cudaPackages.cuda_profiler_api - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix index e7eb69fb4e..b6f8a0d6f1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix @@ -75,7 +75,7 @@ let let version = "7.4.0"; src = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-osx-64-noX11.zip"; @@ -86,7 +86,7 @@ let url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-linux-64-noX11.zip"; hash = "sha256:1f2qins5kaz5v6mkaclncqpirx3mlz177ywm13py9p6s9mk99g32"; }; - mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; + mosflmBinary = if stdenv.hostPlatform.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; in stdenv.mkDerivation { pname = "mosflm"; @@ -209,9 +209,9 @@ stdenv.mkDerivation rec { xgandalf pandoc ] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone - ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ memorymappingHook ] ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/fasthenry/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/fasthenry/default.nix index 6b9a73f6dd..963828e18e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/fasthenry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/fasthenry/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { SHELL="sh" "all" ) - '' + (if stdenv.isx86_64 then '' + '' + (if stdenv.hostPlatform.isx86_64 then '' makeFlagsArray+=( CFLAGS="-fcommon -O -DFOUR -m64" ); diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix index 1c6c21c52f..60a030f528 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace-fail 'pip install ' 'pip install --prefix $(out) ' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail '-shared -o' '-shared -install_name "$(out)/$@" -o' ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix index dbe2365371..b6b5344647 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\" ''; @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-pythia=${pythia}" ]; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia '' else '' wrapProgram $out/bin/run-pythia \ @@ -46,6 +46,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index 21a5ee7ec2..2dfe3f7d7b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix index 8a92c85a13..e509f3a005 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # workaround wrong library IDs - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -sv "$out/lib/xfitter/"* "$out/lib/" ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix index ffdd4b6d0b..aaff1ff40d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # Darwin support likely to be fixed upstream in the next release - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index f86ca5f635..e36b3d62b6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { pyserial setuptools wxpython - ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ billiard gnureadline ]; # No tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index 5de1166e11..21618f8ed3 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -68,7 +68,7 @@ let filters = { perl = perl.passthru.withPackages (p: [ p.ImageExifTool ]); }; filterPath = lib.makeBinPath (map lib.getBin (builtins.attrValues filters)); - useInotify = if stdenv.isLinux then "true" else "false"; + useInotify = if stdenv.hostPlatform.isLinux then "true" else "false"; in mkDerivation rec { @@ -138,7 +138,7 @@ mkDerivation rec { file ] ++ lib.optionals withGui [ qtbase - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -167,15 +167,15 @@ mkDerivation rec { --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} wrapProgram $out/share/recoll/filters/rclimg \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' - '' + lib.optionalString (stdenv.isDarwin && withGui) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) '' mkdir $out/Applications mv $out/bin/recoll.app $out/Applications ''; # create symlink after fixup to prevent double wrapping of recoll - postFixup = lib.optionalString (stdenv.isDarwin && withGui) '' + postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) '' ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll ''; diff --git a/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 25f62fad9b..cb3e0c2283 100644 --- a/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -1,5 +1,4 @@ { lib -, buildNpmPackage , rustPlatform , dbus , freetype diff --git a/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrold.nix b/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrold.nix index 40db1cebac..16e55a8c21 100644 --- a/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/third_party/nixpkgs/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -1,5 +1,4 @@ { rustPlatform -, buildNpmPackage , testers , libdrm , coolercontrol diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 6d8899440d..ff8b4c3106 100644 --- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix @@ -40,14 +40,14 @@ buildPythonApplication rec { # CoreFoundation. This issues was solved for binaries but for interpreted # scripts a workaround below is still required. # Relevant: https://github.com/NixOS/nixpkgs/issues/24693 - makeWrapperArgs = lib.optionals stdenv.isDarwin [ + makeWrapperArgs = lib.optionals stdenv.hostPlatform.isDarwin [ "--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks" ]; doCheck = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; @@ -68,7 +68,7 @@ buildPythonApplication rec { jinja2 orjson prometheus-client - ] ++ lib.optional stdenv.isLinux hddtemp; + ] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp; meta = { homepage = "https://nicolargo.github.io/glances/"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 58e527cc50..33691aaef4 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -35,7 +35,7 @@ let expat fontconfig freetype - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL xorg.libX11 xorg.libXcursor @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; @@ -91,7 +91,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=term::test::mock_term" ]; # broken on aarch64 postInstall = ( - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir $out/Applications cp -r extra/osx/Alacritty.app $out/Applications ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix index a255b2fb99..f01c47afdd 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (final: { file wrapQtAppsHook installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; buildInputs = [ boxed-cpp @@ -67,21 +67,21 @@ stdenv.mkDerivation (final: { range-v3 yaml-cpp ] - ++ lib.optionals stdenv.isLinux [ libutempter ] - ++ lib.optionals stdenv.isDarwin [ utmp ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ utmp ]; cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; postInstall = '' mkdir -p $out/nix-support $terminfo/share - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share mv $out/contour.app $out/Applications ln -s $out/bin $out/Applications/contour.app/Contents/MacOS - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/share/terminfo $terminfo/share/ installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 8a33d22285..c2a8710858 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 162d3cd583..cf5614d399 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { librsync openssl.dev xxHash - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Kernel UniformTypeIdentifiers @@ -65,9 +65,9 @@ buildPythonApplication rec { libpng python3 zlib - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ Libsystem - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext wayland-protocols wayland dbus libGL @@ -84,10 +84,10 @@ buildPythonApplication rec { sphinx-inline-tabs go fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick libicns # For the png2icns tool. - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -141,8 +141,8 @@ buildPythonApplication rec { mkdir ./fonts/ cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/ - ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } - ${if stdenv.isDarwin then '' + ${ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } + ${if stdenv.hostPlatform.isDarwin then '' ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} make docs ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} @@ -165,13 +165,13 @@ buildPythonApplication rec { bashInteractive zsh fish - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # integration tests need sudo sudo ]; # skip failing tests due to darwin sandbox - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace kitty_tests/file_transmission.py \ --replace test_file_get dont_test_file_get \ --replace test_path_mapping_receive dont_test_path_mapping_receive \ @@ -209,7 +209,7 @@ buildPythonApplication rec { runHook preInstall mkdir -p "$out" mkdir -p "$kitten/bin" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' mkdir "$out/bin" ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" @@ -232,7 +232,7 @@ buildPythonApplication rec { --fish <("$out/bin/kitty" +complete setup fish2) \ --zsh <("$out/bin/kitty" +complete setup zsh) - terminfo_src=${if stdenv.isDarwin then + terminfo_src=${if stdenv.hostPlatform.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' else "$out/share/terminfo"} @@ -249,7 +249,7 @@ buildPythonApplication rec { ''; passthru = { - tests = lib.optionalAttrs stdenv.isLinux { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { default = nixosTests.terminal-emulators.kitty; }; updateScript = nix-update-script {}; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index 28f027401b..dcf581f27a 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -27,8 +27,8 @@ # documentd in `./configure --help`, and it is reported here: # https://github.com/arakiken/mlterm/issues/73 fb = false; - quartz = stdenv.isDarwin; - wayland = stdenv.isLinux; + quartz = stdenv.hostPlatform.isDarwin; + wayland = stdenv.hostPlatform.isLinux; sdl2 = true; } , libxkbcommon @@ -59,16 +59,16 @@ mlfc = true; } # Whether to enable the X window system -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux # Most of the input methods and other build features are enabled by default, # the following attribute set can be used to disable some of them. It's parsed # when we set `configureFlags`. If you find other configure Flags that require # dependencies, it'd be nice to make that contribution here. , enableFeatures ? { - uim = !stdenv.isDarwin; - ibus = !stdenv.isDarwin; - fcitx = !stdenv.isDarwin; - m17n = !stdenv.isDarwin; + uim = !stdenv.hostPlatform.isDarwin; + ibus = !stdenv.hostPlatform.isDarwin; + fcitx = !stdenv.hostPlatform.isDarwin; + m17n = !stdenv.hostPlatform.isDarwin; ssh2 = true; bidi = true; # Open Type layout support, (substituting glyphs with opentype fonts) @@ -185,7 +185,7 @@ in stdenv.mkDerivation (finalAttrs: { install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" install -D -t $out/share/applications $desktopItem/share/applications/* - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/ cp -a cocoa/mlterm.app $out/Applications/ install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix index 5c867120aa..136bbcd494 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix @@ -17,21 +17,21 @@ , vulkan-loader , libxkbcommon -, withX11 ? !stdenv.isDarwin +, withX11 ? !stdenv.hostPlatform.isDarwin , libX11 , libXcursor , libXi , libXrandr , libxcb -, withWayland ? !stdenv.isDarwin +, withWayland ? !stdenv.hostPlatform.isDarwin , wayland , testers , rio }: let - rlinkLibs = if stdenv.isDarwin then [ + rlinkLibs = if stdenv.hostPlatform.isDarwin then [ darwin.libobjc darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.AVFoundation @@ -55,20 +55,20 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.1.13"; + version = "0.1.15"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; - rev = "refs/tags/v${version}"; - hash = "sha256-JrmjQjKpL9di66z4IYTcWhNBL0CgalqOhQgVDpkh6b0="; + rev = "v${version}"; + hash = "sha256-aLqWhRaNqi7gMDxBITLU/Tj//h7RURycLSZXOOq83As="; }; - cargoHash = "sha256-KWdkpQY1F0RU3JViFrXEp+JW6xdaofEmp2SlAkzPMPU="; + cargoHash = "sha256-4nqJbz2vauO4jRuUSDjBV1pVrAJMhIP4+eUwS1+GecU="; nativeBuildInputs = [ ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ cmake pkg-config autoPatchelfHook @@ -99,7 +99,7 @@ rustPlatform.buildRustPackage rec { tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications/ mv misc/osx/Rio.app/ $out/Applications/ mkdir $out/Applications/Rio.app/Contents/MacOS/ @@ -130,6 +130,6 @@ rustPlatform.buildRustPackage rec { # stderr: # thread 'main' panicked at corcovado/src/sys/unix/eventedfd.rs:24:16: # called `Result::unwrap()` on an `Err` value: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" } - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index f28694db29..a39099cc4b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch"; excludes = [ "Changes" ]; sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM="; - }) ++ lib.optional stdenv.isDarwin ./patches/makefile-phony.patch; + }) ++ lib.optional stdenv.hostPlatform.isDarwin ./patches/makefile-phony.patch; configureFlags = [ "--with-terminfo=${placeholder "terminfo"}/share/terminfo" diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix index 72a6835ff4..676ef292de 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { (writeText "config.def.h" conf); postPatch = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h" - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/default.nix index 36a02e08bb..60b172184f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-Wno-unused-result" "-Wformat-overflow=0" - ] ++ (lib.optionals stdenv.isLinux [ + ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ "-DUSE_ALSA_SOUND" # Don't use OSS for beeps. ]); makeFlags = [ @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook pkg-config SDL2 perl unzip ]; # SDL2 for `sdl2-config`. buildInputs = [ ncurses SDL2 ] - ++ (lib.optional stdenv.isLinux alsa-lib); + ++ (lib.optional stdenv.hostPlatform.isLinux alsa-lib); runtimeDependencies = [ ncurses SDL2 ]; # Both of these are dlopen()'ed at runtime. meta = with lib; { # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; homepage = "https://syncterm.bbsdev.net/"; description = "BBS terminal emulator"; mainProgram = "syncterm"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix index 4acc8263ce..3dc6d484d2 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; }) - ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix index 4f710d61c2..68391fc4dc 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -63,12 +63,12 @@ rustPlatform.buildRustPackage rec { ncurses # tic for terminfo pkg-config python3 - ] ++ lib.optional stdenv.isDarwin perl; + ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; buildInputs = [ fontconfig zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libxkbcommon @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec { xcbutilimage xcbutilkeysyms xcbutilwm # contains xcb-ewmh among others - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreGraphics Foundation @@ -89,7 +89,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "distro-defaults" ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework System"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework System"; postInstall = '' mkdir -p $out/nix-support @@ -108,12 +108,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/wezterm-nautilus.py -t $out/share/nautilus-python/extensions ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --add-needed "${libGL}/lib/libEGL.so.1" \ --add-needed "${vulkan-loader}/lib/libvulkan.so.1" \ $out/bin/wezterm-gui - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" cp -r assets/macos/WezTerm.app "$OUT_APP" diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix index 2e901e5af8..45b08bd10f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-gcC6REfZentIPEDhGznUSYu8mvVfpPeMz/Bks+N43Fk="; }; - buildFlags = lib.optional stdenv.isLinux "unix"; + buildFlags = lib.optional stdenv.hostPlatform.isLinux "unix"; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-c3270" "--enable-pr3270" "--enable-s3270" @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { expat openssl readline - ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "IBM 3270 terminal emulator for the X Window System"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix index 33b4cb0f90..5a60f9a1d5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix @@ -93,6 +93,6 @@ let mainProgram = "bcompare"; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix index c98ff367c6..e5be040f6a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnupg ]; # https://github.com/NixOS/nixpkgs/issues/134445 - doCheck = !stdenv.isDarwin && stdenv.isx86_64; + doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; nativeCheckInputs = [ expect diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix index 20a38f9f8e..7ec801503f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.cc.isClang) { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix index d724d4f2bf..76ace5026e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { # https://github.com/dandavison/delta/issues/1660 dontUseCargoParallelTests = true; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # This test tries to read /etc/passwd, which fails with the sandbox # enabled on Darwin "--skip=test_diff_real_files" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix index b523141808..ec5ade218f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # error: 'strtonum' is only available on macOS 11.0 or newer "-Wno-error=unguarded-availability-new" ]); diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix index b1b828d479..9443c1e9cd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline which ed ] - ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv ++ lib.optional (!withInternalSqlite) sqlite; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix index fb8cccdda1..299ea9fb6b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-idzw5dfCCvujvYr7DG0oOzQUIcbACtiIZLoA4MEClzY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix index 528bba032b..094a6172e8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.13"; + version = "1.10.0"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-RXXDWz8sXvn0+6JFf6cHNRwg9xAGrCHGRM/M8MQpMko="; + sha256 = "sha256-MZGpH8fvSERSMUxGa1JX4mb8d/p3aDztgRH1FQA8f/Y="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix index 49d4a0a67a..8679f2842f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix index d3d4efd247..0e83d17d33 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix index 2d97b41cdd..84a34601d4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { curl zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix index 5cdc41af2b..25bcf4f1ca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-d6IawXBumA5ZJiigMTx4IZgOFrH5bNrbRsNHfT4Ik3w="; + hash = "sha256-GRvZ9jdooduFylTGgUQNjdnD2Aa+jT5faV0/c3GBpqw="; }; - cargoHash = "sha256-zXcVOE+yTD4SsVNTYhXnKy6et5en9jzYXPKPVnCOixI="; + cargoHash = "sha256-vgVTHTEKfjWJzxDQ5w0dwp9qxyN5sgbBseXHN25bx9o="; # attempts to run the program on .git in src which is not deterministic doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix index c1c909e882..fac196e9ad 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-8OErZ6uKTWE245BoBu9lQyTLA43DfWaYDv3wbPWaufg="; }; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { disabledTestPaths = [ "qtpy/" "contrib/win32" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "cola/inotify.py" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 5f4f7c6daf..3a85cff455 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jBUp0jes4wtr8cmqceEBb6noqGkJUHbIfYgWOw5KMF4="; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation ]; buildFeatures = [] ++ lib.optional withNotification "notification" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix index c0209c38cf..b80397e142 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { libgit2 oniguruma zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix index 884eeb893a..1cc039a09f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - hash = "sha256-Mc9/P4VBmLOC05xqdx/yopbhvdpQS3uejc4YA7BIgug="; + hash = "sha256-j88ZnJ0V8h/fthOWwV6B0ZbzUz7THykqrI2QpOkDT4I="; }; - cargoHash = "sha256-NyyficEDJReMLAw2VAK2fOXNIwHilnUqQRACGck+0Vo="; + cargoHash = "sha256-H41wpG5LhjJ7BtFrol0JbjTpssOPUgumgapOiZJi2lc="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installManPage git-gone.1 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-graph/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-graph/default.nix index 0168928922..e801cb0e23 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-graph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-graph/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Command line tool to show clear git graphs arranged for your branching model"; homepage = "https://github.com/mlange-42/git-graph"; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-graph"; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix index 1210e31894..12f4f02fd0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 6019e2eb7a..835b6ddf85 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix index 717a410eae..a8dc37f177 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.29.2"; + version = "3.29.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-C3AQ5HHsD2JfF/BO+t3Rbx1DQwRXMG41i2wsk/9BkF8="; + hash = "sha256-3GXTdIXITZeDqe6gxwOCaFXwITYYfXTy57H2AHA5Zyc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index 067ef1eb08..2dc3ab74a0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix index 941b84b68f..566a032f9b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix index 99be76387b..113388c48c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-xd/ItpngreR77QTsSHLCgZfyvUZXBfOVPJaVtBZ2iTc="; + sha256 = "sha256-TGwoW4jpXbFdxk9HAZJTDhXIHhR1QEcDRCjspBv2KdQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix index 9bc7e678d3..a9382ee0cb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-radar/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-radar/default.nix index 1c19381c1b..59ec4b61d8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-radar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-radar/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out ln -s $out/git-radar $out/bin - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/git-radar --prefix PATH : ${lib.makeBinPath [ coreutils-prefixed ]} ''} ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 86978c7cf7..f9c59ad18e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.46"; + version = "2.47"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-eWRDarMx0QzTdTx3nFl1y12k25NqxGzuhLZd52Yr4qU="; + hash = "sha256-LFzUvDMNGxp5HzdjlaN0VS7HpIzN8GA5MQL61teKRvo="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-series/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-series/default.nix index 9f20e7cab7..86277614bc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-series/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-series/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ curl ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; buildInputs = [ libgit2 libssh2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ curl ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; env = { LIBGIT2_SYS_USE_PKG_CONFIG = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix index d9792654a9..67893b122d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-sync/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-sync/default.nix index 07fa41a726..01ac29cf8c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-sync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-sync/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { git gnugrep gnused - ] ++ lib.optionals stdenv.isLinux [ inotify-tools ]); + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); postFixup = '' wrap_path="${wrapperPath}":$out/bin diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix index 892c856bc8..9f70f75944 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "16.1.1"; + version = "16.2.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-H4FtFSI/c7UxRLZB8kz873DIN6kLUwmRZtz3+4zaR7w="; + hash = "sha256-/60n/JvT7XRfEVic6Jmi05WpsAy4mRsE/GAnetTMC1I="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix index a387ec7067..60db7f8ee7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libgit2 ] - ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation Security ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix index 9418c7d20e..8ed00127fd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix index dd1b96c29a..3d7f96bb5f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix @@ -7,7 +7,7 @@ , svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform , nlsSupport ? true -, osxkeychainSupport ? stdenv.isDarwin +, osxkeychainSupport ? stdenv.hostPlatform.isDarwin , guiSupport ? false , withManual ? true , pythonSupport ? true @@ -20,11 +20,11 @@ , gzip # needed at runtime by gitweb.cgi , withSsh ? false , sysctl -, doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin +, doInstallCheck ? !stdenv.hostPlatform.isDarwin # extremely slow on darwin , tests }: -assert osxkeychainSupport -> stdenv.isDarwin; +assert osxkeychainSupport -> stdenv.hostPlatform.isDarwin; assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ./installCheck-path.patch ] ++ lib.optionals withSsh [ ./ssh-path.patch - ] ++ lib.optionals (guiSupport && stdenv.isDarwin) [ + ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isDarwin) [ # Needed to workaround an issue in macOS where gitk shows a empty window # https://github.com/Homebrew/homebrew-core/issues/68798 # https://github.com/git/git/pull/944 @@ -87,16 +87,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; - buildInputs = [ curl openssl zlib expat cpio (if stdenv.isFreeBSD then libiconvReal else libiconv) bash ] + buildInputs = [ curl openssl zlib expat cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] - ++ lib.optionals stdenv.isDarwin [ Security CoreServices ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ] ++ lib.optionals withLibsecret [ glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" - + lib.optionalString (stdenv.isFreeBSD) "-lthr"; + + lib.optionalString (stdenv.hostPlatform.isFreeBSD) "-lthr"; configureFlags = [ "ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config" @@ -118,8 +118,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}" ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) - ++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] - ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) + ++ lib.optionals stdenv.hostPlatform.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] + ++ (if stdenv.hostPlatform.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) ++ lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] ++ lib.optional withpcre2 "USE_LIBPCRE2=1" ++ lib.optional (!nlsSupport) "NO_GETTEXT=1" @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent" + ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent" ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -302,7 +302,7 @@ stdenv.mkDerivation (finalAttrs: { "PERL_PATH=${buildPackages.perl}/bin/perl" ]; - nativeInstallCheckInputs = lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) sysctl; + nativeInstallCheckInputs = lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) sysctl; preInstallCheck = '' installCheckFlagsArray+=( @@ -346,7 +346,7 @@ stdenv.mkDerivation (finalAttrs: { # Fails reproducibly on ZFS on Linux with formD normalization disable_test t0021-conversion disable_test t3910-mac-os-precompose - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern @@ -355,7 +355,7 @@ stdenv.mkDerivation (finalAttrs: { disable_test t6300-for-each-ref # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) disable_test t5003-archive-zip - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' disable_test t7527-builtin-fsmonitor '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 68d8fabf5a..3e2206aa63 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -249,4 +249,4 @@ let dontFixup = true; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix index a6d5a5bd61..3e4e1c07f8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index 9909d9829c..f89e80c2da 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -32,7 +32,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles ]; - buildInputs = [ curl ] ++ (if stdenv.isDarwin + buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ libiconv Security SystemConfiguration ] else [ openssl ]); diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gittyup/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gittyup/default.nix index 2a7cb13d2a..146f2c7e95 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gittyup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gittyup/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { openssl qtbase qttools - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = [ ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix index aeb0eaf43f..bca572b28b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gawk git gnused - ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix index dcaca33f09..6e3cb2c09d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8JkodGtMdYP/IIBqRcJFD5syiZi+VakDyX7VcvR0HLo="; - buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); + buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); buildNoDefaultFeatures = !withOpenCL; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 466cc643c3..5a790ff3f4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -50,7 +50,7 @@ let rustc ]; buildInputs = [ docutils ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix index 06e4624c8e..ec01f86a3a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ jam ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Foundation Security ]; outputs = [ "out" "bin" "dev" ]; - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; jamFlags = [ @@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals stdenv.cc.isClang [ "-sOSCOMP=clang" "-sCLANGVER=${stdenv.cc.cc.version}" ] ++ lib.optionals stdenv.cc.isGNU [ "-sOSCOMP=gcc" "-sGCCVER=${stdenv.cc.cc.version}" ] - ++ lib.optionals stdenv.isLinux [ "-sOSVER=26" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-sOSVER=1013" "-sMACOSX_SDK=${emptyDirectory}" "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" @@ -69,11 +69,11 @@ stdenv.mkDerivation (finalAttrs: rec { CCFLAGS = # The file contrib/optimizations/slide_hash_neon.h is missing from the # upstream distribution. It comes from the Android/Chromium sources. - lib.optionals stdenv.isAarch64 [ "-I${androidZlibContrib}" ]; + lib.optionals stdenv.hostPlatform.isAarch64 [ "-I${androidZlibContrib}" ]; "C++FLAGS" = # Avoid a compilation error that only occurs for 4-byte longs. - lib.optionals stdenv.isi686 [ "-Wno-narrowing" ] + lib.optionals stdenv.hostPlatform.isi686 [ "-Wno-narrowing" ] # See the "Header dependency changes" section of # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more # information on why we need to include these. diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix index d7dcd14055..b441fe8463 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4v/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/p4v/default.nix index 2824ed82cf..82aa6b57a8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/p4v/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/p4v/default.nix @@ -21,7 +21,7 @@ let }; mkDerivation = - if stdenv.isDarwin then callPackage ./darwin.nix { } + if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { } else qt6Packages.callPackage ./linux.nix { }; in mkDerivation { pname = "p4v"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 7503814c38..95d974bfa1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) - ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ (lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration ])); diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix index 8887d5126f..4ed034c500 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { apr aprutil python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix index 13ff1b70f2..e19fbeb497 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix @@ -40,7 +40,7 @@ let # # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { - cargoConfig = lib.optionalString (!stdenv.isDarwin) old.cargoConfig; + cargoConfig = lib.optionalString (!stdenv.hostPlatform.isDarwin) old.cargoConfig; }); src = fetchFromGitHub { @@ -141,7 +141,7 @@ python311Packages.buildPythonApplication { install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/sl \ --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" ''; @@ -156,7 +156,7 @@ python311Packages.buildPythonApplication { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl libiconv Cocoa diff --git a/third_party/nixpkgs/pkgs/applications/version-management/silver-platter/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/silver-platter/default.nix index f1653cf103..368cf8dcf2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/silver-platter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/silver-platter/default.nix @@ -37,9 +37,9 @@ buildPythonApplication rec { propagatedBuildInputs = [ setuptools breezy dulwich jinja2 pyyaml ruamel-yaml ]; nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "silver_platter" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix index 55c889ce10..4d44724edd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git perl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.system_cmds libiconv ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix index a978ff1635..84f41e6e26 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix @@ -85,7 +85,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix index 7f0122e56c..11d9c7fefd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -127,7 +127,7 @@ let platforms = platforms.linux ++ platforms.darwin; }; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { CXX = "clang++"; CC = "clang"; CPP = "clang -E"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix index b4a8533d46..6c90d24e55 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfFlags = [ "-I" "tools" "-v" ]; buildInputs = [ ncurses readline git ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix index 0dab32e57a..2d6c0c9089 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix @@ -75,7 +75,7 @@ resholve.mkDerivation rec { gnutar ]; fake = { - external = if stdenv.isCygwin then [ ] else [ "cygpath" ]; + external = if stdenv.hostPlatform.isCygwin then [ ] else [ "cygpath" ]; }; fix = { "$GPG_PROGRAM" = [ "gpg" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/dmlive/default.nix b/third_party/nixpkgs/pkgs/applications/video/dmlive/default.nix index db34d1da27..5127dba204 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dmlive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dmlive/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ configd Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; postInstall = '' wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" diff --git a/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix b/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix index 9e4eda8a07..7c6d8500d8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/glaxnimate/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; - passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { + passthru.tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (testers.testVersion { package = glaxnimate; command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; }); diff --git a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix index 37bf7baec8..bea389ccc5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { description = "Native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gnomecast"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix b/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix index e48b884e93..e7ecf29369 100644 --- a/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { xorg.libXext xorg.libXxf86vm libglvnd - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix index 57da514740..b036e69ce8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { # For most other functionality, this should probably be extended nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/hyperion-ng/default.nix b/third_party/nixpkgs/pkgs/applications/video/hyperion-ng/default.nix index 50c00e03c4..837e5071f4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/hyperion-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/hyperion-ng/default.nix @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { qtserialport qtsvg qtx11extras - ] ++ lib.optional stdenv.isLinux libcec + ] ++ lib.optional stdenv.hostPlatform.isLinux libcec ++ lib.optional withRPiDispmanx libraspberrypi; nativeBuildInputs = [ cmake wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin perl; # for macos bundle + ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle patchPhase = '' patchShebangs test/testrunner.sh diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix index fef1a9ae80..013b6bdf36 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,7 +21,7 @@ , qtwebchannel , qtwebengine , qtx11extras -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: mkDerivation rec { @@ -51,9 +51,9 @@ mkDerivation rec { qtwebchannel qtwebengine qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreAudio CoreFoundation @@ -74,7 +74,7 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index b6aa8009dc..c72568d380 100644 --- a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -22,6 +22,8 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + profile = '' export LC_ALL=C.UTF-8 ''; @@ -38,7 +40,6 @@ appimageTools.wrapType2 { cp ${extracted}/losslesscut.desktop $out/share/applications substituteInPlace $out/share/applications/losslesscut.desktop \ --replace AppRun losslesscut - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/losslesscut" \ --add-flags "--disable-seccomp-filter-sandbox" ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix b/third_party/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix index 6b9c8ef2fd..32b533346d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread ]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Command line tool to make a copy from a video DVD for private use"; homepage = "https://sourceforge.net/projects/lxdvdrip"; license = lib.licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix b/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix index 3d8034521c..a1d9d58403 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix @@ -41,7 +41,7 @@ buildNpmPackage rec { bash nodejs which - ] ++ lib.optionals stdenv.isLinux [ v4l-utils ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ]; crc32Patch = substituteAll { src = ./fix-musl-detection.patch; isMusl = if stdenv.hostPlatform.isMusl then "true" else "false"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index aff2910784..7d4ced909d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { zlib ] ++ optionals withGUI [ cmark ] - ++ optionals stdenv.isLinux [ qtwayland ] - ++ optionals stdenv.isDarwin [ libiconv ]; + ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mlv-app/default.nix b/third_party/nixpkgs/pkgs/applications/video/mlv-app/default.nix index e3f61cdd82..da9f4d5807 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mlv-app/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mlv-app/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; - patches = if stdenv.isAarch64 then ./aarch64-flags.patch else null; + patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/video/motion/default.nix b/third_party/nixpkgs/pkgs/applications/video/motion/default.nix index c3082639ca..5e02d58977 100644 --- a/third_party/nixpkgs/pkgs/applications/video/motion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/motion/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh veprbl ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "motion"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix index c9219fdf63..c3f6981503 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://mpc-qt.github.io"; license = licenses.gpl2; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ romildo ]; mainProgram = "mpc-qt"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix index 1608585de7..352c7b7eda 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -5,11 +5,11 @@ , x11Support ? true, libX11, libXext, libGLU, libGL , xineramaSupport ? true, libXinerama , xvSupport ? true, libXv -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , screenSaverSupport ? true, libXScrnSaver , vdpauSupport ? false, libvdpau -, cddaSupport ? !stdenv.isDarwin, cdparanoia -, dvdnavSupport ? !stdenv.isDarwin, libdvdnav +, cddaSupport ? !stdenv.hostPlatform.isDarwin, cdparanoia +, dvdnavSupport ? !stdenv.hostPlatform.isDarwin, libdvdnav , dvdreadSupport ? true, libdvdread , bluraySupport ? true, libbluray , amrSupport ? false, amrnb, amrwb @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ++ lib.optional libjpegSupport libjpeg ++ lib.optional bs2bSupport libbs2b ++ lib.optional v4lSupport libv4l - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] ; configurePlatforms = [ ]; @@ -147,8 +147,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" ++ lib.optional fribidiSupport "--enable-fribidi" - ++ lib.optional (stdenv.isLinux && !stdenv.isAarch64) "--enable-vidix" - ++ lib.optional stdenv.isLinux "--enable-fbdev" + ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) "--enable-vidix" + ++ lib.optional stdenv.hostPlatform.isLinux "--enable-fbdev" ++ lib.optionals (crossBuild) [ "--enable-cross-compile" "--disable-vidix-pcidb" diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 5b255be9a1..9415a97770 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -72,37 +72,37 @@ zimg, # Boolean - alsaSupport ? stdenv.isLinux, + alsaSupport ? stdenv.hostPlatform.isLinux, archiveSupport ? true, bluraySupport ? true, bs2bSupport ? true, cacaSupport ? true, cddaSupport ? false, cmsSupport ? true, - drmSupport ? stdenv.isLinux, - dvbinSupport ? stdenv.isLinux, - dvdnavSupport ? stdenv.isLinux, + drmSupport ? stdenv.hostPlatform.isLinux, + dvbinSupport ? stdenv.hostPlatform.isLinux, + dvdnavSupport ? stdenv.hostPlatform.isLinux, jackaudioSupport ? false, javascriptSupport ? true, libpngSupport ? true, openalSupport ? true, - pipewireSupport ? stdenv.isLinux, - pulseSupport ? config.pulseaudio or stdenv.isLinux, + pipewireSupport ? stdenv.hostPlatform.isLinux, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, rubberbandSupport ? true, screenSaverSupport ? true, - sdl2Support ? !stdenv.isDarwin, + sdl2Support ? !stdenv.hostPlatform.isDarwin, sixelSupport ? false, speexSupport ? true, - swiftSupport ? stdenv.isDarwin, + swiftSupport ? stdenv.hostPlatform.isDarwin, theoraSupport ? true, vaapiSupport ? x11Support || waylandSupport, vapoursynthSupport ? false, vdpauSupport ? true, - vulkanSupport ? stdenv.isLinux, - waylandSupport ? stdenv.isLinux, - x11Support ? stdenv.isLinux, - xineramaSupport ? stdenv.isLinux, - xvSupport ? stdenv.isLinux, + vulkanSupport ? stdenv.hostPlatform.isLinux, + waylandSupport ? stdenv.hostPlatform.isLinux, + x11Support ? stdenv.hostPlatform.isLinux, + xineramaSupport ? stdenv.hostPlatform.isLinux, + xvSupport ? stdenv.hostPlatform.isLinux, zimgSupport ? true, }: @@ -124,7 +124,7 @@ let platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; }; stdenv' = - if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 then + if swiftSupport && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then stdenv.override (old: { buildPlatform = overrideSDK old.buildPlatform "11.0"; hostPlatform = overrideSDK old.hostPlatform "11.0"; @@ -194,7 +194,7 @@ stdenv'.mkDerivation (finalAttrs: { (lib.mesonEnable "swift-build" swiftSupport) (lib.mesonEnable "macos-cocoa-cb" swiftSupport) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Toggle explicitly because it fails on darwin (lib.mesonEnable "videotoolbox-pl" vulkanSupport) ]; @@ -209,7 +209,7 @@ stdenv'.mkDerivation (finalAttrs: { ninja pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ buildPackages.darwin.sigtool xcbuild.xcrun ] @@ -283,9 +283,9 @@ stdenv'.mkDerivation (finalAttrs: { ++ lib.optionals xineramaSupport [ libXinerama ] ++ lib.optionals xvSupport [ libXv ] ++ lib.optionals zimgSupport [ zimg ] - ++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ] - ++ lib.optionals stdenv.isDarwin [ libiconv ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreFoundation Cocoa @@ -293,12 +293,12 @@ stdenv'.mkDerivation (finalAttrs: { MediaPlayer VideoToolbox ] - ++ lib.optionals (stdenv.isDarwin && swiftSupport) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && swiftSupport) [ AVFoundation CoreMedia ]; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv popd @@ -323,14 +323,14 @@ stdenv'.mkDerivation (finalAttrs: { printf "NoDisplay=true\n" >> umpv.desktop popd '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addDriverRunpath. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addDriverRunpath $out/bin/mpv patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix index ea39f33ba4..8f33f5db90 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix @@ -7,12 +7,12 @@ buildLua { pname = "dynamic-crop"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-09-14"; src = fetchFromGitHub { owner = "Ashyni"; repo = "mpv-scripts"; - rev = "1fadd5ea3e31818db33c9372c40161db6fc1bdd3"; - hash = "sha256-nC0Iw+9PSGxc3OdYhEmFVa49Sw+rIbuFhgZvAphP4cM="; + rev = "d3f5685f5209ae548f8398b21d4dcbbea766d076"; + hash = "sha256-9v8ZsBj9F5Odhfo/iWGA3Ak/+gFrbe0FldrTyCKF6tk="; }; passthru.scriptName = "dynamic-crop.lua"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 0a00b04c71..fa148c3cde 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -2,7 +2,6 @@ lib, buildLua, fetchFromGitHub, - fetchpatch, unstableGitUpdater, libnotify, }: diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix index bff265892e..3a2ac5e4e9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -24,7 +24,7 @@ buildLua { substituteInPlace platform.lua \ --replace \'curl\' \'${lib.getExe curl}\' \ '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' --replace xclip ${lib.getExe xclip} \ --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix index b68f2d50c5..8104921aad 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix @@ -95,7 +95,7 @@ let makeWrapper "${mpv}/bin/mpv" "$out/bin/mpv" ${mostMakeWrapperArgs} rm "$out/bin/umpv" makeWrapper "${mpv}/bin/umpv" "$out/bin/umpv" ${umpvWrapperArgs} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # wrapProgram can't operate on symlinks rm "$out/Applications/mpv.app/Contents/MacOS/mpv" makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} diff --git a/third_party/nixpkgs/pkgs/applications/video/natron/default.nix b/third_party/nixpkgs/pkgs/applications/video/natron/default.nix index 5ca88c666e..e02aa4af61 100644 --- a/third_party/nixpkgs/pkgs/applications/video/natron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/natron/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 5f3f68fb03..c7bcdfc4f7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -31,13 +31,13 @@ , luajit , swig , python3 -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , libcef , pciutils -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , withFdk ? true , pipewire , libdrm @@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addDriverRunpath $out/lib/lib*.so addDriverRunpath $out/lib/obs-plugins/*.so diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 9a2069a271..aff145b1fc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 9b7ec4090d..59be77c454 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-PpGNLIOz+fCpcP/nvjcJ+1fkduxjcbZjb7yx8TUO25s="; + hash = "sha256-ykiLsHL3hoe0ibxMxp4zrqeSeQfgnJfNg7Yb5i9HDJQ="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index b66d3d01b2..f7e21b796c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA="; }; - cmakeFlags = lib.optionals stdenv.isi686 [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isi686 [ # We don't want to build the plugin for 32bit. The library integrates with # the 64bit plugin but it's necessary to be loaded into 32bit games. "-DBUILD_PLUGIN=OFF" @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader wayland ] - ++ lib.optionals (!stdenv.isi686) [ + ++ lib.optionals (!stdenv.hostPlatform.isi686) [ obs-studio ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix b/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix index 18ee73b534..c033c19143 100644 --- a/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { qtwayland qtmultimedia qttools - ] ++ lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; meta = with lib; { description = "Professional open-source NLE video editor"; @@ -90,7 +90,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.balsoft ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "olive-editor"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index 88f13ef3eb..ec6e309e9b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -10,7 +10,7 @@ , qtsvg , qtwayland , wayland -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , wrapGAppsHook3 }: @@ -66,7 +66,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \ '' + '' "''${gappsWrapperArgs[@]}" \ diff --git a/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix b/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix index 52463c4689..eab7c5a7d2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix @@ -73,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fully functional Opencast capture agent written in Python"; mainProgram = "pyca"; homepage = "https://github.com/opencast/pyCA"; diff --git a/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix b/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix index 0e8f3bfb58..d08387669e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "QMediathekView"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix b/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix index 3172c4bb43..2f0c66ecd1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix @@ -79,7 +79,7 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; platforms = lib.platforms.gnu ++ lib.platforms.linux; mainProgram = "qstopmotion"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix index 713a0ad275..48b38da01f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kl/sub-batch"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sub-batch"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix b/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix index 105823fec3..91a966bd1f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix @@ -5,7 +5,7 @@ }: let version = "1.13.4"; - gopt = if stdenv.isLinux then util-linux else getopt; + gopt = if stdenv.hostPlatform.isLinux then util-linux else getopt; runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer gopt ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix index afce9a79d0..612731acdc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-gn1Z3pw8f0Tpo8Ot0hP9+p/KbK/EGOInE34BCH3aVp0="; + sha256 = "sha256-/eNPhkrLpxXeX/5EitMJUgZCPy1Ked3oKuMdD6OuEYc="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix b/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix index 89d32f6f9a..70458c7f62 100644 --- a/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix @@ -43,14 +43,14 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libsixel mpv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security AppKit ]; # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/youtube-tui \ --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index 2c1e49ac2c..35336ad8ad 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -206,6 +206,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: { license = lib.licenses.bsd2; platforms = metaPlatforms; maintainers = with lib.maintainers; [ adamcstephens raitobezarius mjoerg ]; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index f1dcda8df7..9af9b96482 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.isAarch64 dtc; + buildInputs = lib.optional stdenv.hostPlatform.isAarch64 dtc; checkInputs = [ openssl ]; OPENSSL_NO_VENDOR = true; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix index 2538611785..290186a59e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix @@ -12,7 +12,7 @@ , colima # use lima-bin on darwin to support native macOS virtualization # https://github.com/NixOS/nixpkgs/pull/209171 -, lima-drv ? if stdenv.isDarwin then lima-bin else lima +, lima-drv ? if stdenv.hostPlatform.isDarwin then lima-bin else lima }: buildGoModule rec { @@ -33,7 +33,7 @@ buildGoModule rec { }; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; vendorHash = "sha256-niuBo2YUUYKH0eSApOByNLrcHqr9m5VKGoiGp1fKklg="; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index 2230e31231..f4bc4000f9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-s4VLuOLPNZGThnvr20EBddxKkreWf3B4D0RRx9OwJiw="; + hash = "sha256-KYPOeDI1g7hUwS7gvKiuOck/2MwvnawP1ZgDAfo4brA="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 264a8ae288..45099329c2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.29.2"; + version = "2.29.7"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-UR2O8xBfoFew9G7RjyfXpdA0BcilKBp9Maj3Z+T7Kbw="; + hash = "sha256-6ksZAGVAFnLwPnCXlCtp4cWfxzJRp/bfVkpvp3Z6fiQ="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-5pBpTXayAo/YbZsYwBuEU8CSTQGzKoyQ5QLzh2McCt8="; + vendorHash = "sha256-B2ywdZjp7h7eFYNJ4wXmAdbOxc8ftGqHnLmDvzQASJE="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 9ce338dca7..928480e6c4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -16,11 +16,11 @@ rec { , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests - , clientOnly ? !stdenv.isLinux, symlinkJoin + , clientOnly ? !stdenv.hostPlatform.isLinux, symlinkJoin , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd - , withBtrfs ? stdenv.isLinux, btrfs-progs - , withLvm ? stdenv.isLinux, lvm2 - , withSeccomp ? stdenv.isLinux, libseccomp + , withBtrfs ? stdenv.hostPlatform.isLinux, btrfs-progs + , withLvm ? stdenv.hostPlatform.isLinux, lvm2 + , withSeccomp ? stdenv.hostPlatform.isLinux, libseccomp , knownVulnerabilities ? [] }: let @@ -80,7 +80,7 @@ rec { hash = mobyHash; }; - moby = buildGoModule (lib.optionalAttrs stdenv.isLinux rec { + moby = buildGoModule (lib.optionalAttrs stdenv.hostPlatform.isLinux rec { pname = "moby"; inherit version; @@ -95,9 +95,9 @@ rec { ++ lib.optional withSystemd systemd ++ lib.optional withSeccomp libseccomp; - extraPath = lib.optionals stdenv.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + extraPath = lib.optionals stdenv.hostPlatform.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); - extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + extraUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); patches = lib.optionals (lib.versionOlder version "23") [ # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. @@ -188,7 +188,7 @@ rec { makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.isLinux) [ + buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.hostPlatform.isLinux) [ glibc glibc.static ]; @@ -323,15 +323,15 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.2.0"; + version = "27.3.0"; cliRev = "v${version}"; - cliHash = "sha256-Fa1EUwJjxh5jzhQJ4tllDZBfB7KACHDEe9ETVzMfUNY="; + cliHash = "sha256-1z2MmWq+HD2fhpZqXu0G7oBL3Mc0NN/fR69aMWRelns="; mobyRev = "v${version}"; - mobyHash = "sha256-grxKlsbhxumQZNOyM96aURSiVFE1Fe5NFxUoPzFX/Qk="; - runcRev = "v1.1.13"; - runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; - containerdRev = "v1.7.21"; - containerdHash = "sha256-cL1RKFg+B2gTPMg963DKup5BCLLgF9t9VZn2WlmmWPI="; + mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; + runcRev = "v1.1.14"; + runcHash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; + containerdRev = "v1.7.22"; + containerdHash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix index d6da5a2742..392ba59418 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { rustc asciidoctor makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; - buildInputs = [ libkrun ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libkrun ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # It attaches entitlements with codesign and strip removes those, # voiding the entitlements and making it non-operational. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; postFixup = '' wrapProgram $out/bin/krunvm \ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix index 7549f0c152..ca45c58ff2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { sourceRoot = "."; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ] - ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -79,7 +79,7 @@ stdenvNoCC.mkDerivation { # Stripping removes entitlements of the binary on Darwin making it non-operational. # Therefore, disable stripping on Darwin. - dontStrip = stdenvNoCC.isDarwin; + dontStrip = stdenvNoCC.hostPlatform.isDarwin; passthru.updateScript = let diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix index c57b58a008..318d54c77c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { vendorHash = "sha256-P0Qnfu/cqLveAwz9jf/wTXxkoh0jvazlE5C/PcUrWsA="; nativeBuildInputs = [ makeWrapper installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' @@ -34,7 +34,7 @@ buildGoModule rec { # It attaches entitlements with codesign and strip removes those, # voiding the entitlements and making it non-operational. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix index c889dc5ff5..751cbd021f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lkl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 sed '1i#include ' -i tools/lkl/lib/hijack/xlate.c - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig echo CONFIG_KALLSYMS_BASE_RELATIVE=n >> arch/lkl/configs/defconfig '' + lib.optionalString firewallSupport '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix index 015768b4ed..ce7d993d39 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 9a714054aa..95bd221a3f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -22,7 +22,7 @@ , crun , runc , conmon -, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki +, extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ] # e.g.: runc, gvisor, youki , fuse-overlayfs , util-linux , iptables @@ -39,12 +39,12 @@ let # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed - binPath = lib.makeBinPath (lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ fuse-overlayfs util-linux iptables iproute2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ vfkit ] ++ extraPackages); @@ -54,7 +54,7 @@ let # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ gvproxy - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark @@ -93,7 +93,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs gpgme libapparmor @@ -110,7 +110,7 @@ buildGoModule rec { runHook preBuild patchShebangs . substituteInPlace Makefile --replace "/bin/bash" "${runtimeShell}" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' make podman-remote # podman-mac-helper uses FHS paths '' else '' make bin/podman bin/rootlessport bin/quadlet @@ -121,7 +121,7 @@ buildGoModule rec { installPhase = '' runHook preInstall - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' install bin/darwin/podman -Dt $out/bin '' else '' make install.bin install.systemd @@ -134,7 +134,7 @@ buildGoModule rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped ''; @@ -144,7 +144,7 @@ buildGoModule rec { package = podman; command = "HOME=$TMPDIR podman --version"; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 6be060d448..8625069da8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -6,14 +6,14 @@ , attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, Kernel, rez, setfile, vmnet , guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal -, numaSupport ? stdenv.isLinux && !stdenv.isAarch32 && !minimal, numactl -, seccompSupport ? stdenv.isLinux && !minimal, libseccomp +, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl +, seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp , alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner && !minimal -, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, libpulseaudio -, pipewireSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, pipewire -, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, SDL2, SDL2_image -, jackSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, libjack2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !minimal, gtk3, gettext, vte, wrapGAppsHook3 +, pulseSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, libpulseaudio +, pipewireSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, pipewire +, sdlSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, SDL2, SDL2_image +, jackSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, libjack2 +, gtkSupport ? !stdenv.hostPlatform.isDarwin && !xenSupport && !nixosTestRunner && !minimal, gtk3, gettext, vte, wrapGAppsHook3 , vncSupport ? !nixosTestRunner && !minimal, libjpeg, libpng , smartcardSupport ? !nixosTestRunner && !minimal, libcacard , spiceSupport ? true && !nixosTestRunner && !minimal, spice, spice-protocol @@ -28,7 +28,7 @@ , libiscsiSupport ? !minimal, libiscsi , smbdSupport ? false, samba , tpmSupport ? !minimal -, uringSupport ? stdenv.isLinux && !userOnly, liburing +, uringSupport ? stdenv.hostPlatform.isLinux && !userOnly, liburing , canokeySupport ? !minimal, canokey-qemu , capstoneSupport ? !minimal, capstone , pluginsSupport ? !stdenv.hostPlatform.isStatic @@ -39,7 +39,7 @@ , hostCpuTargets ? (if toolsOnly then [ ] else if hostCpuOnly - then (lib.optional stdenv.isx86_64 "i386-softmmu" + then (lib.optional stdenv.hostPlatform.isx86_64 "i386-softmmu" ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) else null) , nixosTestRunner ? false @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals gtkSupport [ wrapGAppsHook3 ] ++ lib.optionals enableDocs [ python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals hexagonSupport [ glib ] - ++ lib.optionals stdenv.isDarwin [ sigtool ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] ++ lib.optionals (!userOnly) [ dtc ]; buildInputs = [ zlib glib pixman @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { gnutls nettle curl libslirp ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor Kernel rez setfile vmnet ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] @@ -112,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals smartcardSupport [ libcacard ] ++ lib.optionals spiceSupport [ spice-protocol spice ] ++ lib.optionals usbredirSupport [ usbredir ] - ++ lib.optionals stdenv.isLinux [ libcap_ng libcap attr ] - ++ lib.optionals (stdenv.isLinux && !userOnly) [ libaio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng libcap attr ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && !userOnly) [ libaio ] ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] ++ lib.optional guestAgentSupport "ga"; # On aarch64-linux we would shoot over the Hydra's 2G output limit. - separateDebugInfo = !(stdenv.isAarch64 && stdenv.isLinux); + separateDebugInfo = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); patches = [ ./fix-qemu-ga.patch @@ -179,8 +179,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional spiceSupport "--enable-spice" ++ lib.optional usbredirSupport "--enable-usb-redir" ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" - ++ lib.optionals stdenv.isDarwin [ "--enable-cocoa" "--enable-hvf" ] - ++ lib.optional (stdenv.isLinux && !userOnly) "--enable-linux-aio" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-cocoa" "--enable-hvf" ] + ++ lib.optional (stdenv.hostPlatform.isLinux && !userOnly) "--enable-linux-aio" ++ lib.optional gtkSupport "--enable-gtk" ++ lib.optional xenSupport "--enable-xen" ++ lib.optional cephSupport "--enable-rbd" @@ -204,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: { # voiding the entitlements and making it non-operational. # The alternative is to re-sign with entitlements after stripping: # * https://github.com/qemu/qemu/blob/v6.1.0/scripts/entitlement.sh#L25 - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; postFixup = '' # the .desktop is both invalid and pointless @@ -260,7 +260,7 @@ stdenv.mkDerivation (finalAttrs: { # xattrs are not allowed in the sandbox substituteInPlace ../tests/qtest/virtio-9p-test.c \ --replace-fail mapped-xattr mapped-file - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # skip test that stalls on darwin, perhaps due to subtle differences # in fifo behaviour substituteInPlace ../tests/unit/meson.build \ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix index 2d6b7d3da0..4693999e8f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix @@ -15,7 +15,7 @@ assert lib.assertMsg (builtins.elem guiBackend ["sdl" "x11" "none"]) "Unsupported GUI backend"; assert lib.assertMsg (!(enableSDL && enableX11)) "RVVM can have only one GUI backend at a time"; -assert lib.assertMsg (stdenv.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; +assert lib.assertMsg (stdenv.hostPlatform.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; stdenv.mkDerivation rec { pname = "rvvm"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix index cda1f5d6cb..ba98f6b2cd 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/riscv/sail-riscv"; description = "Formal specification of the RISC-V architecture, written in Sail"; maintainers = with maintainers; [ genericnerdyusername ]; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; license = licenses.bsd2; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix index 1712685048..d0e79c4f98 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix @@ -1,30 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, dtc, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; - version = "1.1.0"; + version = "1.1.0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "riscv"; repo = "riscv-isa-sim"; - rev = "v${version}"; - sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI="; + rev = "de5094a1a901d77ff44f89b38e00fefa15d4018e"; + sha256 = "sha256-mAgR2VzDgeuIdmPEgrb+MaA89BnWfmNanOVidqn0cgc="; }; - patches = [ - (fetchpatch { - name = "fesvr-fix-compilation-with-gcc-13.patch"; - url = "https://github.com/riscv-software-src/riscv-isa-sim/commit/0a7bb5403d0290cea8b2356179d92e4c61ffd51d.patch"; - hash = "sha256-JUMTbGawvLkoOWKkruzLzUFQytVR3wqTlGu/eegRFEE="; - }) - ]; - nativeBuildInputs = [ dtc ]; enableParallelBuilding = true; postPatch = '' patchShebangs scripts/*.sh - patchShebangs tests/ebreak.py ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 228c2ed6cb..2b230a95b5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils wrapGAppsHook3 - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ gst_all_1.gst-plugins-base diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix index a4e32f618a..2c368db8da 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { gdbm spice-gtk spice-protocol - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ]); diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 3f27170311..437ceba29c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -13,7 +13,7 @@ , javaBindings ? true, jdk # Almost doesn't affect closure size , pythonBindings ? false, python3 , extensionPack ? null, fakeroot -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio , enableHardening ? false , headless ? false , enable32bitGuests ? true diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.17/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.17/default.nix index 2bf93a79be..d270c37f2c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.17/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.17/default.nix @@ -16,6 +16,7 @@ let with upstreamPatches; [ QUBES_REPRODUCIBLE_BUILDS + XSA_462 ] ); in diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.18/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.18/default.nix index 2aa731b6f2..21d6de13f1 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.18/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.18/default.nix @@ -16,6 +16,7 @@ let with upstreamPatches; [ QUBES_REPRODUCIBLE_BUILDS + XSA_462 ] ); in diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.19/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.19/default.nix index 5b8cf5d217..a1b1337042 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.19/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.19/default.nix @@ -18,6 +18,7 @@ let QUBES_REPRODUCIBLE_BUILDS XSA_460 XSA_461 + XSA_462 ] ); in diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/default.nix index 4c879e38d2..fbbefa95d6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/default.nix @@ -98,11 +98,13 @@ let ]; # Inherit attributes from a versionDefinition. - inherit (versionDefinition) pname; - inherit (versionDefinition) branch; - inherit (versionDefinition) version; - inherit (versionDefinition) latest; - inherit (versionDefinition) pkg; + inherit (versionDefinition) + pname + branch + version + latest + pkg + ; # Mark versions older than minSupportedVersion as EOL. minSupportedVersion = "4.17"; @@ -118,10 +120,9 @@ let lib.attrsets.optionalAttrs withInternalQEMU { qemu = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen.git"; + url = "https://xenbits.xenproject.org/git-http/qemu-xen.git"; fetchSubmodules = true; - inherit (pkg.qemu) rev; - inherit (pkg.qemu) hash; + inherit (pkg.qemu) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.qemu) pkg.qemu.patches; path = "tools/qemu-xen"; @@ -130,9 +131,8 @@ let // lib.attrsets.optionalAttrs withInternalSeaBIOS { seaBIOS = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/seabios.git"; - inherit (pkg.seaBIOS) rev; - inherit (pkg.seaBIOS) hash; + url = "https://xenbits.xenproject.org/git-http/seabios.git"; + inherit (pkg.seaBIOS) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" @@ -143,10 +143,9 @@ let // lib.attrsets.optionalAttrs withInternalOVMF { ovmf = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/ovmf.git"; + url = "https://xenbits.xenproject.org/git-http/ovmf.git"; fetchSubmodules = true; - inherit (pkg.ovmf) rev; - inherit (pkg.ovmf) hash; + inherit (pkg.ovmf) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ovmf) pkg.ovmf.patches; path = "tools/firmware/ovmf-dir-remote"; @@ -157,8 +156,7 @@ let src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - inherit (pkg.ipxe) rev; - inherit (pkg.ipxe) hash; + inherit (pkg.ipxe) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ipxe) pkg.ipxe.patches; path = "tools/firmware/etherboot/ipxe.git"; @@ -317,8 +315,7 @@ let in stdenv.mkDerivation (finalAttrs: { - inherit pname; - inherit version; + inherit pname version; outputs = [ "out" # TODO: Split $out in $bin for binaries and $lib for libraries. @@ -330,9 +327,8 @@ stdenv.mkDerivation (finalAttrs: { # Main Xen source. src = fetchgit { - url = "https://xenbits.xen.org/git-http/xen.git"; - inherit (pkg.xen) rev; - inherit (pkg.xen) hash; + url = "https://xenbits.xenproject.org/git-http/xen.git"; + inherit (pkg.xen) rev hash; }; patches = @@ -430,8 +426,6 @@ stdenv.mkDerivation (finalAttrs: { "xen" # Build the Xen Hypervisor. "tools" # Build the userspace tools, such as `xl`. "docs" # Build the Xen Documentation - # TODO: Enable the Stubdomains target. This requires another pre-fetched source: mini-os. Currently, Xen appears to build a limited version of stubdomains which does not include mini-os. - # "stubdom" ]; enableParallelBuilding = true; @@ -536,8 +530,10 @@ stdenv.mkDerivation (finalAttrs: { ${deployPrefetchedSourcesPatches} '' # Patch shebangs for QEMU and OVMF build scripts. - + '' + + lib.strings.optionalString withInternalQEMU '' patchShebangs --build tools/qemu-xen/scripts/tracetool.py + '' + + lib.strings.optionalString withInternalOVMF '' patchShebangs --build tools/firmware/ovmf-dir-remote/OvmfPkg/build.sh tools/firmware/ovmf-dir-remote/BaseTools/BinWrappers/PosixLike/{AmlToC,BrotliCompress,build,GenFfs,GenFv,GenFw,GenSec,LzmaCompress,TianoCompress,Trim,VfrCompile} ''; @@ -640,77 +636,93 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = { - inherit branch; - # Short description for Xen. - description = - "Xen Hypervisor" - # The "and related components" addition is automatically hidden if said components aren't being built. - + lib.strings.optionalString (prefetchedSources != { }) " and related components" - # To alter the description inside the paranthesis, edit ./packages.nix. - + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ + meta = + if + !(lib.attrsets.hasAttrByPath [ "meta" - "description" - ] packageDefinition) " (${packageDefinition.meta.description})"; - # Long description for Xen. - longDescription = - # Starts with the longDescription from ./packages.nix. - (packageDefinition.meta.longDescription or "") - + lib.strings.optionalString (!withInternalQEMU) ( - "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" - + lib.strings.optionalString latest " or `qemu_xen`" - + ".\n" - ) - # Then, if any of the optional with* components are being built, add the "Includes:" string. - + - lib.strings.optionalString - ( - withInternalQEMU - || withInternalSeaBIOS - || withInternalOVMF - || withInternalIPXE - || withEFI - || withFlask + ] versionDefinition) + then + { + inherit branch; + + # Short description for Xen. + description = + "Xen Hypervisor" + # The "and related components" addition is automatically hidden if said components aren't being built. + + lib.strings.optionalString (prefetchedSources != { }) " and related components" + # To alter the description inside the paranthesis, edit ./packages.nix. + + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ + "meta" + "description" + ] packageDefinition) " (${packageDefinition.meta.description})"; + + # Long description for Xen. + longDescription = + # Starts with the longDescription from ./packages.nix. + (packageDefinition.meta.longDescription or "") + + lib.strings.optionalString (!withInternalQEMU) ( + "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" + + lib.strings.optionalString latest " or `qemu_xen`" + + ".\n" ) - ( - "\nIncludes:" - # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't - # that many optional components, we just use lib.strings.optionalString, because it's simpler. - # Optional components that aren't being built are automatically hidden. - + lib.strings.optionalString withEFI "\n* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." - + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." - + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/)." - + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." - + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." - + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/)." - ) - # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. - # This will hopefully give users the peace of mind that their Xen is secure, without needing - # to search the source code for the XSA patches. - + lib.strings.optionalString (writeAdvisoryDescription != [ ]) ( - "\n\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n" - + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription) - ); - homepage = "https://xenproject.org/"; - downloadPage = "https://downloads.xenproject.org/release/xen/${version}/"; - changelog = "https://wiki.xenproject.org/wiki/Xen_Project_${branch}_Release_Notes"; - license = with lib.licenses; [ - # Documentation. - cc-by-40 - # Most of Xen is licensed under the GPL v2.0. - gpl2Only - # Xen Libraries and the `xl` command-line utility. - lgpl21Only - # Development headers in $dev/include. - mit - ]; - # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. - maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) ( - with lib.maintainers; [ sigmasquadron ] - ); - mainProgram = "xl"; - # Evaluates to x86_64-linux. - platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; - knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"; - }; + # Then, if any of the optional with* components are being built, add the "Includes:" string. + + + lib.strings.optionalString + ( + withInternalQEMU + || withInternalSeaBIOS + || withInternalOVMF + || withInternalIPXE + || withEFI + || withFlask + ) + ( + "\nIncludes:" + # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't + # that many optional components, we just use lib.strings.optionalString, because it's simpler. + # Optional components that aren't being built are automatically hidden. + + lib.strings.optionalString withEFI "\n* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." + + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." + + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/)." + + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." + + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." + + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/)." + ) + # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. + # This will hopefully give users the peace of mind that their Xen is secure, without needing + # to search the source code for the XSA patches. + + lib.strings.optionalString (writeAdvisoryDescription != [ ]) ( + "\n\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n" + + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription) + ); + + homepage = "https://xenproject.org/"; + downloadPage = "https://downloads.xenproject.org/release/xen/${version}/"; + changelog = "https://wiki.xenproject.org/wiki/Xen_Project_${branch}_Release_Notes"; + + license = with lib.licenses; [ + # Documentation. + cc-by-40 + # Most of Xen is licensed under the GPL v2.0. + gpl2Only + # Xen Libraries and the `xl` command-line utility. + lgpl21Only + # Development headers in $dev/include. + mit + ]; + + # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. + maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) ( + with lib.maintainers; [ sigmasquadron ] + ); + knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"; + + mainProgram = "xl"; + + # Evaluates to x86_64-linux. + platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; + + } + else + versionDefinition.meta; }) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/patches.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/patches.nix index 33b4cdf803..4bb58d5a42 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/patches.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic/patches.nix @@ -99,21 +99,6 @@ in }) ]; - # Xen Security Advisory #458: (4.16.6 - 4.19-rc3) - "XSA_458" = xsaPatch { - id = "458"; - title = "Double unlock in x86 guest IRQ handling"; - description = '' - An optional feature of PCI MSI called "Multiple Message" allows a device - to use multiple consecutive interrupt vectors. Unlike for MSI-X, the - setting up of these consecutive vectors needs to happen all in one go. - In this handling an error path could be taken in different situations, - with or without a particular lock held. This error path wrongly releases - the lock even when it is not currently held. - ''; - cve = [ "CVE-2024-31143" ]; - hash = "sha256-yHI9Sp/7Ed40iIYQ/HOOIULlfzAzL0c0MGqdF+GR+AQ="; - }; # Xen Security Advisory #460: (4.16.6 - 4.19.0) "XSA_460" = xsaPatch { id = "460"; @@ -149,4 +134,26 @@ in cve = [ "CVE-2024-31146" ]; hash = "sha256-JQWoqf47hy9WXNkVC/LgmjUhkxN0SBF6w8PF4aFZxhM="; }; + # Xen Security Advisory #462: (4.16.6 - 4.19.0) + "XSA_462" = xsaPatch { + id = "462"; + title = "x86: Deadlock in vlapic_error()"; + description = '' + In x86's APIC (Advanced Programmable Interrupt Controller) architecture, + error conditions are reported in a status register. Furthermore, the OS + can opt to receive an interrupt when a new error occurs. + + It is possible to configure the error interrupt with an illegal vector, + which generates an error when an error interrupt is raised. + + This case causes Xen to recurse through vlapic_error(). The recursion + itself is bounded; errors accumulate in the the status register and only + generate an interrupt when a new status bit becomes set. + + However, the lock protecting this state in Xen will try to be taken + recursively, and deadlock. + ''; + cve = [ "CVE-2024-45817" ]; + hash = "sha256-01lzjaT2f69UfEdTUCkm92DDOmd+Mo8sNPZsHJfgJEM="; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/update.sh b/third_party/nixpkgs/pkgs/applications/virtualization/xen/update.sh index 6ac8ba5a82..e5012768b4 100755 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/update.sh +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/update.sh @@ -5,6 +5,9 @@ set -o errexit set -o pipefail set -o nounset +#TODO: Use `jq` instead of `sed`. +#TODO: Accept the small security drawback and make this script runnable by r-ryantm. + # This script expects to be called in an interactive terminal somewhere inside Nixpkgs. echo "Preparing..." nixpkgs=$(git rev-parse --show-toplevel) @@ -22,7 +25,7 @@ userInputFingerprint=${userInputFingerprint:-"23E3222C145F4475FA8060A783FE14C957 # Clone xen.git. echo -e "Cloning \e[1;34mxen.git\e[0m..." -git clone --quiet https://xenbits.xen.org/git-http/xen.git /tmp/xenUpdateScript/xen +git clone --quiet https://xenbits.xenproject.org/git-http/xen.git /tmp/xenUpdateScript/xen cd /tmp/xenUpdateScript/xen # Get list of versions and branches. @@ -35,6 +38,8 @@ minSupportedBranch="$(grep " minSupportedVersion = " "$xenPath"/generic/default supportedBranches=($(for version in "${branchList[@]}"; do if [ "$(printf '%s\n' "$minSupportedBranch" "$version" | sort -V | head -n1)" = "$minSupportedBranch" ]; then echo "$version"; fi; done)) supportedVersions=($(for version in "${supportedBranches[@]}"; do echo "$versionList" | tr ' ' '\n' | grep "$version" | tail --lines=1; done)) +echo -e "\e[1mNOTE\e[0m: As we're also pre-fetching the submodules, QEMU and OVMF may take a very long time to fetch." + # Main loop that installs every supportedVersion. for version in "${supportedVersions[@]}"; do echo -e "\n------------------------------------------------" @@ -59,31 +64,33 @@ for version in "${supportedVersions[@]}"; do git switch --quiet --detach RELEASE-"$version" # Originally we told people to go check the Makefile themselves. - echo -e "\nDetermining source versions from Xen Makefiles..." - qemuVersion="$(grep -ie "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" - seaBIOSVersion="$(grep -ie "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" - ovmfVersion="$(grep -ie "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" - ipxeVersion="$(grep -ie "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + echo -e -n "\nDetermining source versions from Xen Makefiles..." + qemuVersion="$(grep "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" + seaBIOSVersion="$(grep "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" + ovmfVersion="$(grep "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" + miniOSVersion="$(grep "MINIOS_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"MINIOS_UPSTREAM_REVISION ?= "//g)" + ipxeVersion="$(grep "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + echo "done!" # Use `nix-prefetch-git` to fetch `rev`s and `hash`es. echo "Pre-fetching sources and determining hashes..." echo -e -n " \e[1;32mXen\e[0m..." - fetchXen=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/xen.git --rev RELEASE-"$version" --quiet) + fetchXen=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/xen.git --rev RELEASE-"$version" --quiet) finalVersion="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" hash="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mQEMU\e[0m..." - fetchQEMU=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/qemu-xen.git --rev "$qemuVersion" --quiet --fetch-submodules) + fetchQEMU=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/qemu-xen.git --rev "$qemuVersion" --quiet --fetch-submodules) finalQEMUVersion="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" qemuHash="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mSeaBIOS\e[0m..." - fetchSeaBIOS=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/seabios.git --rev "$seaBIOSVersion" --quiet) + fetchSeaBIOS=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/seabios.git --rev "$seaBIOSVersion" --quiet) finalSeaBIOSVersion="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" seaBIOSHash="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mOVMF\e[0m..." - ovmfHash="$(nix-prefetch-git --url https://xenbits.xen.org/git-http/ovmf.git --rev "$ovmfVersion" --quiet --fetch-submodules | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" + ovmfHash="$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/ovmf.git --rev "$ovmfVersion" --quiet --fetch-submodules | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" echo "done!" echo -e -n " \e[1;36miPXE\e[0m..." ipxeHash="$(nix-prefetch-git --url https://github.com/ipxe/ipxe.git --rev "$ipxeVersion" --quiet | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" @@ -120,13 +127,13 @@ for version in "${supportedVersions[@]}"; do echo -e "Found the following patches:\n \e[1;32mXen\e[0m: \e[1;33m$discoveredXenPatchesEcho\e[0m\n \e[1;36mQEMU\e[0m: \e[1;33m$discoveredQEMUPatchesEcho\e[0m\n \e[1;36mSeaBIOS\e[0m: \e[1;33m$discoveredSeaBIOSPatchesEcho\e[0m\n \e[1;36mOVMF\e[0m: \e[1;33m$discoveredOVMFPatchesEcho\e[0m\n \e[1;36miPXE\e[0m: \e[1;33m$discoveredIPXEPatchesEcho\e[0m" # Prepare patches that are called in ./patches.nix. - defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458" "XSA_460" "XSA_461" ) + defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_460" "XSA_461" ) read -r -a defaultPatchList -p $'\nWould you like to override the \e[1;34mupstreamPatches\e[0m list for \e[1;32mXen '"$version"$'\e[0m? If no, press \e[1;34menter\e[0m to use the default patch list: [ \e[1;34m'"${defaultPatchListInit[*]}"$' \e[0m]: ' defaultPatchList=(${defaultPatchList[@]:-${defaultPatchListInit[@]}}) upstreamPatches=${defaultPatchList[*]} # Write and format default.nix file. - echo -e "\nWriting updated \e[1;34mversionDefinition\e[0m..." + echo -e -n "\nWriting updated \e[1;34mversionDefinition\e[0m..." cat >"$branch"/default.nix < 1) "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); assert - (lib.assertMsg (enableFakechroot -> !stdenv.isDarwin) '' + (lib.assertMsg (enableFakechroot -> !stdenv.hostPlatform.isDarwin) '' cannot use `enableFakechroot` because `proot` is not portable to Darwin. Workarounds: - use `fakeRootCommands` with the restricted `fakeroot` environment - cross-compile your packages @@ -1009,7 +1010,7 @@ rec { conf = runCommand "${baseName}-conf.json" { - inherit fromImage maxLayers created uid gid uname gname; + inherit fromImage maxLayers created mtime uid gid uname gname; imageName = lib.toLower name; preferLocalBuild = true; passthru.imageTag = @@ -1029,10 +1030,13 @@ rec { imageTag="${tag}" ''} - # convert "created" to iso format + # convert "created" and "mtime" to iso format if [[ "$created" != "now" ]]; then created="$(date -Iseconds -d "$created")" fi + if [[ "$mtime" != "now" ]]; then + mtime="$(date -Iseconds -d "$mtime")" + fi paths() { cat $paths ${lib.concatMapStringsSep " " @@ -1089,6 +1093,7 @@ rec { "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, "created": $created, + "mtime": $mtime, "uid": $uid, "gid": $gid, "uname": $uname, @@ -1100,6 +1105,7 @@ rec { --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ --arg created "$created" \ + --arg mtime "$mtime" \ --arg uid "$uid" \ --arg gid "$gid" \ --arg uname "$uname" \ diff --git a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py index d3778625cc..0078c1cb76 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py +++ b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py @@ -307,6 +307,15 @@ def add_bytes(tar, path, content, mtime): tar.addfile(ti, io.BytesIO(content)) +now = datetime.now(tz=timezone.utc) + + +def parse_time(s): + if s == "now": + return now + return datetime.fromisoformat(s) + + def main(): arg_parser = argparse.ArgumentParser( description=""" @@ -342,12 +351,8 @@ Docker Image Specification v1.2 as reference [1]. with open(args.conf, "r") as f: conf = json.load(f) - created = ( - datetime.now(tz=timezone.utc) - if conf["created"] == "now" - else datetime.fromisoformat(conf["created"]) - ) - mtime = int(created.timestamp()) + created = parse_time(conf["created"]) + mtime = int(parse_time(conf["mtime"]).timestamp()) uid = int(conf["uid"]) gid = int(conf["gid"]) uname = conf["uname"] diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix index b9f7a2ff72..950a17b8b2 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -135,6 +135,7 @@ let useDotnetFromEnv nugetDeps runtimeId + dotnet-sdk ; nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ @@ -149,12 +150,7 @@ let dotnet-sdk ]; - buildInputs = - args.buildInputs or [ ] - ++ [ - dotnet-sdk.packages - ] - ++ projectReferences; + buildInputs = args.buildInputs or [ ] ++ dotnet-sdk.packages ++ projectReferences; # Parse the version attr into a format acceptable for the Version msbuild property # The actual version attr is saved in InformationalVersion, which accepts an arbitrary string @@ -206,7 +202,12 @@ stdenvNoCC.mkDerivation ( let args = if lib.isFunction fnOrAttrs then fnOrAttrs (args' // finalAttrs) else fnOrAttrs; args' = transformArgs finalAttrs args; - inherit (args') nugetDeps runtimeId meta; + inherit (args') + nugetDeps + runtimeId + meta + dotnet-sdk + ; args'' = removeAttrs args' [ "nugetDeps" "runtimeId" @@ -215,22 +216,25 @@ stdenvNoCC.mkDerivation ( "projectFile" "projectReferences" "runtimeDeps" - "runtimeId" "disabledTests" "testProjectFile" "buildType" "selfContainedBuild" "useDotnet" "useAppHost" + "dotnet-sdk" ]; in if nugetDeps != null then addNuGetDeps { inherit nugetDeps; overrideFetchAttrs = - a: - lib.optionalAttrs ((args'.runtimeId or null) == null) { + old: + lib.optionalAttrs ((args'.runtimeId or null) == null) rec { dotnetRuntimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) meta.platforms; + buildInputs = + old.buildInputs + ++ lib.concatLists (lib.attrValues (lib.getAttrs dotnetRuntimeIds dotnet-sdk.targetPackages)); }; } args'' finalAttrs else diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh index 21ebbbe538..38ded5874a 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -62,6 +62,7 @@ dotnetCheckHook() { -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ --configuration "$dotnetBuildType" \ + --no-restore \ --no-build \ --logger "console;verbosity=normal" \ "${runtimeIdFlagsArray[@]}" \ diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index cdd4a50f5d..7b008a26d1 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -55,6 +55,7 @@ dotnetInstallHook() { -p:OverwriteReadOnlyFiles=true \ --output "$dotnetInstallPath" \ --configuration "$dotnetBuildType" \ + --no-restore \ --no-build \ "${runtimeIdFlagsArray[@]}" \ "${dotnetInstallFlagsArray[@]}" \ @@ -73,6 +74,7 @@ dotnetInstallHook() { -p:OverwriteReadOnlyFiles=true \ --output "$out/share/nuget/source" \ --configuration "$dotnetBuildType" \ + --no-restore \ --no-build \ --runtime "$runtimeId" \ "${dotnetPackFlagsArray[@]}" \ diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/default.nix index 517afde5c8..e653bbb037 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/default.nix @@ -9,78 +9,80 @@ callPackage, overrides ? callPackage ./overrides.nix { }, }: -{ - pname, - version, - sha256 ? "", - hash ? "", - url ? "https://www.nuget.org/api/v2/package/${pname}/${version}", - installable ? false, -}: -let - package = stdenvNoCC.mkDerivation rec { - inherit pname version; +lib.makeOverridable ( + { + pname, + version, + sha256 ? "", + hash ? "", + url ? "https://www.nuget.org/api/v2/package/${pname}/${version}", + installable ? false, + }: + let + package = stdenvNoCC.mkDerivation rec { + inherit pname version; - src = fetchurl { - name = "${pname}.${version}.nupkg"; - # There is no need to verify whether both sha256 and hash are - # valid here, because nuget-to-nix does not generate a deps.nix - # containing both. - inherit - url - sha256 - hash - version - ; - }; + src = fetchurl { + name = "${pname}.${version}.nupkg"; + # There is no need to verify whether both sha256 and hash are + # valid here, because nuget-to-nix does not generate a deps.nix + # containing both. + inherit + url + sha256 + hash + version + ; + }; - nativeBuildInputs = [ - unzip - patchNupkgs - nugetPackageHook - ]; - - unpackPhase = '' - runHook preUnpack - - unpackNupkg "$src" source - cd source - - runHook postUnpack - ''; - - prePatch = '' - shopt -s nullglob - local dir - for dir in tools runtimes/*/native; do - [[ ! -d "$dir" ]] || chmod -R +x "$dir" - done - rm -rf .signature.p7s - ''; - - installPhase = '' - runHook preInstall - - dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version} - mkdir -p $dir - cp -r . $dir - echo {} > "$dir"/.nupkg.metadata - - runHook postInstall - ''; - - preFixup = '' - patch-nupkgs $out/share/nuget/packages - ''; - - createInstallableNugetSource = installable; - - meta = { - sourceProvenance = with lib.sourceTypes; [ - binaryBytecode - binaryNativeCode + nativeBuildInputs = [ + unzip + patchNupkgs + nugetPackageHook ]; + + unpackPhase = '' + runHook preUnpack + + unpackNupkg "$src" source + cd source + + runHook postUnpack + ''; + + prePatch = '' + shopt -s nullglob + local dir + for dir in tools runtimes/*/native; do + [[ ! -d "$dir" ]] || chmod -R +x "$dir" + done + rm -rf .signature.p7s + ''; + + installPhase = '' + runHook preInstall + + dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version} + mkdir -p $dir + cp -r . $dir + echo {} > "$dir"/.nupkg.metadata + + runHook postInstall + ''; + + preFixup = '' + patch-nupkgs $out/share/nuget/packages + ''; + + createInstallableNugetSource = installable; + + meta = { + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + }; }; - }; -in -overrides.${pname} or lib.id package + in + overrides.${pname} or lib.id package +) diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix index 76e241c0cd..923f8b4e91 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix @@ -53,7 +53,7 @@ package: package.overrideAttrs ( old: - lib.optionalAttrs (!stdenv.isDarwin) { + lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { setupHook = writeText "setupHook.sh" '' prependToVar dotnetRuntimeDeps \ "${lib.getLib libICE}" \ @@ -67,7 +67,7 @@ package: package.overrideAttrs ( old: - lib.optionalAttrs stdenv.isLinux { + lib.optionalAttrs stdenv.hostPlatform.isLinux { nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ]; buildInputs = old.buildInputs or [ ] ++ [ fontconfig ]; diff --git a/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix b/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix index 6868ab97d8..83972f6ed9 100644 --- a/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; installPhase = '' mkdir -p $prefix/bin - mv expand-response-params $prefix/bin/ + mv expand-response-params${stdenv.hostPlatform.extensions.executable} $prefix/bin/ ''; meta = { @@ -38,5 +38,6 @@ stdenv.mkDerivation { ''; license = lib.licenses.mit; platforms = lib.platforms.all; + mainProgram = "expand-response-params${stdenv.hostPlatform.extensions.executable}"; }; } diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/boot.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/boot.nix index 8f8c78b7a4..4aa76094a8 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/boot.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/boot.nix @@ -1,12 +1,15 @@ -let mirrors = import ./mirrors.nix; in +let + mirrors = import ./mirrors.nix; +in { system }: -{ url ? builtins.head urls -, urls ? [] -, sha256 ? "" -, hash ? "" -, name ? baseNameOf (toString url) +{ + url ? builtins.head urls, + urls ? [ ], + sha256 ? "", + hash ? "", + name ? baseNameOf (toString url), }: # assert exactly one hash is set @@ -14,12 +17,18 @@ assert hash != "" || sha256 != ""; assert hash != "" -> sha256 == ""; import { - inherit system hash sha256 name; + inherit + system + hash + sha256 + name + ; url = # Handle mirror:// URIs. Since currently # supports only one URI, use the first listed mirror. - let m = builtins.match "mirror://([a-z]+)/(.*)" url; in - if m == null then url - else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); + let + m = builtins.match "mirror://([a-z]+)/(.*)" url; + in + if m == null then url else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); } diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix index a9c2c7c46d..e4a7074333 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix @@ -1,6 +1,12 @@ -{ lib, buildPackages ? { inherit stdenvNoCC; }, stdenvNoCC -, curl # Note that `curl' may be `null', in case of the native stdenvNoCC. -, cacert ? null }: +{ + lib, + buildPackages ? { + inherit stdenvNoCC; + }, + stdenvNoCC, + curl, # Note that `curl' may be `null', in case of the native stdenvNoCC. + cacert ? null, +}: let @@ -11,180 +17,255 @@ let # fetchurl instantiations via environment variables. This makes the # resulting store derivations (.drv files) much smaller, which in # turn makes nix-env/nix-instantiate faster. - mirrorsFile = - buildPackages.stdenvNoCC.mkDerivation ({ + mirrorsFile = buildPackages.stdenvNoCC.mkDerivation ( + { name = "mirrors-list"; strictDeps = true; builder = ./write-mirror-list.sh; preferLocalBuild = true; - } // mirrors); + } + // mirrors + ); # Names of the master sites that are mirrored (i.e., "sourceforge", # "gnu", etc.). sites = builtins.attrNames mirrors; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - # This variable allows the user to pass additional options to curl - "NIX_CURL_FLAGS" + impureEnvVars = + lib.fetchers.proxyImpureEnvVars + ++ [ + # This variable allows the user to pass additional options to curl + "NIX_CURL_FLAGS" - # This variable allows the user to override hashedMirrors from the - # command-line. - "NIX_HASHED_MIRRORS" + # This variable allows the user to override hashedMirrors from the + # command-line. + "NIX_HASHED_MIRRORS" - # This variable allows overriding the timeout for connecting to - # the hashed mirrors. - "NIX_CONNECT_TIMEOUT" - ] ++ (map (site: "NIX_MIRRORS_${site}") sites); + # This variable allows overriding the timeout for connecting to + # the hashed mirrors. + "NIX_CONNECT_TIMEOUT" + ] + ++ (map (site: "NIX_MIRRORS_${site}") sites); in -{ # URL to fetch. - url ? "" +{ + # URL to fetch. + url ? "", -, # Alternatively, a list of URLs specifying alternative download + # Alternatively, a list of URLs specifying alternative download # locations. They are tried in order. - urls ? [] + urls ? [ ], -, # Additional curl options needed for the download to succeed. + # Additional curl options needed for the download to succeed. # Warning: Each space (no matter the escaping) will start a new argument. # If you wish to pass arguments with spaces, use `curlOptsList` - curlOpts ? "" + curlOpts ? "", -, # Additional curl options needed for the download to succeed. - curlOptsList ? [] + # Additional curl options needed for the download to succeed. + curlOptsList ? [ ], -, # Name of the file. If empty, use the basename of `url' (or of the + # Name of the file. If empty, use the basename of `url' (or of the # first element of `urls'). - name ? "" + name ? "", # for versioned downloads optionally take pname + version. -, pname ? "" -, version ? "" + pname ? "", + version ? "", -, # SRI hash. - hash ? "" + # SRI hash. + hash ? "", -, # Legacy ways of specifying the hash. - outputHash ? "" -, outputHashAlgo ? "" -, sha1 ? "" -, sha256 ? "" -, sha512 ? "" + # Legacy ways of specifying the hash. + outputHash ? "", + outputHashAlgo ? "", + sha1 ? "", + sha256 ? "", + sha512 ? "", -, recursiveHash ? false + recursiveHash ? false, -, # Shell code to build a netrc file for BASIC auth - netrcPhase ? null + # Shell code to build a netrc file for BASIC auth + netrcPhase ? null, -, # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) + # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) # needed for netrcPhase - netrcImpureEnvVars ? [] + netrcImpureEnvVars ? [ ], -, # Shell code executed after the file has been fetched + # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. - postFetch ? "" + postFetch ? "", -, # Whether to download to a temporary path rather than $out. Useful + # Whether to download to a temporary path rather than $out. Useful # in conjunction with postFetch. The location of the temporary file # is communicated to postFetch via $downloadedFile. - downloadToTemp ? false + downloadToTemp ? false, -, # If true, set executable bit on downloaded file - executable ? false + # If true, set executable bit on downloaded file + executable ? false, -, # If set, don't download the file, but write a list of all possible + # If set, don't download the file, but write a list of all possible # URLs (resulting from resolving mirror:// URLs) to $out. - showURLs ? false + showURLs ? false, -, # Meta information, if any. - meta ? {} + # Meta information, if any. + meta ? { }, # Passthru information, if any. -, passthru ? {} + passthru ? { }, # Doing the download on a remote machine just duplicates network # traffic, so don't do that by default -, preferLocalBuild ? true + preferLocalBuild ? true, # Additional packages needed as part of a fetch -, nativeBuildInputs ? [ ] + nativeBuildInputs ? [ ], }: let urls_ = - if urls != [] && url == "" then - (if lib.isList urls then urls - else throw "`urls` is not a list") - else if urls == [] && url != "" then - (if lib.isString url then [url] - else throw "`url` is not a string") - else throw "fetchurl requires either `url` or `urls` to be set"; + if urls != [ ] && url == "" then + (if lib.isList urls then urls else throw "`urls` is not a list") + else if urls == [ ] && url != "" then + (if lib.isString url then [ url ] else throw "`url` is not a string") + else + throw "fetchurl requires either `url` or `urls` to be set"; hash_ = - if with lib.lists; length (filter (s: s != "") [ hash outputHash sha1 sha256 sha512 ]) > 1 - then throw "multiple hashes passed to fetchurl" else + if + with lib.lists; + length ( + filter (s: s != "") [ + hash + outputHash + sha1 + sha256 + sha512 + ] + ) > 1 + then + throw "multiple hashes passed to fetchurl" + else - if hash != "" then { outputHashAlgo = null; outputHash = hash; } + if hash != "" then + { + outputHashAlgo = null; + outputHash = hash; + } else if outputHash != "" then - if outputHashAlgo != "" then { inherit outputHashAlgo outputHash; } - else throw "fetchurl was passed outputHash without outputHashAlgo" - else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; } - else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } - else if sha1 != "" then { outputHashAlgo = "sha1"; outputHash = sha1; } - else if cacert != null then { outputHashAlgo = "sha256"; outputHash = ""; } - else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; + if outputHashAlgo != "" then + { inherit outputHashAlgo outputHash; } + else + throw "fetchurl was passed outputHash without outputHashAlgo" + else if sha512 != "" then + { + outputHashAlgo = "sha512"; + outputHash = sha512; + } + else if sha256 != "" then + { + outputHashAlgo = "sha256"; + outputHash = sha256; + } + else if sha1 != "" then + { + outputHashAlgo = "sha1"; + outputHash = sha1; + } + else if cacert != null then + { + outputHashAlgo = "sha256"; + outputHash = ""; + } + else + throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; in -assert (lib.isList curlOpts) -> lib.warn '' - fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${lib.generators.toPretty { multiline = false; } curlOpts}), which is not supported anymore. +assert + (lib.isList curlOpts) + -> lib.warn '' + fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${ + lib.generators.toPretty { multiline = false; } curlOpts + }), which is not supported anymore. - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead: curlOpts = ${lib.strings.escapeNixString (toString curlOpts)}; - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead: curlOptsList = [ ${lib.concatMapStringsSep " " lib.strings.escapeNixString curlOpts} ];'' true; -stdenvNoCC.mkDerivation (( - if (pname != "" && version != "") then - { inherit pname version; } - else - { name = - if showURLs then "urls" - else if name != "" then name - else baseNameOf (toString (builtins.head urls_)); - } -) // { - builder = ./builder.sh; +stdenvNoCC.mkDerivation ( + ( + if (pname != "" && version != "") then + { inherit pname version; } + else + { + name = + if showURLs then + "urls" + else if name != "" then + name + else + baseNameOf (toString (builtins.head urls_)); + } + ) + // { + builder = ./builder.sh; - nativeBuildInputs = [ curl ] ++ nativeBuildInputs; + nativeBuildInputs = [ curl ] ++ nativeBuildInputs; - urls = urls_; + urls = urls_; - # If set, prefer the content-addressable mirrors - # (http://tarballs.nixos.org) over the original URLs. - preferHashedMirrors = true; + # If set, prefer the content-addressable mirrors + # (http://tarballs.nixos.org) over the original URLs. + preferHashedMirrors = true; - # New-style output content requirements. - inherit (hash_) outputHashAlgo outputHash; + # New-style output content requirements. + inherit (hash_) outputHashAlgo outputHash; - SSL_CERT_FILE = if (hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash) - then "${cacert}/etc/ssl/certs/ca-bundle.crt" - else "/no-cert-file.crt"; + # Disable TLS verification only when we know the hash and no credentials are + # needed to access the resource + SSL_CERT_FILE = + if + ( + hash_.outputHash == "" + || hash_.outputHash == lib.fakeSha256 + || hash_.outputHash == lib.fakeSha512 + || hash_.outputHash == lib.fakeHash + || netrcPhase != null + ) + then + "${cacert}/etc/ssl/certs/ca-bundle.crt" + else + "/no-cert-file.crt"; - outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; + outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; - inherit curlOpts; - curlOptsList = lib.escapeShellArgs curlOptsList; - inherit showURLs mirrorsFile postFetch downloadToTemp executable; + inherit curlOpts; + curlOptsList = lib.escapeShellArgs curlOptsList; + inherit + showURLs + mirrorsFile + postFetch + downloadToTemp + executable + ; - impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; + impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; - nixpkgsVersion = lib.trivial.release; + nixpkgsVersion = lib.trivial.release; - inherit preferLocalBuild; + inherit preferLocalBuild; - postHook = if netrcPhase == null then null else '' - ${netrcPhase} - curlOpts="$curlOpts --netrc-file $PWD/netrc" - ''; + postHook = + if netrcPhase == null then + null + else + '' + ${netrcPhase} + curlOpts="$curlOpts --netrc-file $PWD/netrc" + ''; - inherit meta; - passthru = { inherit url; } // passthru; -}) + inherit meta; + passthru = { + inherit url; + } // passthru; + } +) diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix index e192c650a4..abc4813da1 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix @@ -309,7 +309,7 @@ "https://cpan.metacpan.org/" "https://cpan.perl.org/" "https://mirrors.kernel.org/CPAN/" - "https://backpan.perl.org/" # for old releases + "https://backpan.perl.org/" # for old releases ]; # D DUB diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/tests.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/tests.nix index e348d77db0..8d9064141f 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/tests.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/tests.nix @@ -1,11 +1,23 @@ -{ testers, fetchurl, jq, moreutils, ... }: { +{ + testers, + fetchurl, + jq, + moreutils, + ... +}: +{ # Tests that we can send custom headers with spaces in them header = - let headerValue = "Test '\" <- These are some quotes"; - in testers.invalidateFetcherByDrvHash fetchurl { + let + headerValue = "Test '\" <- These are some quotes"; + in + testers.invalidateFetcherByDrvHash fetchurl { url = "https://httpbin.org/headers"; sha256 = builtins.hashString "sha256" (headerValue + "\n"); - curlOptsList = [ "-H" "Hello: ${headerValue}" ]; + curlOptsList = [ + "-H" + "Hello: ${headerValue}" + ]; postFetch = '' ${jq}/bin/jq -r '.headers.Hello' $out | ${moreutils}/bin/sponge $out ''; diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix index 9998241673..1b8ebcaeac 100644 --- a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix @@ -32,7 +32,7 @@ else stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ${if stdenv.isDarwin && stdenv.isAarch64 then '' + ${if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then '' # We need the unwrapped binutils and clang: # We also want to build a fat library with x86_64, arm64, arm64e in there. # Because we use the unwrapped tools, we need to provide -isystem for headers @@ -47,7 +47,7 @@ else stdenv.mkDerivation rec { -Wl,-install_name,$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ -shared -o "$libName" - '' else if stdenv.isDarwin then '' + '' else if stdenv.hostPlatform.isDarwin then '' $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ -Wl,-install_name,$out/lib/$libName \ -shared -o "$libName" @@ -58,7 +58,7 @@ else stdenv.mkDerivation rec { if [ -n "$doInstallCheck" ]; then $CC -Wall -std=c99 \ - ${lib.optionalString (!stdenv.isDarwin) "-D_GNU_SOURCE"} \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "-D_GNU_SOURCE"} \ -O3 test.c -o test fi @@ -75,7 +75,7 @@ else stdenv.mkDerivation rec { install -vD "$libName" "$out/lib/$libName" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # dylib will be rejected unless dylib rpath gets explictly set install_name_tool \ -change $libName $out/lib/$libName \ @@ -84,7 +84,7 @@ else stdenv.mkDerivation rec { # Provide a setup hook that injects our library into every process. mkdir -p "$hook/nix-support" cat < "$hook/nix-support/setup-hook" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' export DYLD_INSERT_LIBRARIES="$out/lib/$libName" '' else '' export LD_PRELOAD="$out/lib/$libName" diff --git a/third_party/nixpkgs/pkgs/build-support/mitm-cache/default.nix b/third_party/nixpkgs/pkgs/build-support/mitm-cache/default.nix index dd44a7ddca..e3bce225b4 100644 --- a/third_party/nixpkgs/pkgs/build-support/mitm-cache/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/mitm-cache/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-l9dnyA4Zo4jlbiCMRzUqW3NkiploVpmvxz9i896JkXU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix index 4bcbf3f14f..52b4f5a30e 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (args // { (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook) nodejs.python ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = buildInputs ++ [ nodejs ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix index e293605cb3..fbf732958a 100644 --- a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix +++ b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix @@ -4,14 +4,15 @@ let Dune = let dune-version = args.duneVersion or "3"; in - { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}" -; in + { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}"; + stdenv' = args.stdenv or stdenv; +in if args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation ({ +stdenv'.mkDerivation ({ inherit enableParallelBuilding; dontAddStaticConfigureFlags = true; diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix index 698391ad16..912fe7d72f 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix @@ -94,12 +94,6 @@ let or (if finalAttrs.composerRepository.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-repository.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-repository.nix index 037d8bdeb3..c16056ce8f 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-repository.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -102,13 +102,6 @@ let runHook postInstallCheck ''; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; - }; - outputHashMode = "recursive"; outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix index 060b51241e..e199000f4f 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix @@ -149,12 +149,6 @@ let or (if finalAttrs.vendor.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or composer.meta; }; in diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh index 44e87d06d3..d69050ecc6 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh @@ -24,7 +24,7 @@ composerInstallConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ --no-install \ @@ -79,7 +79,7 @@ composerInstallConfigureHook() { composerInstallBuildHook() { echo "Executing composerInstallBuildHook" - setComposeRootVersion + setComposerRootVersion # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. @@ -99,7 +99,8 @@ composerInstallCheckHook() { composerInstallInstallHook() { echo "Executing composerInstallInstallHook" - setComposeRootVersion + setComposerRootVersion + setComposerEnvVariables # Finally, run `composer install` to install the dependencies and generate # the autoloader. diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh index ec9777541f..9d7b048870 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh @@ -20,7 +20,7 @@ composerRepositoryConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ --no-install \ @@ -58,7 +58,7 @@ composerRepositoryBuildHook() { mkdir -p repository - setComposeRootVersion + setComposerRootVersion # Build the local composer repository # The command 'build-local-repo' is provided by the Composer plugin diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh index 0d88d14094..186b72111c 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh @@ -28,7 +28,7 @@ composerWithPluginConfigureHook() { cp -ar $src $out/src if [[ ! -f "$out/composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ global \ diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash index 65c0a3b410..d1b8a25c94 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash @@ -2,7 +2,7 @@ declare version declare composerStrictValidation declare composerGlobal -setComposeRootVersion() { +setComposerRootVersion() { set +e # Disable exit on error if [[ -v version ]]; then @@ -13,8 +13,15 @@ setComposeRootVersion() { set -e } +setComposerEnvVariables() { + echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" + export COMPOSER_MIRROR_PATH_REPOS=1 + export COMPOSER_CACHE_DIR=/dev/null + export COMPOSER_HTACCESS_PROTECT=0 +} + checkComposerValidate() { - setComposeRootVersion + setComposerRootVersion if [ "1" == "${composerGlobal-}" ]; then global="global"; diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-project.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-project.nix index 6013225e7c..bfbd232781 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-project.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-project.nix @@ -94,12 +94,6 @@ let or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-vendor.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-vendor.nix index b68e16e6cc..cbbe643d20 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-vendor.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/build-composer-vendor.nix @@ -87,13 +87,6 @@ let runHook postInstallCheck ''; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; - }; - outputHashMode = "recursive"; outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh index 7cc176058b..0b04af6222 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh @@ -14,7 +14,7 @@ source @phpScriptUtils@ composerInstallConfigureHook() { echo "Executing composerInstallConfigureHook" - setComposeRootVersion + setComposerRootVersion if [[ ! -e "${composerVendor}" ]]; then echo "No local composer vendor found." diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 7a14e544ae..24f3eaa274 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -15,7 +15,7 @@ source @phpScriptUtils@ composerVendorConfigureHook() { echo "Executing composerVendorConfigureHook" - setComposeRootVersion + setComposerRootVersion if [[ -e "$composerLock" ]]; then echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m" @@ -59,9 +59,13 @@ composerVendorConfigureHook() { composerVendorBuildHook() { echo "Executing composerVendorBuildHook" + setComposerEnvVariables + composer \ - --apcu-autoloader \ - --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)" \ + `# The acpu-autoloader is not reproducible and has to be disabled.` \ + `# Upstream PR: https://github.com/composer/composer/pull/12090` \ + `# --apcu-autoloader` \ + `# --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)"` \ --no-interaction \ --no-progress \ --optimize-autoloader \ diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash index 3e8299bf15..573b82c2ba 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash @@ -2,7 +2,7 @@ declare version declare composerStrictValidation declare composerGlobal -setComposeRootVersion() { +setComposerRootVersion() { set +e # Disable exit on error if [[ -v version ]]; then @@ -13,6 +13,13 @@ setComposeRootVersion() { set -e } +setComposerEnvVariables() { + echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" + export COMPOSER_MIRROR_PATH_REPOS=1 + export COMPOSER_CACHE_DIR=/dev/null + export COMPOSER_HTACCESS_PROTECT=0 +} + checkComposerValidate() { if [ "1" == "${composerGlobal-}" ]; then global="global"; diff --git a/third_party/nixpkgs/pkgs/build-support/replace-dependencies.nix b/third_party/nixpkgs/pkgs/build-support/replace-dependencies.nix new file mode 100644 index 0000000000..fe325b175f --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-dependencies.nix @@ -0,0 +1,193 @@ +{ + lib, + runCommandLocal, + replaceDirectDependencies, +}: + +# Replace some dependencies in the requisites tree of drv, propagating the change all the way up the tree, even within other replacements, without a full rebuild. +# This can be useful, for example, to patch a security hole in libc and still use your system safely without rebuilding the world. +# This should be a short term solution, as soon as a rebuild can be done the properly rebuilt derivation should be used. +# Each old dependency and the corresponding new dependency MUST have the same-length name, and ideally should have close-to-identical directory layout. +# +# Example: safeFirefox = replaceDependencies { +# drv = firefox; +# replacements = [ +# { +# oldDependency = glibc; +# newDependency = glibc.overrideAttrs (oldAttrs: { +# patches = oldAttrs.patches ++ [ ./fix-glibc-hole.patch ]; +# }); +# } +# { +# oldDependency = libwebp; +# newDependency = libwebp.overrideAttrs (oldAttrs: { +# patches = oldAttrs.patches ++ [ ./fix-libwebp-hole.patch ]; +# }); +# } +# ]; +# }; +# This will first rebuild glibc and libwebp with your security patches. +# Then it copies over firefox (and all of its dependencies) without rebuilding further. +# In particular, the glibc dependency of libwebp will be replaced by the patched version as well. +# +# In rare cases, it is possible for the replacement process to cause breakage (for example due to checksum mismatch). +# The cutoffPackages argument can be used to exempt the problematic packages from the replacement process. +{ + drv, + replacements, + cutoffPackages ? [ ], + verbose ? true, +}: + +let + inherit (builtins) unsafeDiscardStringContext appendContext; + inherit (lib) + listToAttrs + isStorePath + readFile + attrValues + mapAttrs + filter + hasAttr + mapAttrsToList + ; + inherit (lib.attrsets) mergeAttrsList; + + toContextlessString = x: unsafeDiscardStringContext (toString x); + warn = if verbose then lib.warn else (x: y: y); + + referencesOf = + drv: + import + (runCommandLocal "references.nix" + { + exportReferencesGraph = [ + "graph" + drv + ]; + } + '' + (echo { + while read path + do + echo " \"$path\" = [" + read count + read count + while [ "0" != "$count" ] + do + read ref_path + if [ "$ref_path" != "$path" ] + then + echo " \"$ref_path\"" + fi + count=$(($count - 1)) + done + echo " ];" + done < graph + echo }) > $out + '' + ).outPath; + + realisation = + drv: + if isStorePath drv then + # Input-addressed and fixed-output derivations have their realisation as outPath. + toContextlessString drv + else + # Floating and deferred derivations have a placeholder outPath. + # The realisation can only be obtained by performing an actual build. + unsafeDiscardStringContext ( + readFile ( + runCommandLocal "realisation" + { + env = { + inherit drv; + }; + } + '' + echo -n "$drv" > $out + '' + ) + ); + rootReferences = referencesOf drv; + relevantReplacements = filter ( + { oldDependency, newDependency }: + if toString oldDependency == toString newDependency then + warn "replaceDependencies: attempting to replace dependency ${oldDependency} of ${drv} with itself" + # Attempting to replace a dependency by itself is completely useless, and would only lead to infinite recursion. + # Hence it must not be attempted to apply this replacement in any case. + false + else if !hasAttr (realisation oldDependency) rootReferences then + warn "replaceDependencies: ${drv} does not depend on ${oldDependency}, so it will not be replaced" + # Strictly speaking, another replacement could introduce the dependency. + # However, handling this corner case would add significant complexity. + # So we just leave it to the user to apply the replacement at the correct place, but show a warning to let them know. + false + else + true + ) replacements; + targetDerivations = [ drv ] ++ map ({ newDependency, ... }: newDependency) relevantReplacements; + referencesMemo = listToAttrs ( + map (drv: { + name = realisation drv; + value = referencesOf drv; + }) targetDerivations + ); + relevantReferences = mergeAttrsList (attrValues referencesMemo); + # Make sure a derivation is returned even when no replacements are actually applied. + # Yes, even in the stupid edge case where the root derivation itself is replaced. + storePathOrKnownTargetDerivationMemo = + mapAttrs ( + drv: _references: + # builtins.storePath does not work in pure evaluation mode, even though it is not impure. + # This reimplementation in Nix works as long as the path is already allowed in the evaluation state. + # This is always the case here, because all paths come from the closure of the original derivation. + appendContext drv { ${drv}.path = true; } + ) relevantReferences + // listToAttrs ( + map (drv: { + name = realisation drv; + value = drv; + }) targetDerivations + ); + + rewriteMemo = + # Mind the order of how the three attrsets are merged here. + # The order of precedence needs to be "explicitly specified replacements" > "rewrite exclusion (cutoffPackages)" > "rewrite". + # So the attrset merge order is the opposite. + mapAttrs ( + drv: references: + let + rewrittenReferences = filter (dep: dep != drv && toString rewriteMemo.${dep} != dep) references; + rewrites = listToAttrs ( + map (reference: { + name = reference; + value = rewriteMemo.${reference}; + }) rewrittenReferences + ); + in + replaceDirectDependencies { + drv = storePathOrKnownTargetDerivationMemo.${drv}; + replacements = mapAttrsToList (name: value: { + oldDependency = name; + newDependency = value; + }) rewrites; + } + ) relevantReferences + // listToAttrs ( + map (drv: { + name = realisation drv; + value = storePathOrKnownTargetDerivationMemo.${realisation drv}; + }) cutoffPackages + ) + // listToAttrs ( + map ( + { oldDependency, newDependency }: + { + name = realisation oldDependency; + value = rewriteMemo.${realisation newDependency}; + } + ) relevantReplacements + ); +in +rewriteMemo.${realisation drv} diff --git a/third_party/nixpkgs/pkgs/build-support/replace-dependency.nix b/third_party/nixpkgs/pkgs/build-support/replace-dependency.nix deleted file mode 100644 index 7912d21bfd..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/replace-dependency.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ runCommandLocal, nix, lib }: - -# Replace a single dependency in the requisites tree of drv, propagating -# the change all the way up the tree, without a full rebuild. This can be -# useful, for example, to patch a security hole in libc and still use your -# system safely without rebuilding the world. This should be a short term -# solution, as soon as a rebuild can be done the properly rebuild derivation -# should be used. The old dependency and new dependency MUST have the same-length -# name, and ideally should have close-to-identical directory layout. -# -# Example: safeFirefox = replaceDependency { -# drv = firefox; -# oldDependency = glibc; -# newDependency = overrideDerivation glibc (attrs: { -# patches = attrs.patches ++ [ ./fix-glibc-hole.patch ]; -# }); -# }; -# This will rebuild glibc with your security patch, then copy over firefox -# (and all of its dependencies) without rebuilding further. -{ drv, oldDependency, newDependency, verbose ? true }: - -let - inherit (lib) - any - attrNames - concatStringsSep - elem - filter - filterAttrs - listToAttrs - mapAttrsToList - stringLength - substring - ; - - warn = if verbose then builtins.trace else (x: y: y); - references = import (runCommandLocal "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' - (echo { - while read path - do - echo " \"$path\" = [" - read count - read count - while [ "0" != "$count" ] - do - read ref_path - if [ "$ref_path" != "$path" ] - then - echo " (builtins.storePath (/. + \"$ref_path\"))" - fi - count=$(($count - 1)) - done - echo " ];" - done < graph - echo }) > $out - '').outPath; - - discard = builtins.unsafeDiscardStringContext; - - oldStorepath = builtins.storePath (discard (toString oldDependency)); - - referencesOf = drv: references.${discard (toString drv)}; - - dependsOnOldMemo = listToAttrs (map - (drv: { name = discard (toString drv); - value = elem oldStorepath (referencesOf drv) || - any dependsOnOld (referencesOf drv); - }) (attrNames references)); - - dependsOnOld = drv: dependsOnOldMemo.${discard (toString drv)}; - - drvName = drv: - discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); - - rewriteHashes = drv: hashes: runCommandLocal (drvName drv) { nixStore = "${nix.out}/bin/nix-store"; } '' - $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ - concatStringsSep " -e " (mapAttrsToList (name: value: - "'s|${baseNameOf name}|${baseNameOf value}|g'" - ) hashes) - } | $nixStore --restore $out - ''; - - rewrittenDeps = listToAttrs [ {name = discard (toString oldDependency); value = newDependency;} ]; - - rewriteMemo = listToAttrs (map - (drv: { name = discard (toString drv); - value = rewriteHashes (builtins.storePath drv) - (filterAttrs (n: v: elem (builtins.storePath (discard (toString n))) (referencesOf drv)) rewriteMemo); - }) - (filter dependsOnOld (attrNames references))) // rewrittenDeps; - - drvHash = discard (toString drv); -in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); -rewriteMemo.${drvHash} or (warn "replace-dependency.nix: Derivation ${drvHash} does not depend on ${discard (toString oldDependency)}" drv) diff --git a/third_party/nixpkgs/pkgs/build-support/replace-direct-dependencies.nix b/third_party/nixpkgs/pkgs/build-support/replace-direct-dependencies.nix new file mode 100644 index 0000000000..57036ebd74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-direct-dependencies.nix @@ -0,0 +1,72 @@ +{ + lib, + runCommandLocal, + nix, +}: + +# Replace some direct dependencies of drv, not recursing into the dependency tree. +# You likely want to use replaceDependencies instead, unless you plan to implement your own recursion mechanism. +{ + drv, + replacements ? [ ], +}: +let + inherit (lib) + isStorePath + substring + stringLength + optionalString + escapeShellArgs + concatMap + ; +in +if replacements == [ ] then + drv +else + let + drvName = + if isStorePath drv then + # Reconstruct the name from the actual store path if available. + substring 33 (stringLength (baseNameOf drv)) (baseNameOf drv) + else if drv ? drvAttrs.name then + # Try to get the name from the derivation arguments otherwise (for floating or deferred derivations). + drv.drvAttrs.name + + ( + let + outputName = drv.outputName or "out"; + in + optionalString (outputName != "out") "-${outputName}" + ) + else + throw "cannot reconstruct the derivation name from ${drv}"; + in + runCommandLocal drvName { nativeBuildInputs = [ nix.out ]; } '' + createRewriteScript() { + while [ $# -ne 0 ]; do + oldBasename="$(basename "$1")" + newBasename="$(basename "$2")" + shift 2 + if [ ''${#oldBasename} -ne ''${#newBasename} ]; then + echo "cannot rewrite $oldBasename to $newBasename: length does not match" >&2 + exit 1 + fi + echo "s|$oldBasename|$newBasename|g" >> rewrite.sed + done + } + createRewriteScript ${ + escapeShellArgs ( + [ + drv + (placeholder "out") + ] + ++ concatMap ( + { oldDependency, newDependency }: + [ + oldDependency + newDependency + ] + ) replacements + ) + } + nix-store --dump ${drv} | sed -f rewrite.sed | nix-store --restore $out + '' diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index 313e7601f6..db9c2d784f 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -283,7 +283,7 @@ crate_: lib.makeOverridable ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix index dd135af919..6069ef802d 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -529,7 +529,7 @@ let # Note: On darwin (which defaults to clang) we have to add # `-undefined dynamic_lookup` as otherwise the compilation fails. $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-undefined dynamic_lookup"} \ -o $out/lib/${name}${stdenv.hostPlatform.extensions.library} ${src} ''; b = compile "libb" '' @@ -626,7 +626,7 @@ let }; expectedFiles = [ "./bin/test_binary1" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # On Darwin, the debug symbols are in a separate directory. "./bin/test_binary1.dSYM/Contents/Info.plist" "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1" diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix b/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix index 126be2ad99..21ca75357f 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix @@ -72,7 +72,7 @@ in cargo = attrs: { buildInputs = [ openssl zlib curl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; }; libz-sys = attrs: { @@ -281,7 +281,7 @@ in }; security-framework-sys = attr: { - propagatedBuildInputs = lib.optional stdenv.isDarwin Security; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; }; sequoia-openpgp = attrs: { @@ -320,7 +320,7 @@ in }; serde_derive = attrs: { - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; }; servo-fontconfig-sys = attrs: { diff --git a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix index 4467608407..3229748548 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix @@ -15,7 +15,7 @@ rec { envVars = let # As a workaround for https://github.com/rust-lang/rust/issues/89626 use lld on pkgsStatic aarch64 - shouldUseLLD = platform: platform.isAarch64 && platform.isStatic && !stdenv.isDarwin; + shouldUseLLD = platform: platform.isAarch64 && platform.isStatic && !stdenv.hostPlatform.isDarwin; ccForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}cc"; cxxForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}c++"; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix index 63e3bea3ca..b616b293fa 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index 69f9f3b145..b2ce7b4b26 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -35,7 +35,7 @@ makeSetupHook { # TODO: remove this, packages should depend on GTK explicitly. gtk3 - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # It is highly probable that a program will use GSettings, # at minimum through GTK file chooser dialogue. # Let’s add a GIO module for “dconf” GSettings backend @@ -68,7 +68,7 @@ makeSetupHook { basic-contains-dconf = let tested = basic; in testLib.runTest "basic-contains-dconf" ( - testLib.skip stdenv.isDarwin '' + testLib.skip stdenv.hostPlatform.isDarwin '' ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GIO_EXTRA_MODULES" "${dconf.lib}/lib/gio/modules"} ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GIO_EXTRA_MODULES" "${dconf.lib}/lib/gio/modules"} '' @@ -77,7 +77,7 @@ makeSetupHook { basic-contains-gdk-pixbuf = let tested = basic; in testLib.runTest "basic-contains-gdk-pixbuf" ( - testLib.skip stdenv.isDarwin '' + testLib.skip stdenv.hostPlatform.isDarwin '' ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GDK_PIXBUF_MODULE_FILE" "${lib.getLib librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"} ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GDK_PIXBUF_MODULE_FILE" "${lib.getLib librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"} '' diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix index 3bccc871a7..a02fe1fd6d 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix @@ -86,6 +86,13 @@ rec { , preferLocalBuild ? true , derivationArgs ? { } }: + assert lib.assertMsg (destination != "" -> (lib.hasPrefix "/" destination && destination != "/")) '' + destination must be an absolute path, relative to the derivation's out path, + got '${destination}' instead. + + Ensure that the path starts with a / and specifies at least the filename. + ''; + let matches = builtins.match "/bin/([^/]+)" destination; in diff --git a/third_party/nixpkgs/pkgs/build-support/writers/scripts.nix b/third_party/nixpkgs/pkgs/build-support/writers/scripts.nix index 81a88391f3..999c8b4f2a 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/scripts.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/scripts.nix @@ -131,7 +131,7 @@ rec { # On darwin a script cannot be used as an interpreter in a shebang but # there doesn't seem to be a limit to the size of shebang and multiple # arguments to the interpreter are allowed. - if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter + if [[ -n "${toString pkgs.stdenvNoCC.hostPlatform.isDarwin}" ]] && isScript $interpreter then wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) # Get first word from the line (note: xargs echo remove leading spaces) @@ -753,7 +753,7 @@ rec { strip ? true, }: let - darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; + darwinArgs = lib.optionals stdenv.hostPlatform.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; in makeBinWriter { compileScript = '' diff --git a/third_party/nixpkgs/pkgs/by-name/_2/_2ship2harkinian/package.nix b/third_party/nixpkgs/pkgs/by-name/_2/_2ship2harkinian/package.nix index 2af660495c..90899330ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -138,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "NON_PORTABLE" true) - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/2s2h") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'.src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") diff --git a/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix b/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix index 61b0536ce7..65ba3347eb 100644 --- a/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix @@ -41,6 +41,6 @@ telegram-desktop.overrideAttrs (old: rec { changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ clot27 ]; mainProgram = "telegram-desktop"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/_9/_9base/package.nix b/third_party/nixpkgs/pkgs/by-name/_9/_9base/package.nix index 580c0ad698..3d523c513e 100644 --- a/third_party/nixpkgs/pkgs/by-name/_9/_9base/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/_9/_9base/package.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation { platforms = platforms.unix; # needs additional work to support aarch64-darwin # due to usage of _DARWIN_NO_64_BIT_INODE - broken = stdenv.isAarch64 && stdenv.isDarwin; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/a5/a52dec/package.nix b/third_party/nixpkgs/pkgs/by-name/a5/a52dec/package.nix index 048b96787a..53cecb99ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/a5/a52dec/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/a5/a52dec/package.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with - # hardeningDisable = lib.optional stdenv.isi686 "pic"; + # hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "pic"; # but it's better to disable tests than loose ASLR on i686 - doCheck = !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isi686; meta = with lib; { description = "ATSC A/52 stream decoder"; diff --git a/third_party/nixpkgs/pkgs/by-name/ab/abctl/package.nix b/third_party/nixpkgs/pkgs/by-name/ab/abctl/package.nix index 226587b0b0..bd1464c550 100644 --- a/third_party/nixpkgs/pkgs/by-name/ab/abctl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ab/abctl/package.nix @@ -27,6 +27,6 @@ buildGoModule { license = lib.licenses.mit; maintainers = with lib.maintainers; [ xelden ]; mainProgram = "abctl"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ab/abpoa/package.nix b/third_party/nixpkgs/pkgs/by-name/ab/abpoa/package.nix index 1bb9d51ab2..cecdcbc923 100644 --- a/third_party/nixpkgs/pkgs/by-name/ab/abpoa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ab/abpoa/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "${lib.optionalString enablePython "py"}abpoa"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "yangao07"; repo = "abPOA"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-gS0PO7K4hN+3k2NF8enri1FzM80H2I+a3MNaKsm74xM="; + hash = "sha256-90mkXp4cC0Omnx0C7ab7NNs/M2oedIcICTUJl3qhcyo="; }; patches = [ ./simd-arch.patch ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ac/acpica-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/ac/acpica-tools/package.nix index b11e95be6e..11e6f1f454 100644 --- a/third_party/nixpkgs/pkgs/by-name/ac/acpica-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ac/acpica-tools/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # We can handle stripping ourselves. # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. - INSTALLFLAGS = lib.optionals (!stdenv.isDarwin) "-m 555"; + INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555"; installFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ac/actionlint/package.nix b/third_party/nixpkgs/pkgs/by-name/ac/actionlint/package.nix new file mode 100644 index 0000000000..0d45166ffd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ac/actionlint/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + makeWrapper, + python3Packages, + ronn, + shellcheck, +}: + +let + version = "1.7.2"; +in +buildGoModule { + pname = "actionlint"; + inherit version; + + subPackages = [ "cmd/actionlint" ]; + + src = fetchFromGitHub { + owner = "rhysd"; + repo = "actionlint"; + rev = "v${version}"; + hash = "sha256-/VhSmNwAhgAM/506MjI07KBFbkBTLpQfod49ysju+uU="; + }; + + vendorHash = "sha256-SIY79SjYYXW2slUQr2Bm9dLH8K2wE3l/TL3QP0m8GLs="; + + nativeBuildInputs = [ + makeWrapper + ronn + installShellFiles + ]; + + postInstall = '' + ronn --roff man/actionlint.1.ronn + installManPage man/actionlint.1 + wrapProgram "$out/bin/actionlint" \ + --prefix PATH : ${ + lib.makeBinPath [ + python3Packages.pyflakes + shellcheck + ] + } + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/rhysd/actionlint.version=${version}" + ]; + + meta = { + homepage = "https://rhysd.github.io/actionlint/"; + description = "Static checker for GitHub Actions workflow files"; + changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "actionlint"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix b/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix index 7107d54841..da6bd31073 100644 --- a/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix @@ -38,10 +38,10 @@ wxGTK, zlib, # Boolean guard flags - alsaSupport ? stdenv.isLinux, + alsaSupport ? stdenv.hostPlatform.isLinux, openalSupport ? true, portaudioSupport ? true, - pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, + pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, spellcheckSupport ? true, useBundledLuaJIT ? false, }: @@ -102,12 +102,12 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals openalSupport [ - (if stdenv.isDarwin then OpenAL else openal) + (if stdenv.hostPlatform.isDarwin then OpenAL else openal) ] ++ lib.optionals portaudioSupport [ portaudio ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals spellcheckSupport [ hunspell ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa diff --git a/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/0001-update-time-rs.patch b/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/0001-update-time-rs.patch new file mode 100644 index 0000000000..cbfffbe090 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/0001-update-time-rs.patch @@ -0,0 +1,59 @@ +From ad754664a05808bdbb976906a86ad0b08f16eb32 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 24 Sep 2024 20:38:19 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 0a159ae..cf6b1c4 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2468,6 +2468,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -3579,12 +3585,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -3599,10 +3606,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/Cargo.lock index 0a159ae348..cf6b1c43b0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/Cargo.lock @@ -2468,6 +2468,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -3579,12 +3585,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -3599,10 +3606,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/package.nix b/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/package.nix index 86e3ef5b7d..49379db4a2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ae/aerogramme/package.nix @@ -6,17 +6,20 @@ openssl, }: -rustPlatform.buildRustPackage { - RUSTC_BOOTSTRAP = true; - +rustPlatform.buildRustPackage rec { pname = "aerogramme"; version = "0.3.0"; src = fetchgit { url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/"; + rev = "refs/tags/${version}"; hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y="; }; + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + # must use our own Cargo.lock due to git dependencies cargoLock = { lockFile = ./Cargo.lock; @@ -31,8 +34,11 @@ rustPlatform.buildRustPackage { # disable network tests as Nix sandbox breaks them doCheck = false; - # get openssl-sys to use pkg-config - OPENSSL_NO_VENDOR = 1; + env = { + # get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = true; + RUSTC_BOOTSTRAP = true; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix b/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix index 413c622f55..9573e53f3e 100644 --- a/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix @@ -16,10 +16,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-6F6BzEnseqdzkEUVgUa9eu7MkyNsvucK9lGL+dsKhwc="; + hash = "sha256-7Gaiv3XBxpHcI4curNlkN8kXcJZrD4WQS8ciqcabRMs="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/by-name/ag/agate/package.nix b/third_party/nixpkgs/pkgs/by-name/ag/agate/package.nix index 8d83b45bec..1d2763dd32 100644 --- a/third_party/nixpkgs/pkgs/by-name/ag/agate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ag/agate/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/third_party/nixpkgs/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix index eec840ef21..6c9571a64d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix @@ -39,7 +39,7 @@ buildGoModule rec { buildInputs = [ libfido2 ]; - postConfigure = lib.optional stdenv.isDarwin darwin_configure; + postConfigure = lib.optional stdenv.hostPlatform.isDarwin darwin_configure; meta = with lib; { description = "Age plugin to encrypt files with fido2 tokens using the hmac-secret extension and non-discoverable credentials"; diff --git a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix index dcbbf36e8c..d1ed4c6f93 100644 --- a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.56.0"; + version = "0.57.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication { owner = "paul-gauthier"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-e0Fqj67vYt41Zbr1FN2fuLp6cHRius8RtacBHLgB9dM="; + hash = "sha256-ErDepSju8B4GochHKxL03aUfOLAiNfTaXBAllAZ144M="; }; pythonRelaxDeps = true; @@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication { pypandoc pyperclip pyyaml + psutil rich scipy sounddevice diff --git a/third_party/nixpkgs/pkgs/by-name/ai/aiken/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/aiken/package.nix index 866a59c493..61c66fda31 100644 --- a/third_party/nixpkgs/pkgs/by-name/ai/aiken/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ai/aiken/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-os8OqLX6vxHQvrn+X8/BeYnfZJSKG7GDScz7ikJ4sl8="; + hash = "sha256-n373MgPjJzP+yRSQLA07RijFBjbRItK/nX8k7SJ6ITE="; }; - cargoHash = "sha256-7VoTL9W9KboBhhxB9nkzPag6IR/RsXZUDVXjdzOITVM="; + cargoHash = "sha256-gQ7DfYyVF6Gk8N+spBd97BWxTwydq+lDbnCsVPPzWLU="; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/third_party/nixpkgs/pkgs/by-name/ai/airgorah/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/airgorah/package.nix new file mode 100644 index 0000000000..f063495c72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ai/airgorah/package.nix @@ -0,0 +1,74 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + pkg-config, + glib, + pango, + gdk-pixbuf, + graphene, + gtk4, + copyDesktopItems, + makeDesktopItem, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "airgorah"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "martin-olivier"; + repo = "airgorah"; + rev = "refs/tags/v${version}"; + hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA="; + }; + + cargoHash = "sha256-sJFOpxBW6Z8ewfyhJuxZByJNgaEmezw15OQt9KjFaec="; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + pango + gdk-pixbuf + graphene + gtk4 + ]; + + postInstall = '' + install -Dm644 icons/app_icon.png $out/share/icons/hicolor/1024x1024/apps/airgorah.png + ''; + + dessktopItems = [ + (makeDesktopItem { + name = "airgorah"; + comment = "A WiFi auditing software that can perform deauth attacks and passwords cracking"; + desktopName = "airgorah"; + exec = "pkexec airgorah"; + icon = "airgorah"; + categories = [ + "Network" + "Monitor" + "Utility" + "GTK" + ]; + type = "Application"; + terminal = false; + }) + ]; + + meta = { + description = "WiFi security auditing software mainly based on aircrack-ng tools suite"; + homepage = "https://github.com/martin-olivier/airgorah"; + changelog = "https://github.com/martin-olivier/airgorah/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "airgorah"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix b/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix index 73d4ae9614..4d79821f67 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.28.2"; + version = "1.28.4"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-CgBH5PRlq6USfdE8ubHKAYNq1YzUmfIN7wAS4HfJvZU="; + hash = "sha256-ihfTVVc6kM+rOyPG7k2rkLVmCsOlBA7Uik8KrWhrdp0="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix index 0ae580c75e..92cf6667f6 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix @@ -28,7 +28,6 @@ unzip, zlib, zziplib, - alephone, testers, }: @@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.version = # test that the version is correct - testers.testVersion { package = alephone; }; + testers.testVersion { package = finalAttrs.finalPackage; }; meta = { description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; @@ -112,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { version, zip, meta, - icon ? alephone.icons + "/alephone.png", + icon ? finalAttrs.finalPackage.icons + "/alephone.png", ... }@extraArgs: stdenv.mkDerivation ( @@ -142,14 +141,14 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin $out/data/$pname $out/share/applications cp -a * $out/data/$pname cp $desktopItem/share/applications/* $out/share/applications - makeWrapper ${alephone}/bin/alephone $out/bin/$pname \ + makeWrapper ${finalAttrs.finalPackage}/bin/alephone $out/bin/$pname \ --add-flags $out/data/$pname ''; } // extraArgs // { meta = - alephone.meta + finalAttrs.finalPackage.meta // { license = lib.licenses.free; mainProgram = pname; diff --git a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/al/algolia-cli/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/algolia-cli/package.nix index f8572eeb19..1f1debffbd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/algolia-cli/package.nix @@ -1,8 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "algolia-cli"; +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: +let version = "1.6.11"; +in +buildGoModule { + pname = "algolia-cli"; + inherit version; src = fetchFromGitHub { owner = "algolia"; @@ -17,7 +24,11 @@ buildGoModule rec { subPackages = [ "cmd/algolia" ]; - ldflags = [ "-s" "-w" "-X github.com/algolia/cli/pkg/version.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/algolia/cli/pkg/version.Version=${version}" + ]; postInstall = '' installShellCompletion --cmd algolia \ @@ -26,11 +37,11 @@ buildGoModule rec { --zsh <($out/bin/algolia completion zsh) ''; - meta = with lib; { + meta = { description = "Algolia’s official CLI devtool"; mainProgram = "algolia"; homepage = "https://algolia.com/doc/tools/cli/"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/al/aliae/package.nix b/third_party/nixpkgs/pkgs/by-name/al/aliae/package.nix new file mode 100644 index 0000000000..c3c9a6452d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/aliae/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule rec { + pname = "aliae"; + version = "0.22.2"; + + src = fetchFromGitHub { + owner = "jandedobbeleer"; + repo = "aliae"; + rev = "refs/tags/v${version}"; + hash = "sha256-IpOfTCMbnNUW8flyb7p98QEwveNb8wClyBuv7fAKm8Y="; + }; + + vendorHash = "sha256-aUKF/r0OFN0gZXCKHFYKyQa806NFP5lQAONFZlMP4vE="; + + sourceRoot = "${src.name}/src"; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + tags = [ + "netgo" + "osusergo" + ]; + + postInstall = + '' + mv $out/bin/{src,aliae} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd aliae \ + --bash <($out/bin/aliae completion bash) \ + --fish <($out/bin/aliae completion fish) \ + --zsh <($out/bin/aliae completion zsh) + ''; + + meta = { + description = "Cross shell and platform alias management"; + mainProgram = "aliae"; + homepage = "https://aliae.dev"; + changelog = "https://github.com/JanDeDobbeleer/aliae/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vedantmgoyal9 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/al/aligator/package.nix b/third_party/nixpkgs/pkgs/by-name/al/aligator/package.nix new file mode 100644 index 0000000000..e7cb03a877 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/aligator/package.nix @@ -0,0 +1,97 @@ +{ + cmake, + crocoddyl, + doxygen, + fetchFromGitHub, + fmt, + fontconfig, + gbenchmark, + graphviz, + lib, + llvmPackages, # llvm/Support/Host.h required by casadi 3.6.5 and not available in llvm 18 + pinocchio, + pkg-config, + proxsuite-nlp, + python3Packages, + pythonSupport ? false, + stdenv, + suitesparse, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aligator"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "Simple-Robotics"; + repo = "aligator"; + rev = "v${finalAttrs.version}"; + hash = "sha256-o4QjxTaZUa17hZsCv4hCI2cedaHoojBtLe8SVUkl0bo="; + }; + + outputs = [ + "doc" + "out" + ]; + + strictDeps = true; + + nativeBuildInputs = [ + doxygen + cmake + graphviz + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + buildInputs = [ fmt ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + propagatedBuildInputs = + [ suitesparse ] + ++ lib.optionals pythonSupport [ + python3Packages.crocoddyl + python3Packages.matplotlib + python3Packages.pinocchio + python3Packages.proxsuite-nlp + ] + ++ lib.optionals (!pythonSupport) [ + crocoddyl + pinocchio + proxsuite-nlp + ]; + checkInputs = + [ gbenchmark ] + ++ lib.optionals pythonSupport [ + python3Packages.matplotlib + python3Packages.pytest + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true) + (lib.cmakeBool "BUILD_CROCODDYL_COMPAT" true) + (lib.cmakeBool "BUILD_WITH_OPENMP_SUPPORT" true) + (lib.cmakeBool "BUILD_WITH_CHOLMOD_SUPPORT" true) + (lib.cmakeBool "GENERATE_PYTHON_STUBS" false) # this need git at configure time + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [ + # ignore one failing test for now + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-integrators") + ]; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + doCheck = true; + pythonImportsCheck = [ "aligator" ]; + + meta = { + description = "Versatile and efficient framework for constrained trajectory optimization"; + homepage = "https://github.com/Simple-Robotics/aligator"; + changelog = "https://github.com/Simple-Robotics/aligator/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/al/alive2/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alive2/package.nix new file mode 100644 index 0000000000..f627751189 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/alive2/package.nix @@ -0,0 +1,67 @@ +{ + lib, + clangStdenv, + fetchFromGitHub, + re2c, + z3, + hiredis, + llvm_18, + cmake, + ninja, +}: + +clangStdenv.mkDerivation (finalAttrs: { + pname = "alive2"; + version = "0-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "AliveToolkit"; + repo = "alive2"; + rev = "05a964284056b38a6dc1f807e7acad64a0308328"; + sha256 = "sha256-okKKUU7WLXLD9Hvsfoz+1HQWoyQ/bqRpBk5ogr7kSJA="; + }; + + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + re2c + z3 + hiredis + llvm_18 + ninja + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'find_package(Git REQUIRED)' "" + ''; + + env = { + ALIVE2_HOME = "$PWD"; + LLVM2_HOME = "${llvm_18}"; + LLVM2_BUILD = "$LLVM2_HOME/build"; + }; + + preBuild = '' + mkdir -p build + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp alive $out/bin/ + cp alive-jobserver $out/bin/ + rm -rf $out/bin/CMakeFiles $out/bin/*.o + runHook postInstall + ''; + + meta = { + description = "Automatic verification of LLVM optimizations"; + homepage = "https://github.com/AliveToolkit/alive2"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ shogo ]; + mainProgram = "alive"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix index 9c424aa2e7..e55b0c106d 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alpaca/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "1.1.1"; + version = "2.0.3"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; rev = version; - hash = "sha256-FFMclm+IUEU4cQZ0+uJHDCHytgW8+fygooWw3Nc1jxM="; + hash = "sha256-CXrnPhNu/doz145rvonuBXoJQolz7qgMdn5KgVio6J4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix index e19669d546..19fc067335 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -63,7 +63,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; @@ -95,7 +95,7 @@ buildGoModule rec { --replace-fail "/sbin/shutdown" "shutdown" echo "${version}" > VERSION - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ --replace-fail /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode ''; diff --git a/third_party/nixpkgs/pkgs/by-name/am/amberol/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amberol/package.nix new file mode 100644 index 0000000000..ba530618be --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/am/amberol/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + cargo, + desktop-file-utils, + appstream-glib, + meson, + ninja, + pkg-config, + reuse, + rustc, + m4, + wrapGAppsHook4, + glib, + gtk4, + gst_all_1, + libadwaita, + dbus, +}: + +stdenv.mkDerivation rec { + pname = "amberol"; + version = "2024.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "amberol"; + rev = version; + hash = "sha256-WuyvTgh9Qc5WcgEssxkytwQpSACd82l5WKeMD0NFOp8="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "amberol-${version}"; + hash = "sha256-C1ENyNUpgwGlZus/zIWD1mUrmWT9L0fH/1T4QaIxGJw="; + }; + + postPatch = '' + patchShebangs build-aux + ''; + + nativeBuildInputs = [ + appstream-glib + cargo + desktop-file-utils + m4 + meson + ninja + pkg-config + reuse + rustc + rustPlatform.cargoSetupHook + wrapGAppsHook4 + ]; + + buildInputs = + [ + dbus + glib + gtk4 + libadwaita + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); + + meta = { + homepage = "https://gitlab.gnome.org/World/amberol"; + description = "Small and simple sound and music player"; + maintainers = with lib.maintainers; [ linsui ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "amberol"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/am/amfora/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amfora/package.nix index 8e9f69b0af..9b65838672 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/amfora/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/amfora/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorHash = "sha256-T/hnlQMDOZV+QGl7xp29sBGfb4VXcXqN6PDoBFdpp4M="; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop install -Dm644 amfora.desktop -t $out/share/applications ''; diff --git a/third_party/nixpkgs/pkgs/by-name/am/amp/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amp/package.nix index ebb662ee11..2d0890b63d 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/amp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/amp/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libgit2 ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ curl diff --git a/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 695714175c..c282aff0c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-08-26"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "a78b76536246898045fd1844aced381d01b7f1c6"; - hash = "sha256-bDfvWg5r4LmWI8tPrx9qzgEnJuMSYBm6MDf6yOaPqkY="; + rev = "1da705ebab9ab44bb933c1275961f963cc4440eb"; + hash = "sha256-6dVY0sZ09H5vdhfk5nGNjt+KG+Qw62b2YbJQCprXBPQ="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/an/anchor/0001-update-time-rs.patch b/third_party/nixpkgs/pkgs/by-name/an/anchor/0001-update-time-rs.patch new file mode 100644 index 0000000000..7b6a585288 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/an/anchor/0001-update-time-rs.patch @@ -0,0 +1,88 @@ +From ff4dfb52767695c066b4ad027983c0d4958094b3 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 24 Sep 2024 17:20:19 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 30 ++++++++++++++++++++++++------ + 1 file changed, 24 insertions(+), 6 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index d588e86c..f09caad8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1432,9 +1432,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derivation-path" +@@ -2629,6 +2632,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-derive" + version = "0.3.3" +@@ -3014,6 +3023,12 @@ dependencies = [ + "rand 0.8.5", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -5276,12 +5291,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.29" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -5295,10 +5312,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock index d588e86c40..f09caad8db 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock @@ -1432,9 +1432,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derivation-path" @@ -2629,6 +2632,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -3014,6 +3023,12 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -5276,12 +5291,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -5295,10 +5312,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix index 2f4d95b732..78165b6b12 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { @@ -17,6 +18,10 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -24,7 +29,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -36,7 +41,6 @@ rustPlatform.buildRustPackage rec { "--skip=tests::test_get_anchor_version_from_commit" ]; - meta = with lib; { description = "Solana Sealevel Framework"; homepage = "https://github.com/coral-xyz/anchor"; diff --git a/third_party/nixpkgs/pkgs/by-name/an/android-studio-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/an/android-studio-tools/package.nix index 06af624a8e..2b1bca4798 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/android-studio-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/android-studio-tools/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { postPatch = '' find . -type f -not -path "./bin/*" -exec chmod -x {} \; - '' + lib.optionalString stdenvNoCC.isDarwin '' + '' + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' for f in cmdline-tools/bin/*; do sed -i 's|start up script for Linux|start up script for Mac|' $f done diff --git a/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix b/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix index fae2010e20..c433cab7eb 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix @@ -4,7 +4,6 @@ buildNpmPackage, electron, nodejs, - fetchpatch, }: buildNpmPackage rec { diff --git a/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix index 624beb87fe..d7712ea43e 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix @@ -46,9 +46,9 @@ rustPlatform.buildRustPackage rec { gtk3 gtk-layer-shell pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; diff --git a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix index 387681956e..af5ee3c727 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, makeWrapper }: +{ lib, fetchurl, appimageTools, makeWrapper, commandLineArgs ? "" }: let pname = "anytype"; @@ -12,12 +12,14 @@ let in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications substituteInPlace $out/share/applications/anytype.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix index 9a01c0548e..0e82446e66 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.67.2"; + version = "1.67.3"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-xwRpJKAkZFSpmAQti2EswM6RXlJVwD+nNY9t5oRzU1s="; + hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU="; }; vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080="; diff --git a/third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix index a7b9ee5133..3f39ac1244 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix @@ -5,6 +5,7 @@ libspelling, fetchFromGitHub, python3Packages, + nodePackages, meson, ninja, pkg-config, @@ -50,7 +51,7 @@ let hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { inherit version src; pname = "apostrophe"; pyproject = false; @@ -62,6 +63,11 @@ python3Packages.buildPythonApplication rec { patchShebangs --build build-aux/meson_post_install.py '' + # Use mathjax from nixpkgs to avoid loading from CDN + + '' + substituteInPlace apostrophe/preview_converter.py \ + --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js" + '' # Should be done in postInstall, but meson checks this eagerly before build + '' install -d $out/share/apostrophe/libs diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix index 017cac0157..ec1c9db783 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.58.1-53264"; + version = "1.61.0-53949"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-xX2Wn0bhPeTn/flz5GiDJ8pnQj3HREc8wqJDlsjI+hs="; + hash = "sha256-FuRWi4+vPt31bd3muMDEn3Fu20h9oWEd1XuPJU7W1OU="; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix index d472b9f132..b31d642c70 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix @@ -48,7 +48,7 @@ # Boolean flags buildManPages ? true, useBuiltinLua ? true, - useEspeak ? !stdenv.isDarwin, + useEspeak ? !stdenv.hostPlatform.isDarwin, useStaticLibuvc ? true, useStaticOpenAL ? true, useStaticSqlite ? true, diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arduino-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arduino-cli/package.nix index 8d01ae38e3..4eb9cabeba 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arduino-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arduino-cli/package.nix @@ -47,7 +47,7 @@ let --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck @@ -60,7 +60,7 @@ let "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' export HOME="$(mktemp -d)" @@ -89,7 +89,7 @@ let }; in -if stdenv.isLinux then +if stdenv.hostPlatform.isLinux then # buildFHSEnv is needed because the arduino-cli downloads compiler # toolchains from the internet that have their interpreters pointed at # /lib64/ld-linux-x86-64.so.2 diff --git a/third_party/nixpkgs/pkgs/by-name/ar/armitage/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/armitage/package.nix index 411d503728..7d704633a3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/armitage/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/armitage/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { gradle makeWrapper copyDesktopItems - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ writeDarwinBundle ]; @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : "${lib.makeBinPath [ jdk11 metasploit ]}" install -Dm444 dist/unix/armitage-logo.png $out/share/pixmaps/armitage.png - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications/Armitage.app/Contents/MacOS" mkdir -p "$out/Applications/Armitage.app/Contents/Resources" cp dist/mac/Armitage.app/Contents/Resources/macIcon.icns $out/Applications/Armitage.app/Contents/Resources diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix index 1abfe6f3b7..04a5678f38 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix @@ -50,13 +50,13 @@ testers, enableShared ? !stdenv.hostPlatform.isStatic, enableFlight ? true, - enableJemalloc ? !stdenv.isDarwin, + enableJemalloc ? !stdenv.hostPlatform.isDarwin, enableS3 ? true, - enableGcs ? !stdenv.isDarwin, + enableGcs ? !stdenv.hostPlatform.isDarwin, }: assert lib.asserts.assertMsg ( - (enableS3 && stdenv.isDarwin) + (enableS3 && stdenv.hostPlatform.isDarwin) -> (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70") ) "S3 on Darwin requires Boost != 1.69"; @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ninja autoconf # for vendored jemalloc flatbuffers - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost @@ -218,10 +218,10 @@ stdenv.mkDerivation (finalAttrs: { "-DPARQUET_REQUIRE_ENCRYPTION=ON" ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] - ++ lib.optionals (!stdenv.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] ++ lib.optionals enableS3 [ "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ]; @@ -247,7 +247,7 @@ stdenv.mkDerivation (finalAttrs: { "TestS3FS.*" "TestS3FSGeneric.*" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # TODO: revisit at 12.0.0 or when # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 # is available, see diff --git a/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix index 67f9032fae..1693b2eab3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/art/package.nix @@ -4,7 +4,6 @@ , cmake , pkg-config , wrapGAppsHook3 -, makeWrapper , pixman , libpthreadstubs , gtkmm3 diff --git a/third_party/nixpkgs/pkgs/by-name/as/asfa/package.nix b/third_party/nixpkgs/pkgs/by-name/as/asfa/package.nix index 428a4e4fda..e9be2526dd 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/asfa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/asfa/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ help2man diff --git a/third_party/nixpkgs/pkgs/by-name/as/asl/package.nix b/third_party/nixpkgs/pkgs/by-name/as/asl/package.nix index 5a7ca86927..f6cbe3f46b 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/asl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/asl/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = lib.optionalString (!buildDocs) '' substituteInPlace Makefile --replace "all: binaries docs" "all: binaries" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace sysdefs.h --replace "x86_64" "aarch64" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/as/astartectl/package.nix b/third_party/nixpkgs/pkgs/by-name/as/astartectl/package.nix index a22f6bd598..ac88b96cfa 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/astartectl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/astartectl/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "astartectl"; - version = "24.5.0"; + version = "24.5.2"; src = fetchFromGitHub { owner = "astarte-platform"; repo = "astartectl"; rev = "v${version}"; - hash = "sha256-4Iyd+1hLSatWyeV2J7RSqo2jVEc8dSp5JBObsn3RciI="; + hash = "sha256-T4/lkeipE7GWq1zTxkoV3MfADlduFKtGuB/dsI4YZZw="; }; - vendorHash = "sha256-NWPLHbUHrk/oJXCOJF8kKhQiZR8aqZChxuz73Acu1cM="; + vendorHash = "sha256-kVI1DigDlTvrYLVRUYoW+AAkd31d9EehjRJxrqo8OB4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix index 2a8ce471e2..000b41b1b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { [ oniguruma ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/at/atf/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atf/package.nix index e77eb5244d..5edb2d6366 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atf/package.nix @@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'atf_test_program{name="srcdir_test"}' "" '' # These tests fail on Darwin. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isDarwin) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) '' substituteInPlace atf-c/detail/process_test.c \ --replace-fail 'ATF_TP_ADD_TC(tp, status_coredump);' "" '' # This test fails on Linux. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isLinux) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) '' substituteInPlace atf-c/detail/fs_test.c \ --replace-fail 'ATF_TP_ADD_TC(tp, eaccess);' "" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix index 838df85a57..a276dff1c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix @@ -6,8 +6,8 @@ makeWrapper, stdenvNoCC, - gamemodeSupport ? stdenvNoCC.isLinux, - textToSpeechSupport ? stdenvNoCC.isLinux, + gamemodeSupport ? stdenvNoCC.hostPlatform.isLinux, + textToSpeechSupport ? stdenvNoCC.hostPlatform.isLinux, additionalLibs ? [ ], # dependencies diff --git a/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix b/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix index e9b89cf6d5..aa84bd2a12 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/attic-client/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { buildInputs = [ nix boost - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]); diff --git a/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix b/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix index 87328a78ce..21be9ce314 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/attract-mode/package.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation { sfml zlib ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openal fontconfig ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.IOKit @@ -61,7 +61,7 @@ stdenv.mkDerivation { "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" "AR=${stdenv.cc.targetPrefix}ar" "BUILD_EXPAT=0" - ] ++ lib.optionals stdenv.isDarwin [ "USE_FONTCONFIG=0" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "USE_FONTCONFIG=0" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/by-name/at/atuin/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atuin/package.nix index 9234e88667..e50cdde161 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atuin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atuin/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { # TODO: unify this to one hash because updater do not support this cargoHash = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then "sha256-K4Vw/d0ZOROWujWr76I3QvfKefLhXLeFufUrgStAyjQ=" else "sha256-8NAfE7cGFT64ntNXK9RT0D/MbDJweN7vvsG/KlrY4K4="; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/au/autologin/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autologin/package.nix new file mode 100644 index 0000000000..091a2cb8ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/au/autologin/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromSourcehut, + meson, + ninja, + pam, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "autologin"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = "autologin"; + rev = version; + hash = "sha256-Cy4v/1NuaiSr5Bl6SQMWk5rga8h1QMBUkHpN6M3bWOc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + ]; + buildInputs = [ pam ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Run a command inside of a new PAM user session"; + homepage = "https://sr.ht/~kennylevinsen/autologin"; + changelog = "https://git.sr.ht/~kennylevinsen/autologin/refs/${version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ beviu ]; + mainProgram = "autologin"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix index 72f5130a51..a2693eb5b8 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeWrapper, fetchzip, testdisk, imagemagick, jdk, findutils, sleuthkit, ... }: let - jdkWithJfx = jdk.override (lib.optionalAttrs stdenv.isLinux { + jdkWithJfx = jdk.override (lib.optionalAttrs stdenv.hostPlatform.isLinux { enableJavaFX = true; }); in diff --git a/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix index 798dc89b83..479f6d69d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "7.0.0"; + version = "7.0.1"; disabled = python3.pythonOlder "3.10"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AJ0ZWRxqhBJEics6XnIVWyf7pJI8MphQU4LRqSYYNSQ="; + hash = "sha256-Zjo8H5PU6JezrBF0XBHvmePUTNeX74BX4NsHtPozcKs="; }; dependencies = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/av/avalonia/package.nix b/third_party/nixpkgs/pkgs/by-name/av/avalonia/package.nix index 7b828cdf5c..ebcbc3a9e6 100644 --- a/third_party/nixpkgs/pkgs/by-name/av/avalonia/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/av/avalonia/package.nix @@ -38,8 +38,11 @@ stdenvNoCC.mkDerivation ( dotnetCorePackages.addNuGetDeps { nugetDeps = ./deps.nix; - overrideFetchAttrs = old: { + overrideFetchAttrs = old: rec { runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) old.meta.platforms; + buildInputs = + old.buildInputs + ++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk.targetPackages)); }; } rec { @@ -159,7 +162,7 @@ stdenvNoCC.mkDerivation ( nodejs dotnet-sdk ]; - buildInputs = [ dotnet-sdk.packages ]; + buildInputs = dotnet-sdk.packages; buildTarget = "Package"; diff --git a/third_party/nixpkgs/pkgs/by-name/av/avbroot/package.nix b/third_party/nixpkgs/pkgs/by-name/av/avbroot/package.nix index 8e992e5c3a..249ed14233 100644 --- a/third_party/nixpkgs/pkgs/by-name/av/avbroot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/av/avbroot/package.nix @@ -33,7 +33,9 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = [ bzip2 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + bzip2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = { description = "Sign (and root) Android A/B OTAs with custom keys while preserving Android Verified Boot"; diff --git a/third_party/nixpkgs/pkgs/by-name/aw/aws-sso-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-sso-cli/package.nix index 6e5b72b1f2..b77680f058 100644 --- a/third_party/nixpkgs/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { "TestAWSConsoleUrl" "TestAWSFederatedUrl" "TestServerWithSSL" # https://github.com/synfinatic/aws-sso-cli/issues/1030 -- remove when version >= 2.x - ] ++ lib.optionals stdenv.isDarwin [ "TestDetectShellBash" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDetectShellBash" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/aw/aws-vault/package.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-vault/package.nix index e503848f10..a99ed43ea7 100644 --- a/third_party/nixpkgs/pkgs/by-name/aw/aws-vault/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/aw/aws-vault/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { postInstall = '' # make xdg-open overrideable at runtime # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links - ${lib.optionalString (!stdenv.isDarwin) "wrapProgram $out/bin/aws-vault --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"} + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "wrapProgram $out/bin/aws-vault --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"} installShellCompletion --cmd aws-vault \ --bash $src/contrib/completions/bash/aws-vault.bash \ --fish $src/contrib/completions/fish/aws-vault.fish \ diff --git a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/package.nix index 2a73b3da9f..d9bfd888dd 100644 --- a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/package.nix @@ -191,7 +191,7 @@ py.pkgs.toPythonApplication ( chardet colorama ] - ++ lib.optional stdenv.isLinux distro + ++ lib.optional stdenv.hostPlatform.isLinux distro ++ [ fabric javaproperties diff --git a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix index 97e2d0b192..5bde744504 100644 --- a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/python-packages.nix @@ -69,7 +69,7 @@ let nativeCheckInputs = with self; [ pytest ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; # ignore tests that does network call, or assume powershell checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/az/azurite/package.nix b/third_party/nixpkgs/pkgs/by-name/az/azurite/package.nix index 8f70c247fc..de63807785 100644 --- a/third_party/nixpkgs/pkgs/by-name/az/azurite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/az/azurite/package.nix @@ -22,9 +22,9 @@ buildNpmPackage rec { npmDepsHash = "sha256-+ptjsz2MDIB/aqu4UxkBLCcehtamFdmswNUsHs23LuE="; nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret - ] ++ lib.optionals stdenv.isDarwin (with darwin; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin; [ Security apple_sdk.frameworks.AppKit ]); diff --git a/third_party/nixpkgs/pkgs/by-name/ba/backrest/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/backrest/package.nix new file mode 100644 index 0000000000..af057af6b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/backrest/package.nix @@ -0,0 +1,65 @@ +{ + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + lib, + restic, + util-linux, +}: +let + pname = "backrest"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "garethgeorge"; + repo = "backrest"; + rev = "refs/tags/v${version}"; + hash = "sha256-qxEZkRKkwKZ+EZ3y3aGcX2ioKOz19SRdi3+9mjF1LpE="; + }; + + frontend = buildNpmPackage { + inherit version; + pname = "${pname}-webui"; + src = "${src}/webui"; + + npmDepsHash = "sha256-mS8G3+JuASaOkAYi+vgWztrSIIu7vfaasu+YeRJjWZw="; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r dist/* $out + runHook postInstall + ''; + }; +in +buildGoModule { + inherit pname src version; + + vendorHash = "sha256-YukcHnXa/QimfX3nDtQI6yfPkEK9j5SPXOPIT++eWsU="; + + preBuild = '' + mkdir -p ./webui/dist + cp -r ${frontend}/* ./webui/dist + ''; + + nativeCheckInputs = [ util-linux ]; + + # Fails with handler returned wrong content encoding + checkFlags = [ "-skip=TestServeIndex" ]; + + preCheck = '' + # Use restic from nixpkgs, otherwise download fails in sandbox + export BACKREST_RESTIC_COMMAND="${restic}/bin/restic" + export HOME=$(pwd) + ''; + + meta = { + description = "Web UI and orchestrator for restic backup"; + homepage = "https://github.com/garethgeorge/backrest"; + changelog = "https://github.com/garethgeorge/backrest/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ interdependence ]; + mainProgram = "backrest"; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ba/barrage/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/barrage/package.nix index 497468cb48..ff879e5692 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/barrage/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/barrage/package.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "barrage"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bat/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bat/package.nix index 9e4132bc0b..716ad80de7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/bat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/bat/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 diff --git a/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix index 5e5cf3f650..0d51bc0ec8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; mainProgram = "batmon"; platforms = with platforms; unix ++ windows; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ _6543 ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix index fbab03b3cf..e739e7b4fa 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.4.5"; + version = "1.5.0"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-cvzUjOmeTWB07vSe6taUyGDmTlN62fhsQw/OMgvIJ2M="; + hash = "sha256-cxDTNtxy2APAjnHw/cVd1/hUazASJs46rCHNGQ/JbSM="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 @@ -31,6 +31,8 @@ appimageTools.wrapAppImage { # taken from # https://github.com/Dygmalab/Bazecor/blob/v1.4.4/src/main/utils/udev.ts#L6 + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.glib ]; # Also expose the udev rules here, so it can be used as: @@ -38,7 +40,6 @@ appimageTools.wrapAppImage { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/bazecor \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix index 3d2235a0a0..6cc3c1ce33 100644 --- a/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pname = "bcc"; version = "0.31.0"; - disabled = !stdenv.isLinux; + disabled = !stdenv.hostPlatform.isLinux; src = fetchFromGitHub { owner = "iovisor"; diff --git a/third_party/nixpkgs/pkgs/by-name/bd/bdf2ttf/package.nix b/third_party/nixpkgs/pkgs/by-name/bd/bdf2ttf/package.nix index c12100bb36..399c07ee0b 100644 --- a/third_party/nixpkgs/pkgs/by-name/bd/bdf2ttf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bd/bdf2ttf/package.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ners ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix index c36564b9af..274bf24136 100644 --- a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix @@ -29,8 +29,9 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bicep/deps.nix b/third_party/nixpkgs/pkgs/by-name/bi/bicep/deps.nix index 40abcef89a..506e4a6f2e 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bicep/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bicep/deps.nix @@ -5,43 +5,46 @@ (fetchNuGet { pname = "Azure.Bicep.Internal.RoslynAnalyzers"; version = "0.1.38"; hash = "sha256-++iIefl+xbX3Tw4EsPvJrsMoG2DdQ5dPtqEgD+jaI6w="; }) (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.81"; hash = "sha256-eggoXh3X4h8UeyUN7EJEECW77yuM4sms7yogfasIB2I="; }) (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.9"; hash = "sha256-ArayCbMPz2itkOE88usMZfW5fx18cWlymdSVq/KXZQs="; }) - (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.698"; hash = "sha256-3O+CO+y8sqB3rJttuH9ymyoqygJVCtM4ybvPllCv+IU="; }) + (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.706"; hash = "sha256-KafgQYWKy5sXgDpNlf77yRVVBj4A0XxkkhIbN2EYTXA="; }) (fetchNuGet { pname = "Azure.Bicep.Types.K8s"; version = "0.1.626"; hash = "sha256-UYpfVbjvtr8eLWsjAEBrzVjxrHWiEEtjerNjafCLB7A="; }) (fetchNuGet { pname = "Azure.Containers.ContainerRegistry"; version = "1.1.1"; hash = "sha256-BC7QlrtYz74yDtTf/Kvf+Y3Vm3NEZsJLO5g5twKuxkI="; }) (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; hash = "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI="; }) - (fetchNuGet { pname = "Azure.Core"; version = "1.39.0"; hash = "sha256-l5c+iPoCPkR3bKJ48WY+YHGEP2Kft9CU0RT/K0LcZiw="; }) (fetchNuGet { pname = "Azure.Core"; version = "1.40.0"; hash = "sha256-c1DBQ+OmNAKoQkj3kC3U7yWy77yG+fo+H3vR1e+Qrpo="; }) - (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.71.0"; hash = "sha256-voVequHvoUfk1SLLCibzsZrmYx6vQa4LCG1Na/m4weM="; }) - (fetchNuGet { pname = "Azure.Deployments.DiffEngine"; version = "1.71.0"; hash = "sha256-tGy2ienvvMHd4jjGye5DdoGJlzBao8YKddqL3CQCAEA="; }) - (fetchNuGet { pname = "Azure.Deployments.Engine"; version = "1.71.0"; hash = "sha256-J5mIPdbZcXuMT/sxb5aFQ0hFWn19yLyzoKqa0V+QEME="; }) - (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.71.0"; hash = "sha256-zycWbem1lFP49WosaYep7QwDdKm6cxx0ZHWWPXKnyqo="; }) - (fetchNuGet { pname = "Azure.Deployments.Extensibility"; version = "1.71.0"; hash = "sha256-u16l7T2o4y+BA0wQ/u10ZGGjUI+bgzJBEE29ncsNEjI="; }) + (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.95.0"; hash = "sha256-YJ4nmC1LbqNvsD5gERJkyImw8itQR2xF1MUQocKCMtU="; }) + (fetchNuGet { pname = "Azure.Deployments.DiffEngine"; version = "1.95.0"; hash = "sha256-ZCfv+Mr62BoDSM4K3LmwwqlaKW8rIqfqTAgjQvozQIA="; }) + (fetchNuGet { pname = "Azure.Deployments.Engine"; version = "1.95.0"; hash = "sha256-s0BEWMZyIacwZWR1d744jHg2rc4vIVNTT/OhpPYKmNs="; }) + (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.95.0"; hash = "sha256-85eQaO0HCih/C2wt5bkXJL9+urWRVzV9X3Vr5tFlRnQ="; }) + (fetchNuGet { pname = "Azure.Deployments.Extensibility"; version = "1.95.0"; hash = "sha256-oMeOPINDHh+0DsWgvn/iJohalERtNkWY6+lB3SXKePY="; }) (fetchNuGet { pname = "Azure.Deployments.Extensibility.Core"; version = "0.1.55"; hash = "sha256-u5Xo/TkFJSOeI+/T1fWuEeFVQVT4gM6pE09jhY6b2vU="; }) (fetchNuGet { pname = "Azure.Deployments.Internal.GenerateNotice"; version = "0.1.38"; hash = "sha256-LW8q/5ler1c0tK8FGd5PIqnWpdC/YggKrERAFhioXwI="; }) (fetchNuGet { pname = "Azure.Deployments.JsonPath"; version = "1.0.1265"; hash = "sha256-67xm85aTEJHv/6iYXxnjmkHDEtRnTnFhzs9gv1H/J4c="; }) (fetchNuGet { pname = "Azure.Deployments.ResourceMetadata"; version = "1.0.1265"; hash = "sha256-kvFL2oHG7javm4K8Wkyjc72jUbJBWKunlt0yrL360Wg="; }) - (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.71.0"; hash = "sha256-ORtuQEvMr5j0yCKZMzBO5GuDfG9XFEho2gkpGtk944k="; }) + (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.95.0"; hash = "sha256-SltmETp+P/TIbFr9XjkvcuPircNpO9TfsvCx/8vjoFY="; }) (fetchNuGet { pname = "Azure.Identity"; version = "1.12.0"; hash = "sha256-F3dFL8/HHqYgINxe9OAkHW067KPcsKgLjcPTHmpfBAo="; }) - (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.11.1"; hash = "sha256-Pi+LT//A33XzGSE0yb1FK+fxu8FIfcD3/KOnTHQW120="; }) - (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.3"; hash = "sha256-SfQ1bavuKdwPW81ML2x3gVpDRwIvTvAO9h2E12pVito="; }) + (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.12.0"; hash = "sha256-zcML/ZTttuz5U7xd9I/uHN/aGXWm+mPHBWGNMYErnio="; }) + (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.8.0"; hash = "sha256-qGRPsWIHW40UXIWEAYSWQsqc9Pl4p9TTAwkg7PNrNzU="; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; }) (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; hash = "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.27.1"; hash = "sha256-6BdAwStdmfFEwCqkYO4yffdq6QBDZskfmopI5fl0Dy8="; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.63.0"; hash = "sha256-tPvrMdQoVn6quCOkfiDyuTPzJN55vghMeIWmn1Gy2Ig="; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.63.0"; hash = "sha256-iq5O1Aa1SlBeuW5MoZnRotmQbPJmqSkhbyO53WVwSSk="; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.63.0"; hash = "sha256-JHpSo+cymATjLloCXRATzkXJr6zYRM2X2B/nQfXAdQ0="; }) - (fetchNuGet { pname = "Grpc.Tools"; version = "2.64.0"; hash = "sha256-vL8NnlHu6X4g6VLMQ7K6ZpBg3SgahaELonRK2B8/47E="; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.28.0"; hash = "sha256-Q/p1lM/7SD7WNVC6/V/MNKkH2rJiPOttHgRSJi3BzYk="; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.65.0"; hash = "sha256-cLE/TiOYjMFUBF2ENWwGWrn1AaKpo8TO+8C2lj+5hqw="; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.65.0"; hash = "sha256-ZTaIuhC7W/Oyr4BGH3TDctdDSwRlNmM8dAd1Us0D7os="; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.65.0"; hash = "sha256-WsUmrHumKqamxYu/Ayj2NVg+Q0jervFHy9lJAGb7jTU="; }) + (fetchNuGet { pname = "Grpc.Tools"; version = "2.66.0"; hash = "sha256-UM3QNCMKcoDBhTD9OTkxqOT7EOsAViIM5yF2SzGc0TM="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) (fetchNuGet { pname = "IPNetwork2"; version = "2.6.548"; hash = "sha256-6N61UG/WrJWNv+bO/l9BNWA17iPIMn5G4J7maw54UPg="; }) (fetchNuGet { pname = "IPNetwork2"; version = "2.6.598"; hash = "sha256-FPjItZbaf5gJYP6lORQITPqWnwHN0WDLvq+v4Hmc3Q4="; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2019.1.3"; hash = "sha256-gn2Z7yANT+2tnK+qbOA2PviRf1M1VtvamABGajgGC6E="; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; }) (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.2"; hash = "sha256-fnp/By8n8xKa8bhvUbO2p8rlze5AvgA+z9ZvWEpL/Ls="; }) + (fetchNuGet { pname = "Json.More.Net"; version = "2.0.2"; hash = "sha256-a05C4llKu1sOBjjV+GXQqSD1FWaj7twjkx4L95qixDQ="; }) (fetchNuGet { pname = "JsonDiffPatch.Net"; version = "2.1.0"; hash = "sha256-lyUOusPMv1ZF3EcrEFG4Fze603CVPxLwOPmTVOy/HmU="; }) (fetchNuGet { pname = "JsonPatch.Net"; version = "3.1.0"; hash = "sha256-bvCOOiH2SruZXF+jPYlAaEkinZ040YDp9QjP3QXlCbc="; }) + (fetchNuGet { pname = "JsonPatch.Net"; version = "3.1.1"; hash = "sha256-j8MZwl96BUPBSFnsb42d/JZIccDQQ1TvgBjqwafv9SQ="; }) (fetchNuGet { pname = "JsonPath.Net"; version = "1.1.0"; hash = "sha256-FQGPodaxHwyfRN3HhEl7N39SKsn922FiZAiDzKOYxUo="; }) + (fetchNuGet { pname = "JsonPath.Net"; version = "1.1.4"; hash = "sha256-eft2nHG05XCIh3dH2C+ceW771vPSHxXccbRK0qFga7I="; }) (fetchNuGet { pname = "JsonPointer.Net"; version = "5.0.0"; hash = "sha256-OCeXHpJyHJSyh2vpnrY8nSuM4u3eNXtN6YXnJZyHnWc="; }) + (fetchNuGet { pname = "JsonPointer.Net"; version = "5.0.2"; hash = "sha256-S04fnxMCJm86yc1FYHSqHznhA+90NW6QI+7rxYIyhs0="; }) (fetchNuGet { pname = "JsonSchema.Net"; version = "7.0.4"; hash = "sha256-sCaGr8m20DzNEkF3TS7Cb+wmvo3hYZPZwQ2bTqwlB5g="; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; }) @@ -53,13 +56,13 @@ (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; hash = "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.1"; hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.EventRegister"; version = "1.1.28"; hash = "sha256-A/gOXo0PWS8+L7OyJz1s8zDxGU39SFuvxrHZnqSLANI="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.1.3"; hash = "sha256-MVKR1ZRpUMNdRAPuXh9cp5T/hG7wu8R9wUr9bey8V60="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.1"; hash = "sha256-KYPQYYspiBGiez7JshmEjy4kFt7ASzVxQeVsygIEvHA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.2"; hash = "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) @@ -77,49 +80,46 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.6-preview"; hash = "sha256-01IC1xejcwK5da5UEhxgzfBcuT1plAajbFp2jNgS4II="; }) + (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.7-preview"; hash = "sha256-Lz45XaKIjKA7w4xX2ElZO5jxVi0LqhGbGBTAHc+aqL0="; }) (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.61.3"; hash = "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="; }) (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.61.3"; hash = "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; hash = "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.1"; hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; hash = "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; }) (fetchNuGet { pname = "Microsoft.PowerPlatform.ResourceStack"; version = "7.0.0.2007"; hash = "sha256-XjmVeRhHkBlDbM/anEwN/pFbNHC1w7YMZ49LRV7cL8I="; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.9.28"; hash = "sha256-4Z/uKv/jJPHXCJD9W/2vHNDfas3o4EfLh6+Tmkv44YE="; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; hash = "sha256-EvZGbyxtrJDvHZwsQbZDXtVfWiy0f58oCdTdSzD34wI="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.1"; hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.1"; hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.48"; hash = "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.11.20"; hash = "sha256-mHYVKapahjHlrzeJ6JpQAtugg+Ub3IzesYSJ+UTybAU="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; hash = "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8="; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry.AccessControl"; version = "6.0.0"; hash = "sha256-Vm9H1A7+YDXtAjYimnN28TQLm94c8UkQNTSIa9ghPbA="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.1"; hash = "sha256-wk8oV7jHZfSxKX5PDcV3S/pSnsaFq4mr8fakvJI4V9U="; }) (fetchNuGet { pname = "Microsoft.Windows.Compatibility"; version = "6.0.7"; hash = "sha256-LSQbmbX833b0Q6s6h6Un+yfU8JZS6eLbgFHwes5rAaw="; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; }) - (fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.139"; hash = "sha256-DMEdNlYh9tqkqQ/98zwk7NcRYBpTApLiFwzkgaHP7Fo="; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; hash = "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.5.2"; hash = "sha256-ZudwTMNhxbxehLz9hCOgrhTzegVs4P6avUpFiez+u10="; }) + (fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.143"; hash = "sha256-OhOtMzP+2obDIR+npR7SsoXo0KrmcsL+VCE8Z3t5gzQ="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.74"; hash = "sha256-asIdaqCIjZspTA+hhtjKNajpCo+ZQi3erZLCpBQ5No4="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; hash = "sha256-ESyjt/R7y9dDvvz5Sftozk+e/3Otn38bOcLGGh69Ot0="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) @@ -165,7 +165,7 @@ (fetchNuGet { pname = "Semver"; version = "2.3.0"; hash = "sha256-77/J/w41PLEMIxA5Uj475TeReBGw8QwptQsbQDtdsMI="; }) (fetchNuGet { pname = "SharpYaml"; version = "2.1.1"; hash = "sha256-KSs7993j0VJxSDx/VpruMQFnnjP4CzvzPLlIfDEwOpw="; }) (fetchNuGet { pname = "Sprache.StrongNamed"; version = "2.3.2"; hash = "sha256-q6G1Y1/oellt0ABex7UQZdc0ACEBKFT6Ah+mNIHWyVw="; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.18.48"; hash = "sha256-/vjpwKMFoJfSf+uKEjmWzW/HdIfDGMLb7el91ni6gFQ="; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.19.27"; hash = "sha256-0eQVv72i5vZ3SsgjyG42w6YIZXpTpCQpIwDPEFkr6Z0="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) (fetchNuGet { pname = "System.ClientModel"; version = "1.0.0"; hash = "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) @@ -173,7 +173,6 @@ (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; hash = "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "6.0.0"; hash = "sha256-7JyYbqWl1NHTNMJW12g6TtYfkemI52nOnX7OHWvp7ps="; }) (fetchNuGet { pname = "System.ComponentModel.Composition.Registration"; version = "6.0.0"; hash = "sha256-NOw9ZLTBGBwQoHk8P6yIH1f+WoU3fSfm+jNrTQVZZdM="; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; hash = "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I="; }) @@ -200,11 +199,11 @@ (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-UTdB/kD39zeXjUxdgQbXSxS/yyzDtc2rLre2+pLoQWk="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-91e2/Bd4ZgANw19mKkTdxAy2tv7NutyG0lQTKhMiEpo="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) (fetchNuGet { pname = "System.IO.Packaging"; version = "6.0.0"; hash = "sha256-TKnqKh34uSkPSeideZXrVqnZ5a0Yu5jDgZswKSbAVoQ="; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; }) (fetchNuGet { pname = "System.IO.Ports"; version = "6.0.0"; hash = "sha256-AqCYJwPsLkZqEBX7y3sfnrNSvwQnKM7BEl53sY7dDyw="; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) @@ -248,7 +247,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) @@ -272,10 +270,8 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; hash = "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; hash = "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.2"; hash = "sha256-uQQPCGRYKMUykb7dhg60YKPTXbjM8X01xmTYev1sId4="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) @@ -286,13 +282,12 @@ (fetchNuGet { pname = "System.Threading.AccessControl"; version = "6.0.0"; hash = "sha256-ZkoQVA9cLa/du8FCVonnHy/R/t6ms6BG+NiTlFA3A7g="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; hash = "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) (fetchNuGet { pname = "System.Web.Services.Description"; version = "4.9.0"; hash = "sha256-cGLlUp+ue7PVrs6Gg6T3KfUQ0OuHr8DdJd8agaSeySE="; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-900+hyDm/wCd7iD5hnPJue/In/ZcA3NlGNk9kHWLoX0="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.22"; hash = "sha256-xDe16iGy2i0SyYnlauFxZMTUx44PM+kas+jRtagDV50="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-OFpu9RcDRPLYntQyesBevoG1XxyH96ukHOH0uXqO5ls="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.29"; hash = "sha256-2q1HzbyRPIm6VKYzZzZnkXBJzV8S+HBtT6Lej1pv84Y="; }) ] diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bicep/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bicep/package.nix index d8246c5458..5a56ddbc71 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bicep/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bicep/package.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "bicep"; - version = "0.29.47"; + version = "0.30.3"; src = fetchFromGitHub { owner = "Azure"; repo = "bicep"; rev = "v${version}"; - hash = "sha256-KdaoOejoM/3P1WwDCjDhChOpKA7c4UulPLK7IOVw3o4="; + hash = "sha256-JJNiVANq5WyiNnl6TsXPtLdsX4AKMcDIBzatwRPnbFM="; }; postPatch = '' @@ -30,7 +30,7 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.runtime_8_0; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin nativeCheckInputs = [ mono ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix index b3f7a7b7ad..14b3e03483 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix @@ -1,29 +1,40 @@ -{ lib -, stdenv -, fetchurl -, electron -, zstd -, makeWrapper +{ + lib, + stdenv, + fetchurl, + electron_30, + dpkg, + makeWrapper, + commandLineArgs ? "", }: - -stdenv.mkDerivation rec { - pname = "bilibili"; - version = "1.14.0-1"; - src = fetchurl { - url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-4+DGL/DNR3wLFUff17OquAM6dOkcsXFNeCqA7ITtCaI="; +let + version = "1.14.0-2"; + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; + hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb"; + hash = "sha256-UaGI4BLhfoYluZpARsj+I0iEmFXYYNfl4JWhBWOOip0="; + }; }; - + src = + srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation { + pname = "bilibili"; + inherit src version; unpackPhase = '' runHook preUnpack - - ar x $src - tar -I ${zstd}/bin/zstd -xvf data.tar.zst - + dpkg -x $src ./ runHook postUnpack ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + dpkg + ]; installPhase = '' runHook preInstall @@ -32,20 +43,31 @@ stdenv.mkDerivation rec { cp -r usr/share $out/share sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt - makeWrapper ${electron}/bin/electron $out/bin/bilibili \ + makeWrapper ${lib.getExe electron_30} $out/bin/bilibili \ --argv0 "bilibili" \ - --add-flags "$out/opt/app.asar" + --add-flags "$out/opt/app.asar" \ + --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall ''; - meta = with lib; { + meta = { description = "Electron-based bilibili desktop client"; homepage = "https://github.com/msojocs/bilibili-linux"; - license = with licenses; [ unfree mit ]; - maintainers = with maintainers; [ jedsek kashw2 ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = with lib.licenses; [ + unfree + mit + ]; + maintainers = with lib.maintainers; [ + jedsek + kashw2 + bot-wxt1221 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "bilibili"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix index 3b85edb9b6..b5a1b55036 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/binsider/package.nix @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with maintainers; [ samueltardieu ]; mainProgram = "binsider"; - broken = stdenv.isDarwin || stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix index c37b4f6f66..678a1aa71f 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { rust-jemalloc-sys zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitbucket-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitbucket-cli/package.nix new file mode 100644 index 0000000000..f5927ec44d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitbucket-cli/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "bitbucket-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "swisscom"; + repo = "bitbucket-cli"; + rev = "v${version}"; + hash = "sha256-8Qvlv/S5IkRk+2D/Pnb0+FP7ryHh1kSRJCiUjSO0OtI="; + }; + + vendorHash = "sha256-xjCY3Ycz5Ty6jTDHNNUWYp2SP8EPhDiwO7+WJBL3lAQ="; + + # Tests seem to be using Swisscom's live servers. + doCheck = false; + + meta = { + description = "Bitbucket Enterprise CLI"; + homepage = "https://github.com/swisscom/bitbucket-cli"; + mainProgram = "bitbucket-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ attila ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix index de072e33d4..4dd9e43841 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix @@ -60,14 +60,14 @@ rustPlatform.buildRustPackage rec { pango vulkan-loader ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Metal darwin.apple_sdk.frameworks.QuartzCore ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; @@ -105,6 +105,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [vinnymeller]; mainProgram = "bite"; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix index e4a4ce8a5c..2fe5a8e368 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.8.2"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-F/UbaNKkyf8AoTSa0B0Ipdr5Z8qAkbk7tJ0Cdq7gk+U="; + hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w="; }; postPatch = '' @@ -28,11 +28,11 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk="; + npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk="; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ setuptools ])) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools xcbuild.xcrun ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix index 104abfb855..a45712bfe8 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_31 +, electron_32 , fetchFromGitHub , glib , gnome-keyring @@ -26,16 +26,16 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_31; + electron = electron_32; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.8.2"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-KATT4W2pP7VTcoHeshGx5VrBwlg3UqzKPcRY0Rzo7II="; + hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w="; }; patches = [ @@ -52,7 +52,7 @@ in buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk="; + npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -68,7 +68,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-MjGKQky6LGtpG1maBWd+WkMZlnZfdl9Sm2dlvdD8ANw="; + hash = "sha256-y+6vaESiOeVrFJpZoOJ75onOpldqSsT2kqkMMzTDUmM="; }; cargoRoot = "apps/desktop/desktop_native"; diff --git a/third_party/nixpkgs/pkgs/by-name/bl/blastem/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/blastem/package.nix index d1ba8d3cb8..2bdd9ed5f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/blastem/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/blastem/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; # will probably be fixed in https://github.com/NixOS/nixpkgs/pull/302481 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail "-flto" "" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bleep/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bleep/package.nix index 190f971ffb..19a007dd70 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/bleep/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/bleep/package.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles makeWrapper - ] ++ lib.optional stdenvNoCC.isLinux autoPatchelfHook; + ] ++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ zlib ]; @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontAutoPatchelf = true; postFixup = - lib.optionalString stdenvNoCC.isLinux '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' autoPatchelf $out '' + '' diff --git a/third_party/nixpkgs/pkgs/development/tools/bloaty/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bloaty/package.nix similarity index 72% rename from third_party/nixpkgs/pkgs/development/tools/bloaty/default.nix rename to third_party/nixpkgs/pkgs/by-name/bl/bloaty/package.nix index 1393a7ca54..fab4550cbd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bloaty/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/bloaty/package.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, cmake, zlib, fetchFromGitHub, re2, abseil-cpp, protobuf, capstone, gtest, pkg-config, lit, llvmPackages_16 }: - -stdenv.mkDerivation rec { - pname = "bloaty"; - version = "1.1-unstable-2023-11-06"; - - src = fetchFromGitHub { - owner = "google"; - repo = "bloaty"; - rev = "16f9fe54d9cd0e9abe1d25fc1a9b44c214cfaa9f"; - hash = "sha256-mIVlNMKtJMfH2QdYZ6+oV7619oYzvKkq3fHY6uofqlM="; - }; - +{ + lib, + stdenv, + cmake, + zlib, + fetchFromGitHub, + re2, + abseil-cpp, + protobuf, + capstone, + gtest, + pkg-config, + lit, + llvmPackages_16, +}: +let # Old vendored package which has no other use than here, so not packaged in nixpkgs. demumble = fetchFromGitHub { owner = "nico"; @@ -18,6 +21,17 @@ stdenv.mkDerivation rec { rev = "01098eab821b33bd31b9778aea38565cd796aa85"; hash = "sha256-605SsXd7TSdm3BH854ChHIZbOXcHI/n8RN+pFMz4Ex4="; }; +in +stdenv.mkDerivation { + pname = "bloaty"; + version = "1.1-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "google"; + repo = "bloaty"; + rev = "0c89acd7e8b9d91fd1e9c8c129be627b4e47f1ea"; + hash = "sha256-txZDPytWnkjkiVkPL2SWLwCPEtVvqoI/MVRvbJ2kBGw="; + }; cmakeFlags = [ "-DLIT_EXECUTABLE=${lit}/bin/lit" @@ -39,9 +53,21 @@ stdenv.mkDerivation rec { rm -rf tests/wasm ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ zlib re2 abseil-cpp protobuf capstone gtest lit llvmPackages_16.libllvm ]; + buildInputs = [ + zlib + re2 + abseil-cpp + protobuf + capstone + gtest + lit + llvmPackages_16.libllvm + ]; doCheck = true; @@ -54,12 +80,12 @@ stdenv.mkDerivation rec { install -Dm755 {.,$out/bin}/bloaty ''; - meta = with lib; { + meta = { description = "Size profiler for binaries"; mainProgram = "bloaty"; homepage = "https://github.com/google/bloaty"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bl/blockattack/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/blockattack/package.nix index 35b765920a..0e8a3cbc4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/blockattack/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/blockattack/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://blockattack.net/"; description = "Open source clone of Panel de Pon (aka Tetris Attack)"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "blockattack"; diff --git a/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix index a8458255c7..85cf62c4c8 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix @@ -12,28 +12,28 @@ buildNpmPackage rec { pname = "blockbench"; - version = "4.10.4"; + version = "4.11.0"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; rev = "v${version}"; - hash = "sha256-TjT93nx52PxuHuW4NONTfI3G7+Dl0NFX2aKpZDEF8+8="; + hash = "sha256-SmG8JMHdFTGkxLCTTbD1IhjQgmsRMvxQsB4rluHy6yI="; }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ imagemagick # for icon resizing copyDesktopItems ]; - npmDepsHash = "sha256-WkOn1bLJ9xmJdQcY6ak+hs/YW+crIXhTWA6tjMSVq9I="; + npmDepsHash = "sha256-vbwoKijDt7TbXfU8Il5dwnfyGc2HsbLdAJhQzYuq6eo="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; # disable code signing on Darwin - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export CSC_IDENTITY_AUTO_DISCOVERY=false sed -i "/afterSign/d" package.json ''; @@ -54,13 +54,13 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/Blockbench.app $out/Applications makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench ''} - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/share/blockbench cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench diff --git a/third_party/nixpkgs/pkgs/by-name/bo/bochs/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/bochs/package.nix index 963f242d1e..ab06e54c48 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/bochs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/bochs/package.nix @@ -19,8 +19,8 @@ , wxGTK32 , enableSDL2 ? true , enableTerm ? true -, enableWx ? !stdenv.isDarwin -, enableX11 ? !stdenv.isDarwin +, enableWx ? !stdenv.hostPlatform.isDarwin +, enableX11 ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation (finalAttrs: { @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { libGLU libX11 libXpm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableX11 [ "--with-x" "--with-x11" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--enable-e1000" "--enable-es1370" "--enable-ne2000" diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix index 4a5418a320..1c46aea7f9 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; outputs = [ "out" "dev" "doc" ]; - separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; + separateDebugInfo = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "musl"; nativeBuildInputs = [ autoreconfHook @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { # `gctest` fails under x86_64 emulation on aarch64-darwin # and also on aarch64-linux (qemu-user) - doCheck = !((stdenv.isDarwin && stdenv.isx86_64) || (stdenv.isLinux && stdenv.isAarch64)); + doCheck = !((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)); enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boilr/0001-update-time.patch b/third_party/nixpkgs/pkgs/by-name/bo/boilr/0001-update-time.patch new file mode 100644 index 0000000000..334d0fe1e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bo/boilr/0001-update-time.patch @@ -0,0 +1,287 @@ +From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 23 Sep 2024 15:11:09 +0800 +Subject: [PATCH] update time + +--- + Cargo.lock | 87 +++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 56 insertions(+), 31 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index be4fbeb..42f29b8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -809,6 +809,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derivative" + version = "2.2.0" +@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2002,6 +2011,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2308,7 +2323,7 @@ dependencies = [ + "pest_meta", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2389,6 +2404,12 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -2407,9 +2428,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.57" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -2425,9 +2446,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.27" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2711,22 +2732,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2981,9 +3002,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.16" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3061,11 +3082,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.21" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -3073,16 +3097,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3443,7 +3468,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix index d7e95b5a8b..83a83011c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, clangStdenv -, gtk3 -, xorg -, perl -, openssl -, speechd-minimal -, libxkbcommon -, libGL -, wayland +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + clangStdenv, + gtk3, + xorg, + perl, + openssl, + speechd-minimal, + libxkbcommon, + libGL, + wayland, }: let rpathLibs = [ @@ -38,11 +39,15 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { src = fetchFromGitHub { owner = "PhilipK"; repo = "BoilR"; - rev = "v.${version}"; + rev = "refs/tags/v.${version}"; hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; }; - cargoHash = "sha256-nAZU1xVpeRXubotla4I6InGMH4lisPMOnoqaK5mBPCM="; + cargoPatches = [ + ./0001-update-time.patch + ]; + + cargoHash = "sha256-09vPP+kNrmk0nN3Bdn9T7QjvuZvJeqQ56lCQIFb+Zrs="; nativeBuildInputs = [ perl ]; @@ -57,10 +62,12 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { dontPatchELF = true; meta = { - description = - "Automatically adds (almost) all your games to your Steam library (including image art)"; + description = "Automatically adds (almost) all your games to your Steam library (including image art)"; homepage = "https://github.com/PhilipK/BoilR"; - license = with lib.licenses; [ asl20 mit ]; + license = with lib.licenses; [ + asl20 + mit + ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ foolnotion ]; mainProgram = "boilr"; diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boinctui/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boinctui/package.nix index faf8ca709d..eca32ef377 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boinctui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boinctui/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; outputs = [ "out" "man" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/by-name/br/brainflow/package.nix b/third_party/nixpkgs/pkgs/by-name/br/brainflow/package.nix index a347712c05..e2c6726696 100644 --- a/third_party/nixpkgs/pkgs/by-name/br/brainflow/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/br/brainflow/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bluez, cmake, dbus, diff --git a/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix b/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix index 848f5406c1..6b271c571e 100644 --- a/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix @@ -21,25 +21,25 @@ let # fix for: https://github.com/NixOS/nixpkgs/issues/272156 buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildNpmPackage' rec { pname = "bruno"; - version = "1.28.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-SLND+eEEMFVHE5XPt2EKkJ+BjENqvUSrWkqnC6ghUBI="; + hash = "sha256-UXxMHTunsKXXt0NX5fuyzQbtp4AUzLXnFHqe8Is6Cmc="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-RFn7Bbx1xMm4gt++lhPflXjEfTIgmls2TkrJ8Ta2qpI="; + npmDepsHash = "sha256-p3kdYuDiPZ9SmtrFajXd76Ohd+VUqn/Y8SpAPFrTBZA="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = @@ -47,7 +47,7 @@ buildNpmPackage' rec { (writeShellScriptBin "phantomjs" "echo 2.1.1") pkg-config ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ makeWrapper copyDesktopItems ]; @@ -58,7 +58,7 @@ buildNpmPackage' rec { cairo pango ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreText ]; @@ -100,7 +100,7 @@ buildNpmPackage' rec { pushd packages/bruno-electron ${ - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' cp -r ${electron.dist}/Electron.app ./ find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw @@ -136,7 +136,7 @@ buildNpmPackage' rec { ${ - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications diff --git a/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix index bb0e762e46..03bbb66e55 100644 --- a/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; makeFlags = [ "CC=$(CXX)" diff --git a/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix index c4139ebe58..51c5e1486d 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bulk_extractor/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bulk_extractor/package.nix index 58bbb1edd6..25d38c6c35 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/bulk_extractor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/bulk_extractor/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { aclocal -I m4 ''; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/be20_api/feature_recorder_set.cpp --replace-fail '#warn ' '#warning ' ''; diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bulloak/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bulloak/package.nix index dc8584fb67..6b395068e9 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/bulloak/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/bulloak/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lj/wmLu4cBjDjzMD8DlIz+6Rnag0h+zWiE7lfcTC7lY="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; # tests run in CI on the source repo doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bunbun/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bunbun/package.nix index ab90682778..2d042f08d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/bunbun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/bunbun/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CcGfaSyCMv0Wm4QsYASBwEnpX8fKbLHRqyEcUmj2w2o="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreFoundation diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bup/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bup/package.nix index 91fb2b3c3f..c9fe398661 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/bup/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/bup/package.nix @@ -23,7 +23,7 @@ let setuptools tornado ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pyxattr pylibacl fuse diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix index a6e3e64747..876d63ff01 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4="; }; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. # The vendored gettext does not build with clang 16. GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation libiconv ]; diff --git a/third_party/nixpkgs/pkgs/by-name/by/byedpi/package.nix b/third_party/nixpkgs/pkgs/by-name/by/byedpi/package.nix index d081c059dc..bf8a27e8e2 100644 --- a/third_party/nixpkgs/pkgs/by-name/by/byedpi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/by/byedpi/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "byedpi"; - version = "0.13.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Sf5Ik8+9nKhum4/faGf44Y/gQggldyRsFUVmd9XPKOA="; + hash = "sha256-JdL+3ETNxaEtOLUhgLSABL9C8w/EM4Ay37OXU5jLCFA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix b/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix index c6a3645f8b..29cb68b1f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Carbon diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cadzinho/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cadzinho/package.nix index 6b24ef5a18..5a12cd1e54 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cadzinho/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cadzinho/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace-fail "-lGLEW" "-lGLEW -lSDL2_net" ''; - nativeBuildInputs = lib.optional stdenv.isDarwin desktopToDarwinBundle; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ SDL2 SDL2_net glew lua5_4 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ "-I${SDL2.dev}/include/SDL2" "-I${SDL2_net.dev}/include/SDL2" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/llvm/llvm-project/issues/62254 "-fno-builtin-strrchr" ]); diff --git a/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix index 59cffb1328..35061f3f7f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.40.0"; + version = "0.41.0"; cli = fetchurl { - url = "https://storage.googleapis.com/caido-releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-G8sg+3Cp9QkSiiZ810z4jCfGvEJUFLorKT0JmHrO6Ao="; + url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; + hash = "sha256-aQhax0efp5L3JNqGsOWsoO6z5pVVc/rxlz+5mvZoPNU="; }; desktop = fetchurl { - url = "https://storage.googleapis.com/caido-releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-iNhitCNc221pYwcG+07GvP+bnTdtQGFjsloQ5Pth2l0="; + url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; + hash = "sha256-DgXxOOWaLJG1h1nB+mkw77APh06WiJo9V9ZFCiWeha8="; }; appimageContents = appimageTools.extractType2 { inherit pname version; @@ -33,13 +33,14 @@ let src = desktop; inherit pname version; + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.libthai ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/caido.png \ $out/share/icons/hicolor/512x512/apps/caido.png - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/caido \ --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix index 6cb36421ea..d957b2c79a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { }; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Cocoa IOKit diff --git a/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix index e6e2106b38..f164af42b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix @@ -40,7 +40,7 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/caprine cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/caprine @@ -53,7 +53,7 @@ buildNpmPackage rec { install -Dm644 build/icon.png $out/share/icons/hicolor/512x512/apps/caprine.png ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"Caprine.app" $out/Applications makeWrapper "$out/Applications/Caprine.app/Contents/MacOS/Caprine" $out/bin/caprine diff --git a/third_party/nixpkgs/pkgs/by-name/ca/capslock/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/capslock/package.nix index b9290fed59..06746e1b65 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/capslock/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/capslock/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "capslock"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; rev = "v${version}"; - hash = "sha256-xeezGU9bI1MwonSGv+XimSfboMQr/1TPMTduDQ+MP1g="; + hash = "sha256-w2dB8DUCjbuzdEfX4nmaGbf9TZH58t+NZtyMoBHVG8I="; }; - vendorHash = "sha256-Z4oj+af8jqqhgHQrTb+lkbIMMa/yOnvkMti/s+wiQsI="; + vendorHash = "sha256-ZRDoKB3/oxJhVFNWT71sKu8WbvIUyvXNKY1hD8ljo5U="; subPackages = [ "cmd/capslock" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-bump/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bump/package.nix index 0de63ed203..e40d79a140 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-bump/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bump/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/package.nix index acfc59829e..c29825cb86 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/package.nix @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]); nativeBuildInputs = [ pkg-config ] # curl-sys wants to run curl-config on darwin - ++ lib.optionals stdenv.isDarwin [ curl.dev ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ]; # skip tests with networking or other failures checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-i18n/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-i18n/package.nix index 43b353ed4d..0665e8860b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-i18n/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-i18n/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-vN62QmCuhu7AjL6xSpBU6/ul4WgNLZbjWDCFyHj6rIM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix index dcb87ba967..fe7f950fce 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl curl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix index 4a90d4af78..b556213338 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix index a0b4fd0ace..ca381ef562 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix @@ -36,9 +36,9 @@ rustPlatform.buildRustPackage { libgit2 openssl curl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } # https://github.com/google/cargo-raze/issues/544 ulimit -n 1024 diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix index 131a6eb70f..105104e9b4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AARkXr6qOq9u/nmcmCnA4P+Q+MPPChCXoRaYiLwCNPs="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix index 9ff861190d..8eaa824708 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.2"; + version = "1.1.3"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-JnQrQBx9VuXI0wj1mMLfl15lxC85f1kUBucgC3Q8F0c="; + hash = "sha256-xKO/57yvHSGzjWyDPu1DmI9eeDESyFgMschqK+OLUMs="; }; - cargoHash = "sha256-iFcW9REkEolrDDbEwoepUSO79OgUdsLUhSkk12y4yxk="; + cargoHash = "sha256-lwPD46irkBg+Xg9/d07Q6BPk2rzKYkj3114EiMbbd+U="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-unfmt/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-unfmt/package.nix index 3a2a16dfaa..e53cc07c33 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-unfmt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-unfmt/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-mMeHTYCUIZR3jVvTxfyH4I9wGfUdCWcyn9djnksAY8k="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; # Doc tests are broken on 0.3.3 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-vibe/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-vibe/package.nix index 4caaa82326..ba7a5882b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-vibe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-vibe/package.nix @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec { dbus openssl ] - ++ lib.optional stdenv.isLinux udev - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit IOKit CoreBluetooth ]); + ++ lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit IOKit CoreBluetooth ]); meta = with lib; { description = "Cargo x Buttplug.io"; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-wasi/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-wasi/package.nix index b0fe56c9fb..a42b98da20 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-wasi/package.nix @@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix index 78c6c9933e..4f3b16c4dd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xVG1nET020rfMIjhIcCtNr9ZCj8SgQAvXePjyKSPjUs="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo2junit/0001-update-time-rs.patch b/third_party/nixpkgs/pkgs/by-name/ca/cargo2junit/0001-update-time-rs.patch new file mode 100644 index 0000000000..a76deea7a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo2junit/0001-update-time-rs.patch @@ -0,0 +1,154 @@ +From 84e19417eb0c7768922cd5e05bc246b278c64ce2 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 24 Sep 2024 21:12:03 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 61 ++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 43 insertions(+), 18 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index c56ff81..b20dca4 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -28,6 +28,15 @@ dependencies = [ + "strip-ansi-escapes", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derive-getters" + version = "0.2.0" +@@ -64,20 +73,32 @@ version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "proc-macro2" +-version = "1.0.55" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.26" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -107,22 +128,22 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + + [[package]] + name = "serde" +-version = "1.0.159" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.159" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.13", ++ "syn 2.0.77", + ] + + [[package]] +@@ -158,9 +179,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.13" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -184,16 +205,19 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.13", ++ "syn 2.0.77", + ] + + [[package]] + name = "time" +-version = "0.3.20" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -201,16 +225,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.0" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.8" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo2junit/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo2junit/package.nix similarity index 75% rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo2junit/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/cargo2junit/package.nix index 907d92e3c4..f2aac9a191 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo2junit/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo2junit/package.nix @@ -1,4 +1,8 @@ -{ fetchCrate, lib, rustPlatform }: +{ + fetchCrate, + lib, + rustPlatform, +}: rustPlatform.buildRustPackage rec { pname = "cargo2junit"; @@ -9,7 +13,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; }; - cargoHash = "sha256-u5Pd967qxjqFl9fV/KkClLDBwKql7p66WqbIVBvWKuM="; + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + + cargoHash = "sha256-ncRELlbT8Dy8huLgZrroRWohCLeN5cRjMWrIW4JNcCM="; meta = with lib; { description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)"; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix index dda1eed048..0f1f3e3d7a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { "if (SWIG_IMPORT)" \ "if (NOT SWIG_IMPORT)" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # this is only printing stuff, and is not defined on all CPU substituteInPlace casadi/interfaces/hpipm/hpipm_runtime.hpp --replace-fail \ "d_print_exp_tran_mat" \ @@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.numpy python3Packages.python ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages_17.openmp ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages_17.openmp ]; cmakeFlags = [ (lib.cmakeBool "WITH_PYTHON" pythonSupport) diff --git a/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix index 88cbbec87c..c0fe17a1d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 llvm zlib - ] ++ lib.optionals (!stdenv.isDarwin) [ libclang ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libclang ]; cmakeFlags = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SPHINX_HTML" withHTML) (lib.cmakeBool "SPHINX_MAN" withManual) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") ]; diff --git a/third_party/nixpkgs/pkgs/by-name/cb/cbeams/package.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbeams/package.nix new file mode 100644 index 0000000000..c5278cdbf8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cb/cbeams/package.nix @@ -0,0 +1,44 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "cbeams"; + version = "1.0.3"; + pyproject = true; + + disabled = !python3Packages.isPy3k; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8Q2sWsAc39Mu34K1wWOKOJERKzBStE4GmtuzOs2T7Kk="; + }; + + build-system = [ python3Packages.setuptools ]; + + postPatch = '' + substituteInPlace cbeams/terminal.py \ + --replace-fail "blessings" "blessed" + ''; + + pythonRemoveDeps = [ "blessings" ]; + + dependencies = with python3Packages; [ + blessed + docopt + ]; + + doCheck = false; # no tests + + meta = { + homepage = "https://github.com/tartley/cbeams"; + description = "Command-line program to draw animated colored circles in the terminal"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + oxzi + sigmanificient + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cb/cbftp/package.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbftp/package.nix index 5709acb02d..73e11f27b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/cb/cbftp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cb/cbftp/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - makeFlags = lib.optional stdenv.isDarwin "OPTFLAGS=-O0"; + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "OPTFLAGS=-O0"; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/cc/ccache/package.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccache/package.nix index 9984771b7c..c30543cdbd 100644 --- a/third_party/nixpkgs/pkgs/by-name/cc/ccache/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cc/ccache/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { # test/run requires the compgen function which is available in # bashInteractive, but not bash. bashInteractive - ] ++ lib.optional stdenv.isDarwin xcodebuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcodebuild; checkInputs = [ doctest @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { [ "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test.basedir" "test.fileclone" # flaky on hydra (possibly filesystem-specific?) "test.multi_arch" diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/package.nix b/third_party/nixpkgs/pkgs/by-name/cc/cctools/package.nix index 2ab074def6..c56f79b69e 100644 --- a/third_party/nixpkgs/pkgs/by-name/cc/cctools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/package.nix @@ -132,8 +132,8 @@ stdenv.mkDerivation (finalAttrs: { ld64 llvm ] - ++ lib.optionals stdenv.isDarwin [ darwin.objc4 ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.objc4 ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; mesonBuildType = "release"; diff --git a/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix index c500e095d1..07a2656299 100644 --- a/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdecl"; - version = "18.3"; + version = "18.4.1"; src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; rev = "refs/tags/cdecl-${finalAttrs.version}"; - hash = "sha256-w6n/7oAl6D7cBG/YIauhjFjHs+ygF3ugKWv0lgY1G9Q="; + hash = "sha256-GtNB55zFIpt6yYE3olC3yQr2RLsS9AMewzJKDcb67GM="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ce/centerpiece/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/centerpiece/package.nix index 784945da7c..7d7c7512d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ce/centerpiece/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ce/centerpiece/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { libXrandr ]); - postFixup = lib.optional stdenv.isLinux '' + postFixup = lib.optional stdenv.hostPlatform.isLinux '' rpath=$(patchelf --print-rpath $out/bin/centerpiece) patchelf --set-rpath "$rpath:${ lib.makeLibraryPath [ diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chatd/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chatd/package.nix index 692e7d7529..ad8a222ac8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chatd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chatd/package.nix @@ -67,15 +67,17 @@ buildNpmPackage rec { find $out/share/chatd/node_modules -name '*.exe' -or -name '*.dll' -or -name '*.pdb' -delete rm -rf ${ lib.concatStringsSep " " ( - (lib.optional (!stdenv.isx86_64) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64") + (lib.optional ( + !stdenv.hostPlatform.isx86_64 + ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64") ++ (lib.optional ( - !stdenv.isAarch64 + !stdenv.hostPlatform.isAarch64 ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/arm64") ++ (lib.optional ( - !stdenv.isDarwin + !stdenv.hostPlatform.isDarwin ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/darwin") ++ (lib.optional ( - !stdenv.isLinux + !stdenv.hostPlatform.isLinux ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/linux") ) } diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chawan/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chawan/package.nix index 7a847adb1b..d6ffc1d3dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chawan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chawan/package.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jtbx ]; mainProgram = "cha"; - broken = stdenv.isDarwin; # pending PR #292043 + broken = stdenv.hostPlatform.isDarwin; # pending PR #292043 }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chirp/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chirp/package.nix index b7ca907e54..7026312d5c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chirp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chirp/package.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "0.4.0-unstable-2024-09-05"; + version = "0.4.0-unstable-2024-09-19"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "f9f5afa33388d3b05af75b40195b6a45a19df9a2"; - hash = "sha256-wpUtSXSmT9SgwKMYeto7jJGK7ZEFQ/t37wWjUMB86YQ="; + rev = "786e37ce269a4bf50bd7a75143479862f52c0eeb"; + hash = "sha256-+vY4d4z5oqrhPqokSGwCCP/oNz0al3+91akisSESXGk="; }; buildInputs = [ glib diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix index a233e2352d..e080ee6c05 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chow-tape-model/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? # error: no matching function for call to 'juce::dsp::SIMDRegister::SIMDRegister(xsimd::simd_batch_traits >::batch_bool_type)' - broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 + broken = stdenv.hostPlatform.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 mainProgram = "CHOWTapeModel"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-common/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-common/package.nix index ae9f77416a..cb37c0a8dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-common/package.nix @@ -18,7 +18,6 @@ , gtk3 , intltool , json-glib -, callPackage , libstartup_notification , libXtst , libXdamage diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-control-center/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-control-center/package.nix index b5a98a9090..2c9308f15a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -18,7 +18,6 @@ , networkmanager , libgudev , libwacom -, gnome , wrapGAppsHook3 , tzdata , glibc diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix index 7234d00d9c..0969fb1123 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix @@ -1,6 +1,5 @@ { lib , runCommand -, nixos-artwork , glib , gnome-terminal , gtk3 diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-session/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-session/package.nix index 79dd3e555d..790e0cfe6e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinnamon-session/package.nix @@ -8,7 +8,6 @@ , gtk3 , libcanberra , libxslt -, makeWrapper , meson , ninja , pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix index fabda88152..643b7017de 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -27,7 +27,7 @@ buildNpmPackage rec { # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" + stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildNpmPackage rec { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix index d28d85c99a..a77ea92b65 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.126.0"; + version = "0.126.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-9HjZI3MQBI24Ut3CI2hMOlRtZExoJtMXfd/HmSSICx0="; + hash = "sha256-A894AUmsJjCCvN6cI2qoTPyOeQx6h2uukzxtlvWZVn8="; }; vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw="; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix index ec1f034996..6bc82b7c07 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { yaml-cpp ]; - cmakeFlags = if debug then [ "-DCMAKE_BUILD_TYPE=Debug" ] else [ ]; + cmakeBuildType = if debug then "Debug" else "Release"; clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge/package.nix deleted file mode 100644 index 9d9aca7cb1..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge/package.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchurl -, dpkg -, wrapGAppsHook3 -, autoPatchelfHook -, clash-meta -, openssl -, webkitgtk -, udev -, libayatana-appindicator -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "clash-verge"; - version = "1.3.8"; - - src = fetchurl { - url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-kOju4yaa+EKzFWDrk0iSJVoWkQMBjQG3hKLfAsqlsy8="; - }; - - nativeBuildInputs = [ - dpkg - wrapGAppsHook3 - autoPatchelfHook - ]; - - buildInputs = [ - openssl - webkitgtk - stdenv.cc.cc - ]; - - runtimeDependencies = [ - (lib.getLib udev) - libayatana-appindicator - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mv usr/* $out - - runHook postInstall - ''; - - postFixup = '' - rm -f $out/bin/clash - ln -sf ${lib.getExe clash-meta} $out/bin/${clash-meta.meta.mainProgram} - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Clash GUI based on tauri"; - homepage = "https://github.com/zzzgydi/clash-verge"; - platforms = [ "x86_64-linux" ]; - license = licenses.gpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ zendo ]; - mainProgram = "clash-verge"; - }; -} diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clickable/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clickable/package.nix index 53ef6c2dd4..0437aae995 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clickable/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clickable/package.nix @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec { ++ # There are no docker images available for the aarch64 architecutre # which are required for tests. - lib.optionals stdenv.isAarch64 [ + lib.optionals stdenv.hostPlatform.isAarch64 [ "test_arch" "test_restricted_arch" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix index 6c5bd77c89..b5d22c8b50 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-z2t7kq2ogMHJGF7xQnzc11B42gUZFTVokVkbw35CeY0="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index 5488a0f219..a6310b1a8c 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "cloudflare-dynamic-dns"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; rev = "refs/tags/${version}"; - hash = "sha256-SuDiR/saqxgfnEku31tjAtahWNg+5wFriD0F2FPkEEo="; + hash = "sha256-zmcNr1r0lx5RclZtc5LX6v07IjhFAKaNnIOeDTWhfVQ="; }; - vendorHash = "sha256-vHlBZOeJ0oZZ4zjy4UycbdiMGzEpGRqT7v3q0hDz28M="; + vendorHash = "sha256-L2XtIZE5D1ehoEE45Ig/IMcQS/JgKSxFmMALkNwWDCA="; subPackages = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/cloudlogoffline/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudlogoffline/package.nix index 04e6f0ed2c..027e91d5eb 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/cloudlogoffline/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/cloudlogoffline/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (self: { qt6.qmake qt6.wrapQtAppsHook ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; @@ -33,16 +33,16 @@ stdenv.mkDerivation (self: { ]; postPatch = let - targetDir = if stdenv.isDarwin then "Applications" else "bin"; + targetDir = if stdenv.hostPlatform.isDarwin then "Applications" else "bin"; in '' substituteInPlace CloudLogOffline.pro \ --replace 'target.path = /opt/$''${TARGET}/bin' "target.path = $out/${targetDir}" ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -d $out/share/pixmaps install -m644 images/logo_circle.svg $out/share/pixmaps/cloudlogoffline.svg - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # FIXME: For some reason, the Info.plist isn't copied correctly to # the application bundle when building normally, instead creating an # empty file. This doesn't happen when building in a dev shell with @@ -53,7 +53,7 @@ stdenv.mkDerivation (self: { install -m644 macos/Info.plist $out/Applications/CloudLogOffline.app/Contents/Info.plist ''; - desktopItems = lib.optionals (!stdenv.isDarwin) [ + desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [ (makeDesktopItem { name = "cloudlogoffline"; desktopName = "CloudLogOffline"; diff --git a/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix index ca0f1789a1..82563e56c2 100644 --- a/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix @@ -25,7 +25,7 @@ isBootstrap else false) , useOpenSSL ? !isMinimalBuild -, useSharedLibraries ? (!isMinimalBuild && !stdenv.isCygwin) +, useSharedLibraries ? (!isMinimalBuild && !stdenv.hostPlatform.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" , buildDocs ? !(isMinimalBuild || (uiToolkits == [])) , darwin @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./003-libuv-application-services.diff ] - ++ lib.optional stdenv.isCygwin ./004-cygwin.diff + ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff + ++ lib.optional (stdenv.hostPlatform.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. - ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff + ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. - ++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) ( + ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) ( substituteAll { src = ./007-darwin-bsd-ps-abspath.diff; ps = lib.getExe ps; @@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses ++ lib.optional qt5UI qtbase - ++ lib.optional stdenv.isDarwin CoreServices - ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; + ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices + ++ lib.optional (stdenv.hostPlatform.isDarwin && !isMinimalBuild) SystemConfiguration; preConfigure = '' fixCmakeFiles . @@ -207,6 +207,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ]; platforms = lib.platforms.all; mainProgram = "cmake"; - broken = (qt5UI && stdenv.isDarwin); + broken = (qt5UI && stdenv.hostPlatform.isDarwin); }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix b/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix index a2f9a62ce3..a24860fb4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix @@ -11,11 +11,11 @@ }: let pname = "cursor"; - version = "0.40.4"; + version = "0.41.1"; appKey = "230313mzl4w4u92"; src = fetchurl { - url = "https://download.todesktop.com/${appKey}/cursor-0.40.4-build-2409052yfcjagw2-x86_64.AppImage"; - hash = "sha256-ZURE8UoLPw+Qo1e4xuwXgc+JSwGrgb/6nfIGXMacmSg="; + url = "https://download.todesktop.com/${appKey}/cursor-0.41.1-build-2409189xe3envg5-x86_64.AppImage"; + hash = "sha256-9zqktOR5UOMLkKLD1uJ8eNSujWnnyKAN9H8ejrgcfVU="; }; appimageContents = appimageTools.extractType2 { inherit version pname src; }; in @@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation { latestLinux="$(curl -s https://download.todesktop.com/${appKey}/latest-linux.yml)" version="$(echo "$latestLinux" | yq -r .version)" filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')" - update-source-version cursor "$version" "" "https://download.todesktop.com/${appKey}/$filename" --source-key=src.src + update-source-version code-cursor "$version" "" "https://download.todesktop.com/${appKey}/$filename" --source-key=src.src ''; }); }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/code2prompt/package.nix b/third_party/nixpkgs/pkgs/by-name/co/code2prompt/package.nix index f951b2b1e2..03c5e6e7b0 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/code2prompt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/code2prompt/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.AppKit ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix index 825731d4d1..2d89eaed91 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( let d = darwin.apple_sdk.frameworks; in diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix index 679050b5cc..1807519b22 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; - nativeBuildInputs = [ gzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ gzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontUnpack = true; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/co/comet-gog/package.nix b/third_party/nixpkgs/pkgs/by-name/co/comet-gog/package.nix index 35677d4bf0..f601930057 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/comet-gog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/comet-gog/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { env.PROTOC = lib.getExe' protobuf "protoc"; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/committed/package.nix b/third_party/nixpkgs/pkgs/by-name/co/committed/package.nix index cd42172fde..229414b14f 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/committed/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/committed/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { }; cargoHash = "sha256-AmAEGVWq6KxLtiHDGIFVcoP1Wck8z+P9mnDy0SSSJNM="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; passthru = { tests.version = testers.testVersion { package = committed; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix b/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix index 87b875ab33..af02f0d7c6 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "compose2nix"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "aksiksi"; repo = "compose2nix"; rev = "v${version}"; - hash = "sha256-2t4pXTzd5TDpAOzNS8MfnE9p8Rm55OPLaEpSPF4/UbE="; + hash = "sha256-qN7MFw6JKBbzwiqURkZ3or/8hT29mRpfITovSHdzDEY="; }; - vendorHash = "sha256-SwJzyOXE23BLoJ+efFuSIhDTMjirEUmBhGGmgrnKhXw="; + vendorHash = "sha256-yGBdsej6DjRMWzS13WyqCLaY5M/N9BrMARAM3oHsc+s="; passthru.tests = { version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix b/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix index 6ddfd98bc7..3a08789bef 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch - , meson , ninja , go-md2man diff --git a/third_party/nixpkgs/pkgs/by-name/co/conduwuit/package.nix b/third_party/nixpkgs/pkgs/by-name/co/conduwuit/package.nix index 1fd8e9b3e3..733b502246 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/conduwuit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/conduwuit/package.nix @@ -14,17 +14,17 @@ # upstream conduwuit enables jemalloc by default, so we follow suit enableJemalloc ? true, rust-jemalloc-sys, - enableLiburing ? stdenv.isLinux, + enableLiburing ? stdenv.hostPlatform.isLinux, liburing, }: let rust-jemalloc-sys' = rust-jemalloc-sys.override { - unprefixed = !stdenv.isDarwin; + unprefixed = !stdenv.hostPlatform.isDarwin; }; rocksdb' = rocksdb.override { inherit enableLiburing; # rocksdb does not support prefixed jemalloc, which is required on darwin - enableJemalloc = enableJemalloc && !stdenv.isDarwin; + enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin; jemalloc = rust-jemalloc-sys'; }; in @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional enableJemalloc rust-jemalloc-sys' ++ lib.optional enableLiburing liburing - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/construct/package.nix b/third_party/nixpkgs/pkgs/by-name/co/construct/package.nix index eb2c922b31..89833c8176 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/construct/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/construct/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace g++ c++ ''; diff --git a/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix b/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix index cb22d5ef6e..a73f33f0bc 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "containerlab"; - version = "0.57.1"; + version = "0.57.3"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-b7Y65DCBDTyScGvYrz83ZN2oWN64ydoVXnssdnuZjQw="; + hash = "sha256-OSisVSfbOKBA1INrhj8DaWnHOEsLPwazp6NSXwAG3PU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/convco/package.nix b/third_party/nixpkgs/pkgs/by-name/co/convco/package.nix index 60b17d84c6..0f08aba98a 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/convco/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/convco/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Conventional commit cli"; diff --git a/third_party/nixpkgs/pkgs/by-name/co/convmv/package.nix b/third_party/nixpkgs/pkgs/by-name/co/convmv/package.nix index 65fbd85e37..e89b4250ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/convmv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/convmv/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { # testsuite.tar contains filenames that aren't valid UTF-8. Extraction of # testsuite.tar will fail as APFS enforces that filenames are valid UTF-8. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; prePatch = lib.optionalString finalAttrs.doCheck '' diff --git a/third_party/nixpkgs/pkgs/by-name/co/cook-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cook-cli/package.nix index fbebd0d7fb..846d3fb527 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cook-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cook-cli/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; postPatch = '' rm -rf "ui/public" diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/package.nix index 809010c31e..c3bc5db415 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/package.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-applets"; description = "Applets for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-applibrary/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applibrary/package.nix index 6402cd1d30..c7f26c5fde 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-applibrary"; description = "Application Template for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-app-library"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-bg/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-bg/package.nix index f0a81198f6..12ce7083c3 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-bg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-bg/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-bg"; description = "Applies Background for the COSMIC Desktop Environment"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-bg"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix index 5bd04bf2db..544c214894 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix @@ -94,7 +94,7 @@ rustPlatform.buildRustPackage rec { description = "Compositor for the COSMIC Desktop Environment"; mainProgram = "cosmic-comp"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-design-demo/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-design-demo/package.nix index 3de84af599..24dee44157 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-design-demo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-design-demo/package.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-design-demo"; description = "Design Demo for the COSMIC Desktop Environment"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-design-demo"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix index 2c8cd21562..40d6eb082d 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix @@ -105,7 +105,7 @@ rustPlatform.buildRustPackage rec { description = "Text Editor for the COSMIC Desktop Environment"; mainProgram = "cosmic-edit"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-files/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-files/package.nix index 3299472451..31f238b10d 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-files/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-files/package.nix @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-files"; description = "File Manager for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/package.nix index ecc9dea6ab..2a9473800b 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/package.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { description = "Greeter for the COSMIC Desktop Environment"; mainProgram = "cosmic-greeter"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix index ed8c4d3e64..23031d56b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "cosmic-icons"; - version = "1.0.0-alpha.1-unstable-2024-08-16"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "ea9e3b8cf12bfa7112b8be8390c0185888358504"; - hash = "sha256-KvEKFmsh7ljt9JbaqyZfTUiFZHZM2Ha1TwUDljXXLDw="; + rev = "341c84467fd863f0319cadf49b3d4bac1bf3029a"; + hash = "sha256-VA2QKuzTQBgubfjPXdpejFtZxqOZUXds/fZrfN6/8Nk="; }; nativeBuildInputs = [ just ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-launcher/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-launcher/package.nix index fe11ba0450..5ff34d7528 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-launcher/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { description = "Launcher for the COSMIC Desktop Environment"; mainProgram = "cosmic-launcher"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-notifications/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-notifications/package.nix index bae1f66e20..baf2dda64b 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-notifications/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-notifications"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' - substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" ''; nativeBuildInputs = [ just which pkg-config makeBinaryWrapper ]; @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { description = "Notifications for the COSMIC Desktop Environment"; mainProgram = "cosmic-notifications"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-osd/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-osd/package.nix index 80c64e4063..621ce9d767 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-osd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-osd/package.nix @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-osd"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-osd"; rev = "epoch-${version}"; hash = "sha256-JDdVFNTJI9O88lLKB1esJE4sk7ZZnTMilQRZSAgnTqs="; }; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/package.nix index 46404ed6fd..960d8d7314 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage { description = "Panel for the COSMIC Desktop Environment"; mainProgram = "cosmic-panel"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-protocols/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-protocols/package.nix index 1805d4b48f..f4ba351d5c 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-protocols/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pop-os/cosmic-protocols"; description = "Additional wayland-protocols used by the COSMIC desktop environment"; license = [ licenses.mit licenses.gpl3Only ]; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-randr/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-randr/package.nix index 0c3b5b752d..2c56734834 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-randr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-randr/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-randr"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-randr"; description = "Library and utility for displaying and configuring Wayland outputs"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-randr"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-screenshot/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-screenshot/package.nix index 1881ef8fb9..0319585a04 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-screenshot"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+yHpRbK+AWnpcGrC5U0wKbt0u8tm3CFGjKTCDQpb3G0="; }; - cargoHash = "sha256-d56y35npMPrQM0yF0ytNcOdMKBz9IQvEz37DNvKBBSk="; + cargoHash = "sha256-fzIVyxzNknEjGJoR9sgXkY+gyuTC0T4Sy513X8umbWA="; nativeBuildInputs = [ just pkg-config ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-screenshot"; description = "Screenshot tool for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-screenshot"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-session/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-session/package.nix index e7f2e9a474..19bdc5ab0f 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-session/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-session/package.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "cosmic-session"; maintainers = with maintainers; [ a-kenji - nyanbinary + nyabinary ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 8b0c9819ab..6db310e489 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Settings Daemon for the COSMIC Desktop Environment"; mainProgram = "cosmic-settings-daemon"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings/package.nix index 669b5403a0..5ab555f262 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-settings/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-settings"; description = "Settings for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-settings"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix index c2859ba558..5954f3a7e6 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-store"; description = "App Store for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix index 699c8a8564..02911fca4a 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-term"; description = "Terminal for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-term"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index b0fd28563c..beadf73856 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { description = "Workspaces Epoch for the COSMIC Desktop Environment"; mainProgram = "cosmic-workspaces"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/co/costa/package.nix b/third_party/nixpkgs/pkgs/by-name/co/costa/package.nix index 3dacce6550..fcc644edad 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/costa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/costa/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ scalapack ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + buildInputs = [ scalapack ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = [ mpi ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/coyim/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coyim/package.nix index 458ee764f1..b455220068 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/coyim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/coyim/package.nix @@ -34,6 +34,6 @@ buildGoModule { homepage = "https://coy.im/"; license = lib.licenses.gpl3; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix index a7fbe2a50e..d7ed4fb99c 100644 --- a/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); doInstallCheck = true; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/cp/cpuinfo/package.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpuinfo/package.nix index 5ee3e361ef..c57f6708b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/cp/cpuinfo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cp/cpuinfo/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_LIBS" true) ]; - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = { description = "Tools and library to detect essential for performance optimization information about host CPU"; diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix index c3d396a035..eb1eda130e 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/cr/cro-mag-rally/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/cro-mag-rally/package.nix index 781ddad7fd..93ca67f0a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/cro-mag-rally/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/cro-mag-rally/package.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall mkdir -p "$out/share/CroMagRally" diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crocoddyl/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crocoddyl/package.nix new file mode 100644 index 0000000000..a1a2837277 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cr/crocoddyl/package.nix @@ -0,0 +1,89 @@ +{ + blas, + cmake, + doxygen, + example-robot-data, + fetchFromGitHub, + ipopt, + lapack, + lib, + pinocchio, + pkg-config, + pythonSupport ? false, + python3Packages, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "crocoddyl"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "loco-3d"; + repo = "crocoddyl"; + rev = "v${finalAttrs.version}"; + hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; + }; + + outputs = [ + "out" + "doc" + ]; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + doxygen + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + + propagatedBuildInputs = + [ + blas + ipopt + lapack + ] + ++ lib.optionals (!pythonSupport) [ + example-robot-data + pinocchio + ] + ++ lib.optionals pythonSupport [ + python3Packages.example-robot-data + python3Packages.pinocchio + python3Packages.scipy + ]; + + cmakeFlags = [ + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport) + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + ]; + + prePatch = '' + substituteInPlace \ + examples/CMakeLists.txt \ + examples/log/check_logfiles.sh \ + --replace-fail /bin/bash ${stdenv.shell} + ''; + + doCheck = true; + pythonImportsCheck = [ "crocoddyl" ]; + checkInputs = lib.optionals pythonSupport [ python3Packages.scipy ]; + + meta = with lib; { + description = "Crocoddyl optimal control library"; + homepage = "https://github.com/loco-3d/crocoddyl"; + license = licenses.bsd3; + maintainers = with maintainers; [ + nim65s + wegank + ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/cr/cronutils/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/cronutils/package.nix index f1060ba2d2..8c2c3d5213 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/cronutils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/cronutils/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=$(out)" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-D_DARWIN_C_SOURCE" # runstat.c:81:81: error: format string is not a string literal "-Wno-format-nonliteral" diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crossplane-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crossplane-cli/package.nix index 204d89407d..f9391a02f6 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/crossplane-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "crossplane-cli"; - version = "1.16.1"; + version = "1.17.1"; src = fetchFromGitHub { owner = "crossplane"; repo = "crossplane"; rev = "v${version}"; - hash = "sha256-wRbQKpWEzos5fzzf1tUF2xQAlk8KIrhXJ/QZ9JKCa2M="; + hash = "sha256-zcORVw+6QUucxJkHx/QWOHn50fd4+Jp+ZtiGuwfEQ6I="; }; - vendorHash = "sha256-XzIDLtEP4wrz23Cewz1QFuS62F/XQr7JNoaPAQfanEs="; + vendorHash = "sha256-de9xt3aFmGDddwMO2GgKKKmSfvsfnpit3wUrBme//fI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix index 4a5e9236ef..21a8a5b8cb 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/cy/cyme/package.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyme/package.nix index d0ed49b7b2..f1a1ca496b 100644 --- a/third_party/nixpkgs/pkgs/by-name/cy/cyme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cy/cyme/package.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-bmVgl6E+MdjzM4wfhKHdii+58srAStRTYU+IP/OTqdU="; + hash = "sha256-DFO12ylrUIPxxOf3+sSXf/MN918U/IUeUfr72Lbnxvc="; }; - cargoHash = "sha256-dpdtjeejt+jfSlSN1NZeAWSMcDq8mOGAHTJlmBkp/4s="; + cargoHash = "sha256-uw+Z0F2NoU1BFGwsNaIKT9hWclhqmJK2se5mm0xUQyc="; nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # doctest that requires access outside sandbox "--skip=udev::hwdb::get" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # system_profiler is not available in the sandbox "--skip=test_run" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix b/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix index 6e8cf21d29..934b6d1dca 100644 --- a/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cz/czkawka/package.nix @@ -21,7 +21,7 @@ let buildRustPackage' = rustPlatform.buildRustPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; self = buildRustPackage' { diff --git a/third_party/nixpkgs/pkgs/by-name/da/darklua/package.nix b/third_party/nixpkgs/pkgs/by-name/da/darklua/package.nix index aa79d6048d..fd31987ff3 100644 --- a/third_party/nixpkgs/pkgs/by-name/da/darklua/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/darklua/package.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fYx+SQdQMnNSygr0/Y4zEPtqfQPZYmQUq3ndi1HlXuE="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/da/darktable/package.nix b/third_party/nixpkgs/pkgs/by-name/da/darktable/package.nix index 5ccb4d1b63..e3a32dba46 100644 --- a/third_party/nixpkgs/pkgs/by-name/da/darktable/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/darktable/package.nix @@ -106,17 +106,17 @@ stdenv.mkDerivation rec { libaom portmidi lua - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ colord colord-gtk libX11 ocl-icd - ] ++ lib.optional stdenv.isDarwin gtk-mac-integration + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; cmakeFlags = [ "-DBUILD_USERMANUAL=False" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DUSE_COLORD=OFF" "-DUSE_KWALLET=OFF" ]; @@ -127,8 +127,8 @@ stdenv.mkDerivation rec { # the wrappers: preFixup = let - libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; + libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.hostPlatform.isLinux ":${ocl-icd}/lib"; in '' for f in $out/share/darktable/kernels/*.cl; do diff --git a/third_party/nixpkgs/pkgs/by-name/da/darling-dmg/package.nix b/third_party/nixpkgs/pkgs/by-name/da/darling-dmg/package.nix index 4fca75a45b..3053982a64 100644 --- a/third_party/nixpkgs/pkgs/by-name/da/darling-dmg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/darling-dmg/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; CXXFLAGS = [ "-DCOMPILE_WITH_LZFSE=1" diff --git a/third_party/nixpkgs/pkgs/by-name/da/databricks-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/da/databricks-cli/package.nix index 6ef7fb8852..f0409ac390 100644 --- a/third_party/nixpkgs/pkgs/by-name/da/databricks-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/databricks-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "databricks-cli"; - version = "0.227.0"; + version = "0.228.1"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${version}"; - hash = "sha256-bmTPtxkVtGzjxgmXpIHus7vUUg3IKGWmlUT8iOU+dtM="; + hash = "sha256-zQ39PwVjyxOTo6P+RA4F20/28loMbu3Bprd4C3jgu5A="; }; - vendorHash = "sha256-ItcGzgGIDQOnAwUA/mPy+oNjChKPTVo7QK3gsidB1xQ="; + vendorHash = "sha256-SOeVIwMbx1eRzBvyfT3aaJOL7BCb745yezn1QYrf5vU="; excludedPackages = [ "bundle/internal" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbd/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbd/package.nix index 20658b4d71..1df459cb32 100644 --- a/third_party/nixpkgs/pkgs/by-name/db/dbd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/db/dbd/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" - ] ++ lib.optionals stdenv.isDarwin [ "darwin" ] ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.isDarwin) [ "unix" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "darwin" ] ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [ "unix" ]; meta = with lib; { description = "Netcat-clone, designed to be portable and offer strong encryption"; diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix index 4eafe0b9ab..9b5bf26200 100644 --- a/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.2.0"; + version = "24.2.1"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-N4r2immlH6B6rWluFX9abU5gnavPFY1ZoNtKpzCxwh4="; - aarch64-linux = "sha256-oRU+0iMLno1xIVI3NzeJfDrz5CuPlccICM/zpxRvV40="; - x86_64-darwin = "sha256-oUUof1HYeULP3qPr9mB69ZU83VuI4hJ09w03fjc+1Y4="; - aarch64-darwin = "sha256-JZfj0dgaqEndzyLgBwFrFebWxz7O/53qA9aTeOEWvLE="; + x86_64-linux = "sha256-U1KJxE1PzRRMvYw3jSYV2n6JuhzyL30le1HeY0kft1k="; + aarch64-linux = "sha256-AT/Xx+Hwu64sUfR1fS9nI+RTsIfdi9udF9TR9hbjnxg="; + x86_64-darwin = "sha256-hCIfBv6FaNoZiTvpx1UCdwBg15vq+ZsTG5upmbWXN0M="; + aarch64-darwin = "sha256-g0G6fqR75AoOEzlYr6MbTBL8aQ/hWQuFyw1G2w9/JlU="; }; in fetchurl { @@ -41,22 +41,22 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit hash; }; - sourceRoot = lib.optional stdenvNoCC.isDarwin "dbeaver.app"; + sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "dbeaver.app"; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (!stdenvNoCC.isDarwin) [ + ++ lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [ gnused wrapGAppsHook3 autoPatchelfHook ] - ++ lib.optionals stdenvNoCC.isDarwin [ undmg ]; + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg ]; dontConfigure = true; dontBuild = true; installPhase = - if !stdenvNoCC.isDarwin then + if !stdenvNoCC.hostPlatform.isDarwin then '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbgate/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbgate/package.nix index ab62dee5f3..58c88b65c0 100644 --- a/third_party/nixpkgs/pkgs/by-name/db/dbgate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/db/dbgate/package.nix @@ -40,7 +40,7 @@ let sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbqn/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbqn/package.nix index 832148c928..7ec4dea053 100644 --- a/third_party/nixpkgs/pkgs/by-name/db/dbqn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/db/dbqn/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres sternenseemann ]; inherit (jdk.meta) platforms; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin }; } # TODO: Processing app diff --git a/third_party/nixpkgs/pkgs/by-name/de/debase/package.nix b/third_party/nixpkgs/pkgs/by-name/de/debase/package.nix index d204f161d0..91061e5ad2 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/debase/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/debase/package.nix @@ -53,11 +53,13 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; installPhase = '' runHook preInstall - install -Dm755 build-${if stdenv.isDarwin then "mac" else "linux"}/release/debase $out/bin/debase + install -Dm755 build-${ + if stdenv.hostPlatform.isDarwin then "mac" else "linux" + }/release/debase $out/bin/debase runHook postInstall ''; @@ -65,9 +67,9 @@ stdenv.mkDerivation rec { makeFlags = [ "ARCHS=${ - if stdenv.isx86_64 then + if stdenv.hostPlatform.isx86_64 then "x86_64" - else if stdenv.isAarch64 then + else if stdenv.hostPlatform.isAarch64 then "arm64" else abort "unsupported system: ${stdenv.system}" diff --git a/third_party/nixpkgs/pkgs/by-name/de/deltachat-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/de/deltachat-desktop/package.nix index dd647ef0eb..78f7c75d4e 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/deltachat-desktop/package.nix @@ -53,13 +53,13 @@ buildNpmPackage rec { makeWrapper pkg-config python3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; buildInputs = [ deltachat-rpc-server - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/librusty_v8.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix rename to third_party/nixpkgs/pkgs/by-name/de/deno/librusty_v8.nix diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix similarity index 78% rename from third_party/nixpkgs/pkgs/development/web/deno/default.nix rename to third_party/nixpkgs/pkgs/by-name/de/deno/package.nix index c51adf84f6..3635f40277 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/package.nix @@ -1,28 +1,28 @@ -{ stdenv -, lib -, callPackage -, fetchFromGitHub -, rustPlatform -, cmake -, protobuf -, installShellFiles -, libiconv -, darwin -, librusty_v8 ? callPackage ./librusty_v8.nix { } -, +{ + stdenv, + lib, + callPackage, + fetchFromGitHub, + rustPlatform, + cmake, + protobuf, + installShellFiles, + libiconv, + darwin, + librusty_v8 ? callPackage ./librusty_v8.nix { }, }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.46.2"; + version = "1.46.3"; src = fetchFromGitHub { owner = "denoland"; - repo = pname; - rev = "v${version}"; - hash = "sha256-6rmAgGX7BnhbyDk0Pmp1uLBDywlK4cptTOfuvNhm0KE="; + repo = "deno"; + rev = "refs/tags/v${version}"; + hash = "sha256-AM6SjcIHo6Koxcnznhkv3cXoKaMy2TEVpiWe/bczDuA="; }; - cargoHash = "sha256-B+O2QYQDH+mqbnJhLumFWnv1b7dvnbpR7JG/3IS5tnI="; + cargoHash = "sha256-D+CZpb6OTzM5Il0k8GQB7qSONy4myE5yKlaSkLLqHT8="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -40,7 +40,10 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin ( - [ libiconv darwin.libobjc ] + [ + libiconv + darwin.libobjc + ] ++ (with darwin.apple_sdk_11_0.frameworks; [ Security CoreServices @@ -102,6 +105,14 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; mainProgram = "deno"; maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation. + # Should be fixed with darwin SDK refactor and can be revisited. + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/basic.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/basic.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/basic.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/basic.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/default.nix rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/default.nix diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/data.json b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/data.json similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/data.json rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/data.json diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/index.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/index.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/index.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-json/index.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/index.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-ts/index.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/index.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-ts/index.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/lib.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-ts/lib.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/lib.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/import-ts/lib.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/data.txt b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/read-file/data.txt similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/data.txt rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/read-file/data.txt diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/index.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/tests/read-file/index.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/index.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/tests/read-file/index.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/update/common.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/update/common.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/update/common.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/update/librusty_v8.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/update/librusty_v8.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/src.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/update/src.ts similarity index 100% rename from third_party/nixpkgs/pkgs/development/web/deno/update/src.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/update/src.ts diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/update.ts b/third_party/nixpkgs/pkgs/by-name/de/deno/update/update.ts similarity index 93% rename from third_party/nixpkgs/pkgs/development/web/deno/update/update.ts rename to third_party/nixpkgs/pkgs/by-name/de/deno/update/update.ts index 27e1d86ee8..5a219307c4 100755 --- a/third_party/nixpkgs/pkgs/development/web/deno/update/update.ts +++ b/third_party/nixpkgs/pkgs/by-name/de/deno/update/update.ts @@ -12,8 +12,8 @@ const nixpkgs = Deno.cwd(); // TODO: Read values from default.nix const owner = "denoland"; const repo = "deno"; -const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`; -const src = `${denoDir}/default.nix`; +const denoDir = `${nixpkgs}/pkgs/by-name/de/${repo}`; +const src = `${denoDir}/package.nix`; const librusty_v8 = `${denoDir}/librusty_v8.nix`; const architectures: Architecture[] = [ { nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" }, diff --git a/third_party/nixpkgs/pkgs/by-name/de/densify/package.nix b/third_party/nixpkgs/pkgs/by-name/de/densify/package.nix index 0b2e1c3143..b4f2797ba9 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/densify/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/densify/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, lib, python3Packages, - python3, gtk3, gobject-introspection, wrapGAppsHook3, diff --git a/third_party/nixpkgs/pkgs/by-name/de/dependency-track/0000-remove-frontend-download.patch b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/0000-remove-frontend-download.patch new file mode 100644 index 0000000000..6e68f1813c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/0000-remove-frontend-download.patch @@ -0,0 +1,44 @@ +diff --git a/pom.xml b/pom.xml +index 9988e765..906917c0 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -660,38 +660,13 @@ + maven-antrun-plugin + 3.1.0 + +- +- frontend-download +- prepare-package +- +- +- +- +- +- +- run +- +- +- +- frontend-extract +- prepare-package +- +- +- +- +- +- +- +- run +- +- + + frontend-resource-deploy + prepare-package + + + +- ++ + + + diff --git a/third_party/nixpkgs/pkgs/by-name/de/dependency-track/0001-add-junixsocket.patch b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/0001-add-junixsocket.patch new file mode 100644 index 0000000000..c6b0f9e76c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/0001-add-junixsocket.patch @@ -0,0 +1,17 @@ +diff --git a/pom.xml b/pom.xml +index 9988e765..f69576b4 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -457,6 +457,12 @@ + ${lib.testcontainers.version} + test + ++ ++ com.kohlschutter.junixsocket ++ junixsocket-core ++ 2.10.0 ++ pom ++ + + + diff --git a/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix new file mode 100644 index 0000000000..64f45f5c06 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix @@ -0,0 +1,113 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + jre_headless, + cyclonedx-cli, + makeWrapper, + maven, + nix-update-script, + nixosTests, +}: +let + version = "4.11.7"; + + frontend = buildNpmPackage { + pname = "dependency-track-frontend"; + inherit version; + + src = fetchFromGitHub { + owner = "DependencyTrack"; + repo = "frontend"; + rev = version; + hash = "sha256-hgBDzzG90gunnlZeektzdBIdatNjbkDVmNLbxjyxAXE="; + }; + + npmDepsHash = "sha256-veyt7fn4g/eh/+2CapQxlEssZP8cQXONpI6sSW299tk="; + forceGitDeps = true; + makeCacheWritable = true; + + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = [ "--ignore-scripts" ]; + }; +in + +maven.buildMavenPackage rec { + inherit version; + pname = "dependency-track"; + + src = fetchFromGitHub { + owner = "DependencyTrack"; + repo = "dependency-track"; + rev = version; + hash = "sha256-BMkn9WnUGs4RxH5I1QQ2UDrlo32JcbfjfFcOG5YogLI="; + }; + + patches = [ + ./0000-remove-frontend-download.patch + ./0001-add-junixsocket.patch + ]; + + mvnJdk = jre_headless; + mvnHash = "sha256-c/JwBiKsXuWbCm1dTCrVc+V/1G7Eii1mUW8xDyewyLs="; + manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; + buildOffline = true; + + mvnDepsParameters = lib.escapeShellArgs [ + "-Dmaven.test.skip=true" + "-P enhance" + "-P embedded-jetty" + ]; + + mvnParameters = lib.escapeShellArgs [ + "-Dmaven.test.skip=true" + "-P enhance" + "-P embedded-jetty" + "-P bundle-ui" + "-Dservices.bom.merge.skip=false" + "-Dlogback.configuration.file=${src}/src/main/docker/logback.xml" + "-Dcyclonedx-cli.path=${lib.getExe cyclonedx-cli}" + ]; + + preBuild = '' + mkdir -p frontend + cp -r ${frontend}/lib/node_modules/@dependencytrack/frontend/dist frontend/ + ''; + + afterDepsSetup = '' + mvn cyclonedx:makeBom -Dmaven.repo.local=$mvnDeps/.m2 \ + org.codehaus.mojo:exec-maven-plugin:exec@merge-services-bom + ''; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm644 target/dependency-track-*.jar $out/share/dependency-track/dependency-track.jar + makeWrapper ${jre_headless}/bin/java $out/bin/dependency-track \ + --add-flags "-jar $out/share/dependency-track/dependency-track.jar" + + runHook postInstall + ''; + + passthru = { + # passthru for nix-update + inherit (frontend) npmDeps; + tests = { + inherit (nixosTests) dependency-track; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain"; + homepage = "https://github.com/DependencyTrack/dependency-track"; + license = lib.licenses.asl20; + maintainers = lib.teams.cyberus.members; + mainProgram = "dependency-track"; + inherit (jre_headless.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/de/deploy-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/de/deploy-rs/package.nix index 9830785e6a..a4b85ff3dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/deploy-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/deploy-rs/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-lsW810bktMzHZIbuN3pz9N+IUcjNtE5J2AuB/G6pGWI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix b/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix index 58dff97c8b..c21b758b9a 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix @@ -14,18 +14,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.65.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Q1qQjIRyOeFr8qrZJZ1IkO12RM2hp4IxI1NI7WqpmZA="; + hash = "sha256-plIDK5nOvLKFlRVlPHgpjHPhIh0NAWHmbaKsnYCU/7k="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tN7qAvfYmDz5ZtgZL5+ZZtkuxZxvlS9FM3+dGl+daUQ="; + hash = "sha256-KSVr6RlBEeDAo8D+7laTN+pSH8Ukl6WTpeAULuG2fq8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix b/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix index 29c8333e41..b69d67556e 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix @@ -27,7 +27,7 @@ let doInstallCheck = false; }); - version = "1.1"; + version = "1.2"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -36,16 +36,16 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-7o2OBUwE51ZNMCBB4rg5LARc8S6C9vuzRXnqk3d/lN4="; + hash = "sha256-95MYldiApQ7gqoUa79yolPahudKmFv6B2HnF+ZqWiGI="; }; - cargoHash = "sha256-Yos8iOWfRJcOqbanskUg75cX05dvxWnq42NhmQt/jf4="; + cargoHash = "sha256-A2s+DXq00T0DCVXUHy2ZN6XvqpHy6PmL0H9l1NIfFVU="; buildAndTestSubdir = "devenv"; nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/de/dezoomify-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/de/dezoomify-rs/package.nix index c639c99b1b..b8f637088d 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/dezoomify-rs/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "dezoomify-rs"; - version = "2.12.5"; + version = "2.13.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "dezoomify-rs"; rev = "refs/tags/v${version}"; - hash = "sha256-PbtsrvNHo/SvToQJTTAPLoNDFotDPmSjr6C3IJZUjqU="; + hash = "sha256-uo0QTaAAbNYMidlWBauW+3hdd0snEWH+I5KQL6Vxgug="; }; - cargoHash = "sha256-K9LNommagWjVxOXq6YUE4eg/3zpj3+MR5BugGCcVUlA="; + cargoHash = "sha256-0T5zvd78l3ghop/KoIgXYoGssVV9F+ppJV2pWyLnwxo="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/di/diagrams-as-code/package.nix b/third_party/nixpkgs/pkgs/by-name/di/diagrams-as-code/package.nix index cbce445d63..fd748332c2 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/diagrams-as-code/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/diagrams-as-code/package.nix @@ -29,6 +29,7 @@ python3Packages.buildPythonPackage rec { pythonRelaxDeps = [ "diagrams" "pydantic" + "pyyaml" ]; pythonImportsCheck = [ "diagrams_as_code" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/di/dialog/package.nix b/third_party/nixpkgs/pkgs/by-name/di/dialog/package.nix index 23f75bb1c9..9ef3647299 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/dialog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/dialog/package.nix @@ -3,7 +3,7 @@ , fetchurl , libtool , ncurses -, enableShared ? !stdenv.isDarwin && !stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic , unicodeSupport ? true , withLibrary ? true }: diff --git a/third_party/nixpkgs/pkgs/by-name/di/diesel-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/di/diesel-cli/package.nix index 6dc17f197d..04f6100615 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/diesel-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/diesel-cli/package.nix @@ -44,8 +44,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security - ++ lib.optional (stdenv.isDarwin && mysqlSupport) libiconv + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security + ++ lib.optional (stdenv.hostPlatform.isDarwin && mysqlSupport) libiconv ++ lib.optional sqliteSupport sqlite ++ lib.optional postgresqlSupport postgresql ++ lib.optionals mysqlSupport [ diff --git a/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix b/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix index f7fe86ab9a..53ab3a0ed6 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite ] - ++ lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/di/disarchive/package.nix b/third_party/nixpkgs/pkgs/by-name/di/disarchive/package.nix index 9bc24e5315..8b908d40a6 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/disarchive/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/disarchive/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { guile-lzma ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ guile-quickcheck diff --git a/third_party/nixpkgs/pkgs/by-name/di/discord-gamesdk/package.nix b/third_party/nixpkgs/pkgs/by-name/di/discord-gamesdk/package.nix index 7f38bfd457..5d7a8185be 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/discord-gamesdk/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ (stdenv.cc.cc.libgcc or null) ]; - nativeBuildInputs = lib.optional stdenv.isLinux autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; installPhase = let diff --git a/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix b/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix index 1436404bd9..f7553a70fc 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix @@ -4,18 +4,18 @@ , fetchFromGitHub , bash , nix -, nixos-install-tools +, nixos-install , coreutils }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps="; + hash = "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { for i in disko disko-install; do sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" chmod 755 "$out/bin/$i" - wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools ]} + wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]} done runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/by-name/dm/dmd/generic.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmd/generic.nix index 51c8148320..cf8cae7b4f 100644 --- a/third_party/nixpkgs/pkgs/by-name/dm/dmd/generic.nix +++ b/third_party/nixpkgs/pkgs/by-name/dm/dmd/generic.nix @@ -37,7 +37,7 @@ let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; osname = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; @@ -106,9 +106,9 @@ stdenv.mkDerivation (finalAttrs: { rm dmd/compiler/test/dshell/test6952.d '' + lib.optionalString (lib.versionAtLeast version "2.092.2") '' substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)" ''; @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl tzdata - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; @@ -224,6 +224,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix b/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix index 11ddaace86..e4828191c0 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix @@ -16,7 +16,7 @@ let # Needed for x86_64-darwin buildDunePackage' = ocamlPackages.buildDunePackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildDunePackage' rec { diff --git a/third_party/nixpkgs/pkgs/by-name/do/docuum/package.nix b/third_party/nixpkgs/pkgs/by-name/do/docuum/package.nix index 3eae913da1..68409ca056 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/docuum/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/docuum/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { "--skip=format::tests::code_str_display" ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/third_party/nixpkgs/pkgs/by-name/do/dogedns/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dogedns/package.nix index 0c94a9506d..c6afe1ab78 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dogedns/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dogedns/package.nix @@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ installShellFiles pandoc ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = '' installShellCompletion completions/doge.{bash,fish,zsh} diff --git a/third_party/nixpkgs/pkgs/by-name/do/dopamine/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dopamine/package.nix index 0b05839f19..10a45cbb2b 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dopamine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dopamine/package.nix @@ -6,11 +6,11 @@ }: appimageTools.wrapType2 rec { pname = "dopamine"; - version = "3.0.0-preview.33"; + version = "3.0.0-preview.34"; src = fetchurl { url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-W8XkXnsP0AqYV0wznKe1dbPm2VuhoZWl03G7hib/uxE="; + hash = "sha256-K4dDYYzo2oMAZvlb25cQuh1G187efSyJfAA6jdCKaT0="; }; extraInstallCommands = diff --git a/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix index f4cab21b1b..d23466447e 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix @@ -80,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { speexdsp zlib-ng ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AudioUnit diff --git a/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix index ca2c269d72..f43fd1cf42 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; rev = "refs/tags/v${version}"; - hash = "sha256-UVev21LZ2y0C8BCSm6I8BTQziSDZUXP3A/ThOpKtsrQ="; + hash = "sha256-PdX8picIFqeZZCMP0ABoWpySERSy0leAvp0XyjTW1Rc="; }; - npmDepsHash = "sha256-ehWHIKYkSAkdTLGpBOU7lJoWNa5uv9Zy0+2qwnCv0m8="; + npmDepsHash = "sha256-lo+R0YP50FIN+syj6VqCeEBFr7EZ6NSVXAhafG5JsI0="; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/do/dotter/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dotter/package.nix index 402b94f044..68d55ffba4 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dotter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dotter/package.nix @@ -9,20 +9,22 @@ installShellFiles, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.2-unstable-2024-08-02"; + version = "0.13.3"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; - rev = "d5199df24e6db039c460fa37fe3279f89c3bfc63"; - hash = "sha256-8/drsrJq8mfrWvTCcNX0eoPHzywxQNuyRdxQE/zb8lA="; + rev = "v${version}"; + hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk="; }; - cargoHash = "sha256-+LBmswq2mvM0hb6wwCQMxL+C/TdpRGZQGufgsqC1KSQ="; + cargoHash = "sha256-LEOORHD0j+HVl/fB9Q2xVZ2AxZKsPE5SeOS1ZsKwTSo="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; nativeCheckInputs = [ which diff --git a/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix b/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix index fa15709d3c..766ce66b1d 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.17"; + version = "1.1.18"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-TKlhPvfnq62XWTo2twKO8hEjBZW0mWkKruXWhwirtR4="; + hash = "sha256-1lmDmtvkLMLxvF6ZTOShr5fsYN++Jm6+ngzgFyNjFn4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix b/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix index 7e639cc021..bd93b48262 100644 --- a/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dpp"; - version = "10.0.30"; + version = "10.0.31"; src = fetchFromGitHub { owner = "brainboxdotcc"; repo = "DPP"; rev = "v${finalAttrs.version}"; - hash = "sha256-FW1DKbVwPPlvLtv8XzpqaAZjS1y5hasq3Rhh2u08Sz0="; + hash = "sha256-IsgYGfPcqiJBQ1MM97jI7ksvc49ZcCn3i6/yMe8zLjY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ds/dssat/package.nix b/third_party/nixpkgs/pkgs/by-name/ds/dssat/package.nix index 7d57195dcd..4b40302c41 100644 --- a/third_party/nixpkgs/pkgs/by-name/ds/dssat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ds/dssat/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (final: { makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ glibc.static ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/dssat/" ]; @@ -69,6 +69,6 @@ stdenv.mkDerivation (final: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pcboy ]; platforms = lib.platforms.unix; - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/du/dub/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dub/package.nix index 1416b06fc1..c6782b4907 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dub/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dub/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postBuild ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix index 5e797cf97b..0ec5ac87ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ baloo ]; platforms = platforms.unix; mainProgram = "dublin-traceroute"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix index bf2c3632b2..4e6bad9004 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-gv6V5I9LPNfXyuopo8BaYRELxzTfNhTG1EBWoZ/4cpc="; + hash = "sha256-7OHghotSibkGRrcsh7CqZBp94FY6RKZvcn8QW+dTH1I="; }; - cargoHash = "sha256-t6w2XrMSm5g6dmYQ5gX+w8M3pPzWDytGY9uSuXYgnDA="; + cargoHash = "sha256-rlhfGw/b0HnV1Xl9VWIqEuyM9pq29O6bpaawk2hnG+o="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ SystemConfiguration ] diff --git a/third_party/nixpkgs/pkgs/by-name/du/dummyhttp/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dummyhttp/package.nix index 0676e970a8..59ca3d3344 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dummyhttp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dummyhttp/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bw0VlPHjNZkpLVJZrB3aaQGkwvQpkJGIn+hi0yn2M4s="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix index 122a9691c5..b1e1863581 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix @@ -24,7 +24,7 @@ }: let - stdenv' = if stdenv.isDarwin then llvmPackages_17.stdenv else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; opencascade-occt = opencascade-occt_7_6; in stdenv'.mkDerivation (finalAttrs: { @@ -45,7 +45,7 @@ stdenv'.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 libxml2 # for xmllints - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ cmake @@ -55,7 +55,7 @@ stdenv'.mkDerivation (finalAttrs: { libepoxy librsvg libspnav - (if stdenv.isLinux then libuuid else libossp_uuid) + (if stdenv.hostPlatform.isLinux then libuuid else libossp_uuid) opencascade-occt (python3.withPackages (pp: [ pp.pygobject3 diff --git a/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix index f01f65c862..c5dc4b04ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix @@ -23,7 +23,6 @@ , xorgproto , librsvg , testers -, dunst , withX11 ? true , withWayland ? true }: @@ -89,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "jq" "${lib.getExe jq}" ''; - passthru.tests.version = testers.testVersion { package = dunst; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Lightweight and customizable notification daemon"; diff --git a/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix index cf13173519..53b0955748 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix index 9a82a2a20b..144bfe3360 100644 --- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation ( mingwW64Stdenv = useWin32ThreadModel pkgsCross.mingwW64.stdenv; dxvk32 = - if stdenvNoCC.isDarwin then + if stdenvNoCC.hostPlatform.isDarwin then pkgsCross.mingw32.dxvk_1.override { stdenv = mingw32Stdenv; enableMoltenVKCompat = true; @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation ( pkgsCross.mingw32.dxvk_2.override { stdenv = mingw32Stdenv; }; dxvk64 = - if stdenvNoCC.isDarwin then + if stdenvNoCC.hostPlatform.isDarwin then pkgsCross.mingwW64.dxvk_1.override { stdenv = mingwW64Stdenv; enableMoltenVKCompat = true; diff --git a/third_party/nixpkgs/pkgs/by-name/dy/dyalog/package.nix b/third_party/nixpkgs/pkgs/by-name/dy/dyalog/package.nix index 2655e5b95c..1833320dd1 100644 --- a/third_party/nixpkgs/pkgs/by-name/dy/dyalog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dy/dyalog/package.nix @@ -51,14 +51,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dyalog"; - version = "19.0.49960"; + version = "19.0.50027"; shortVersion = lib.versions.majorMinor finalAttrs.version; src = assert !acceptLicense -> throw licenseDisclaimer; fetchurl { url = "https://download.dyalog.com/download.php?file=${finalAttrs.shortVersion}/linux_64_${finalAttrs.version}_unicode.x86_64.deb"; - hash = "sha256-WeIrwF6msiQGS6ltYWn6TN+v+aXK1cbJ1e11B6f0+2A="; + hash = "sha256-3uB102Hr0dmqAZj2ezLhsAdBotY24PWJfE7g5wSmKMA="; }; outputs = [ "out" ] ++ lib.optional enableDocs "doc"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dynamips/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dynamips/package.nix similarity index 56% rename from third_party/nixpkgs/pkgs/applications/emulators/dynamips/default.nix rename to third_party/nixpkgs/pkgs/by-name/dy/dynamips/package.nix index 1abc0dcf52..77f662acb6 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dynamips/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/dy/dynamips/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libelf -, libpcap -, nix-update-script +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + libelf, + libpcap, + nix-update-script, }: stdenv.mkDerivation rec { @@ -13,30 +14,40 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "GNS3"; - repo = pname; - rev = "v${version}"; + repo = "dynamips"; + rev = "refs/tags/v${version}"; hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libelf libpcap ]; - cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; + buildInputs = [ + libelf + libpcap + ]; + + cmakeFlags = [ + (lib.cmakeFeature "DYNAMIPS_CODE" "stable") + ]; passthru = { updateScript = nix-update-script { }; }; meta = with lib; { - inherit (src.meta) homepage; description = "Cisco router emulator"; longDescription = '' Dynamips is an emulator computer program that was written to emulate Cisco routers. ''; + homepage = "https://github.com/GNS3/dynamips"; + changelog = "https://github.com/GNS3/dynamips/releases/tag/v${version}"; license = licenses.gpl2Plus; mainProgram = "dynamips"; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ + primeos + anthonyroussel + ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ea/easytier/package.nix b/third_party/nixpkgs/pkgs/by-name/ea/easytier/package.nix new file mode 100644 index 0000000000..7deb797435 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ea/easytier/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + protobuf, + nix-update-script, + darwin, + withQuic ? false, # with QUIC protocol support +}: + +rustPlatform.buildRustPackage rec { + pname = "easytier"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "EasyTier"; + repo = "EasyTier"; + rev = "refs/tags/v${version}"; + hash = "sha256-7T6xdJrVTgg7rSTC2PaVTsBTgi14qJzaR6M8tRUL8OQ="; + }; + + cargoHash = "sha256-9wAGUVYKz7+Q8y+dmay8pEZnv7PikzuAoas/h5T3sLE="; + + nativeBuildInputs = [ protobuf ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildNoDefaultFeatures = stdenv.hostPlatform.isMips; + buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic"; + + doCheck = false; # tests failed due to heavy rely on network + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/EasyTier/EasyTier"; + changelog = "https://github.com/EasyTier/EasyTier/releases/tag/v${version}"; + description = "Simple, decentralized mesh VPN with WireGuard support"; + longDescription = '' + EasyTier is a simple, safe and decentralized VPN networking solution implemented + with the Rust language and Tokio framework. + ''; + mainProgram = "easytier-core"; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix ++ windows; + maintainers = with lib.maintainers; [ ltrump ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ec/ecapture/package.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecapture/package.nix new file mode 100644 index 0000000000..6d97c3fa60 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ec/ecapture/package.nix @@ -0,0 +1,118 @@ +{ + buildGoModule, + fetchFromGitHub, + stdenv, + bpftools, + lib, + nspr, + libpcap, + clang, + fd, + go-bindata, + glibc, + gnutls, + bashInteractive, + postgresql, + mariadb, + openssl, + bash, +}: + +buildGoModule rec { + pname = "ecapture"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "gojue"; + repo = "ecapture"; + rev = "refs/tags/v${version}"; + hash = "sha256-xnUgsnz3zUkuLwqgdogEWQh0GMEmS/qmDqqmEQlHhfQ="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + clang + fd + bpftools + go-bindata + ]; + + newlibpcap = libpcap.overrideAttrs (previousAttrs: { + configureFlags = previousAttrs.configureFlags ++ [ "--without-libnl" ]; + }); + + buildInputs = [ + newlibpcap + glibc.static + glibc + ]; + + CGO_LDFLAGS = "-lpcap -lpthread -static"; + + ldflags = [ + "-extldflags '-static'" + "-linkmode=external" + ]; + + hardeningDisable = [ + "zerocallusedregs" + ]; + + patchPhase = '' + runHook prePatch + + substituteInPlace user/config/config_gnutls_linux.go \ + --replace-fail 'return errors.New("cant found Gnutls so load path")' 'gc.Gnutls = "${lib.getLib gnutls}/lib/libgnutls.so.30"' \ + --replace-fail '"errors"' ' ' + + substituteInPlace user/module/probe_bash.go \ + --replace-fail '/bin/bash' '${lib.getExe bashInteractive}' + + substituteInPlace user/config/config_bash.go \ + --replace-fail '/bin/bash' '${lib.getExe bashInteractive}' + + substituteInPlace user/config/config_nspr_linux.go \ + --replace-fail '/usr/lib/firefox/libnspr4.so' '${lib.getLib nspr}/lib/libnspr4.so' + + substituteInPlace cli/cmd/postgres.go \ + --replace-fail '/usr/bin/postgres' '${postgresql}/bin/postgres' + + substituteInPlace cli/cmd/mysqld.go \ + --replace-fail '/usr/sbin/mariadbd' '${mariadb}/bin/mariadbd' + + substituteInPlace user/module/probe_mysqld.go \ + --replace-fail '/usr/sbin/mariadbd' '${mariadb}/bin/mariadbd' + + substituteInPlace user/config/config_openssl_linux.go \ + --replace-fail 'return errors.New("cant found openssl so load path")' 'oc.Openssl = "${lib.getLib openssl}/lib/libssl.so.3"' \ + --replace-fail '"errors"' ' ' + + runHook postPatch + ''; + + postConfigure = '' + sed -i '/git/d' Makefile + sed -i '/git/d' variables.mk + + substituteInPlace Makefile \ + --replace-fail '/bin/bash' '${lib.getExe bash}' + + make ebpf + go-bindata -pkg assets -o "assets/ebpf_probe.go" $(find user/bytecode -name "*.o" -printf "./%p ") + ''; + + vendorHash = "sha256-j5AXZqup0nPUlGWvb4PCLKJFoQx/c4I3PxZB99TTTWA="; + + meta = { + description = "Capture SSL/TLS text content without CA certificate Using eBPF"; + changelog = "https://github.com/gojue/ecapture/releases/tag/v${version}"; + homepage = "https://ecapture.cc"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "ecapture"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix b/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix index 0f50c45e64..b4919f27ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ed/edk2/package.nix @@ -13,13 +13,13 @@ let pythonEnv = buildPackages.python3.withPackages (ps: [ps.tkinter]); -targetArch = if stdenv.isi686 then +targetArch = if stdenv.hostPlatform.isi686 then "IA32" -else if stdenv.isx86_64 then +else if stdenv.hostPlatform.isx86_64 then "X64" -else if stdenv.isAarch32 then +else if stdenv.hostPlatform.isAarch32 then "ARM" -else if stdenv.isAarch64 then +else if stdenv.hostPlatform.isAarch64 then "AARCH64" else if stdenv.hostPlatform.isRiscV64 then "RISCV64" @@ -28,7 +28,7 @@ else if stdenv.hostPlatform.isLoongArch64 then else throw "Unsupported architecture"; -buildType = if stdenv.isDarwin then +buildType = if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC5"; @@ -108,7 +108,7 @@ edk2 = stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" - + lib.optionalString (stdenv.isDarwin) " -Wno-error=macro-redefined"; + + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; hardeningDisable = [ "format" "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix b/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix index e7553cf4ad..008232210c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-5xskx/Bd8h344EH/up0jofcUNS9lZxgboySIO2i2vr8="; + hash = "sha256-veq1x5fV4guj4ElpwxGdXPLrORdLGGrPT5Q8a8IR8LY="; }; - vendorHash = "sha256-mvV/AsSSRsCf7TrKLZgo+AHEWXCnPUEsnLOvt73eFf4="; + vendorHash = "sha256-Pf0dEtHhbNCwOMgbeGRwZ5x2JS/U8PEI7/AnVwsXFzk="; ldflags = ["-s" "-w"]; subPackages = ["cmd/eigenlayer"]; diff --git a/third_party/nixpkgs/pkgs/by-name/ei/eiquadprog/package.nix b/third_party/nixpkgs/pkgs/by-name/ei/eiquadprog/package.nix index 9380e7f9d2..70242a2aa9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ei/eiquadprog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ei/eiquadprog/package.nix @@ -1,10 +1,12 @@ { boost, cmake, + doxygen, eigen, fetchFromGitHub, jrl-cmakemodules, lib, + pkg-config, stdenv, }: @@ -19,8 +21,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VqRx06sCCZrnB+NWm6Z9OMKzjKQIydGgKQU6fMY7phk="; }; + outputs = [ + "out" + "doc" + ]; + nativeBuildInputs = [ cmake + doxygen + pkg-config jrl-cmakemodules ]; propagatedBuildInputs = [ eigen ]; @@ -34,5 +43,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/stack-of-tasks/eiquadprog/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/ejs/default.nix b/third_party/nixpkgs/pkgs/by-name/ej/ejs/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/development/tools/ejs/default.nix rename to third_party/nixpkgs/pkgs/by-name/ej/ejs/package.nix index b9242836b6..90934f9002 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ejs/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ej/ejs/package.nix @@ -1,17 +1,20 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: - -buildNpmPackage rec { +let + version = "3.1.10"; +in +buildNpmPackage { pname = "ejs"; - version = "3.1.9"; + inherit version; src = fetchFromGitHub { owner = "mde"; repo = "ejs"; rev = "v${version}"; - hash = "sha256-bOZclhsnV3onxc32ZGfLpuGS5Jz6S12/BmkmwL4M6Dg="; + hash = "sha256-3Rq+7oiYJlIY7sGPasx728sz2zj0ndAvKpHGsQX4tlc="; }; npmDepsHash = "sha256-829eWfJiMw9KRlhdmzD0ha//bgUQ5nPEzO+ayUPLxXY="; @@ -29,6 +32,6 @@ buildNpmPackage rec { homepage = "http://ejs.co"; license = lib.licenses.asl20; mainProgram = "ejs"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ek/ekho/package.nix b/third_party/nixpkgs/pkgs/by-name/ek/ekho/package.nix index 0439082982..818c113ba0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ek/ekho/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ek/ekho/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config autoconf automake libtool ]; buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; meta = with lib; { description = "Chinese text-to-speech software"; diff --git a/third_party/nixpkgs/pkgs/by-name/el/elvis/package.nix b/third_party/nixpkgs/pkgs/by-name/el/elvis/package.nix new file mode 100644 index 0000000000..337794ac64 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/el/elvis/package.nix @@ -0,0 +1,75 @@ +{ + lib, + fetchurl, + fetchpatch, + installShellFiles, + ncurses, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "elvis"; + version = "2.2_0"; + + src = fetchurl { + urls = [ + "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${finalAttrs.version}.tar.gz" + "http://www.the-little-red-haired-girl.org/pub/elvis/old/elvis-${finalAttrs.version}.tar.gz" + ]; + hash = "sha256-moRmsik3mEQQVrwnlzavOmFrqrovEZQDlsxg/3GSTqA="; + }; + + patches = [ + (fetchpatch { + name = "0000-resolve-stdio-getline-naming-conflict.patch"; + url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; + hash = "sha256-DCo2caiyE8zV5ss3O1AXy7oNlJ5AzFxdTeBx2Wtg83s="; + }) + ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ ncurses ]; + + configureFlags = [ "--ioctl=termios" ]; + + strictDeps = false; + + postPatch = '' + substituteInPlace configure \ + --replace-fail '-lcurses' '-lncurses' + ''; + + installPhase = '' + runHook preInstall + + installBin elvis ref elvtags elvfmt + + pushd doc + for page in *.man; do + installManPage $page + rm $page + done + popd + + mkdir -p $out/share/doc/elvis-${finalAttrs.version}/ $out/share/elvis/ + cp -R data/* $out/share/elvis/ + cp doc/* $out/share/doc/elvis-${finalAttrs.version}/ + + runHook postInstall + ''; + + meta = { + homepage = "http://elvis.the-little-red-haired-girl.org/"; + description = "Vi clone for Unix and other operating systems"; + license = lib.licenses.free; + mainProgram = "elvis"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix b/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix index b21364ed9e..72019cbcb9 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/en-croissant/package.nix @@ -21,7 +21,7 @@ let buildRustPackage = rustPlatform.buildRustPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildRustPackage rec { @@ -59,11 +59,11 @@ buildRustPackage rec { cargo-tauri pkg-config ] - ++ lib.optionals stdenv.isLinux [ wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ makeBinaryWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ openssl libsoup webkitgtk @@ -72,7 +72,7 @@ buildRustPackage rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-good ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.WebKit ]; @@ -82,7 +82,7 @@ buildRustPackage rec { buildPhase = '' runHook preBuild - cargo tauri build --bundles ${if stdenv.isDarwin then "app" else "deb"} + cargo tauri build --bundles ${if stdenv.hostPlatform.isDarwin then "app" else "deb"} runHook postBuild ''; @@ -93,12 +93,12 @@ buildRustPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out"/Applications cp -r src-tauri/target/release/bundle/macos/* "$out"/Applications ''} - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p "$out" cp -r src-tauri/target/release/bundle/deb/*/data/usr/* "$out" ''} @@ -106,7 +106,7 @@ buildRustPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper "$out"/Applications/en-croissant.app/Contents/MacOS/en-croissant $out/bin/en-croissant ''; diff --git a/third_party/nixpkgs/pkgs/by-name/en/envio/package.nix b/third_party/nixpkgs/pkgs/by-name/en/envio/package.nix index 0424bcf4e9..b1037be41a 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/envio/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgpg-error gpgme ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # Remove postPatch when updating to the next envio release # For details see https://github.com/envio-cli/envio/pull/31 diff --git a/third_party/nixpkgs/pkgs/by-name/en/envision-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/en/envision-unwrapped/package.nix index f72410f1f8..0f65731f80 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/envision-unwrapped/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "envision-unwrapped"; - version = "0-unstable-2024-09-09"; + version = "0-unstable-2024-09-21"; src = fetchFromGitLab { owner = "gabmus"; repo = "envision"; - rev = "f8a18e96f049f2fd51409aac011e1aa09eaac2db"; - hash = "sha256-ZEczUdFyjgqCisFjgQeYWJ9JQP0/G7cgVpkHwWjNfRQ="; + rev = "41e9af1676d3cfd458939a34b5c8b06d84c3f764"; + hash = "sha256-qk9xlHWbkCRpve3SZMtq5ojfS2tRwyXsckqu7fs/Lm0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix b/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix index 0b57e3b37b..b6a0b77014 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/envoy/package.nix @@ -25,9 +25,9 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.31.1"; - rev = "1f44388cee449c9dae8ae34c0b4f09036bcbf560"; - hash = "sha256-XvlF3hMS2PH87HgFwKoFzxHDYgRjZmxn02L1aLwYOrY="; + version = "1.31.2"; + rev = "cc4a75482810de4b84c301d13deb551bd3147339"; + hash = "sha256-mfQpEGLMJV3UKqcUdbhy6/pP1sWut26zjwN6vDE7LmA="; }; # these need to be updated for any changes to fetchAttrs @@ -172,7 +172,7 @@ buildBazelPackage { "--define=wasm=${wasmRuntime}" ] - ++ (lib.optionals stdenv.isAarch64 [ + ++ (lib.optionals stdenv.hostPlatform.isAarch64 [ # external/com_github_google_tcmalloc/tcmalloc/internal/percpu_tcmalloc.h:611:9: error: expected ':' or '::' before '[' token # 611 | : [end_ptr] "=&r"(end_ptr), [cpu_id] "=&r"(cpu_id), # | ^ diff --git a/third_party/nixpkgs/pkgs/by-name/ep/epoll-shim/package.nix b/third_party/nixpkgs/pkgs/by-name/ep/epoll-shim/package.nix index bbb49c8ec7..63deaaf9df 100644 --- a/third_party/nixpkgs/pkgs/by-name/ep/epoll-shim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ep/epoll-shim/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/jiixyj/epoll-shim/issues/41 # https://github.com/jiixyj/epoll-shim/pull/34 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Small epoll implementation using kqueue"; diff --git a/third_party/nixpkgs/pkgs/by-name/er/era/package.nix b/third_party/nixpkgs/pkgs/by-name/er/era/package.nix new file mode 100644 index 0000000000..cbe15bd7b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/er/era/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + deno, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "era"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "kyoheiu"; + repo = "era"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-OOPVLY9kg4TmKSrpHgsOmAmeDPbX5df0bX51lA6DvcY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + cp -r $src/{src,LICENSE,README.md} $out/lib + makeWrapper ${lib.getExe deno} $out/bin/era \ + --set DENO_NO_UPDATE_CHECK "1" \ + --add-flags "run -A $out/lib/src/main.ts" + + runHook postInstall + ''; + + meta = { + description = "Rainy clock in your terminal"; + homepage = "https://github.com/kyoheiu/era"; + changelog = "https://github.com/kyoheiu/era/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "era"; + inherit (deno.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/es/eslint/package.nix b/third_party/nixpkgs/pkgs/by-name/es/eslint/package.nix index b1e2732a28..6ad9acd2af 100644 --- a/third_party/nixpkgs/pkgs/by-name/es/eslint/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/es/eslint/package.nix @@ -7,7 +7,7 @@ }: let buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildNpmPackage' rec { diff --git a/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix b/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix index 2b6baaf48e..aad2b117eb 100644 --- a/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/es/espflash/package.nix @@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/ev/evebox/package.nix b/third_party/nixpkgs/pkgs/by-name/ev/evebox/package.nix index 29062726c1..4b09fba867 100644 --- a/third_party/nixpkgs/pkgs/by-name/ev/evebox/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ev/evebox/package.nix @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/jasonish/evebox/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ev/evolution-data-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ev/evolution-data-server/package.nix index 228e20ae0e..91e9ebba95 100644 --- a/third_party/nixpkgs/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ev/evolution-data-server/package.nix @@ -30,7 +30,7 @@ , ninja , libkrb5 , openldap -, enableOAuth2 ? stdenv.isLinux +, enableOAuth2 ? stdenv.hostPlatform.isLinux , webkitgtk_4_1 , webkitgtk_6_0 , json-glib @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { libphonenumber boost protobuf - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals withGtk3 [ gtk3 @@ -141,14 +141,14 @@ stdenv.mkDerivation rec { "-DENABLE_OAUTH2_WEBKITGTK4=${lib.boolToString (withGtk4 && enableOAuth2)}" ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/modules/SetupBuildFlags.cmake \ --replace "-Wl,--no-undefined" "" substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \ --replace "G_OS_WIN32" "__APPLE__" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/evolution-data-server/*.dylib $out/lib/ ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix b/third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix index 1c3ba7798c..41bf6c7b55 100644 --- a/third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix @@ -72,6 +72,6 @@ rustPlatform.buildRustPackage rec { w-lfchen ]; mainProgram = "eww"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/example-robot-data/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/example-robot-data/package.nix similarity index 65% rename from third_party/nixpkgs/pkgs/development/libraries/example-robot-data/default.nix rename to third_party/nixpkgs/pkgs/by-name/ex/example-robot-data/package.nix index d4211be982..63331bbf5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/example-robot-data/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ex/example-robot-data/package.nix @@ -1,10 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pythonSupport ? false -, python3Packages +{ + cmake, + doxygen, + fetchFromGitHub, + fetchpatch, + lib, + pkg-config, + pythonSupport ? false, + python3Packages, + stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -19,6 +22,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Heq+c8SSYNO8ksTv5FphRBRStlTakm9T66jlPXon5tI="; }; + outputs = [ + "out" + "doc" + ]; + strictDeps = true; patches = [ @@ -31,34 +39,36 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - ]; + nativeBuildInputs = + [ + cmake + doxygen + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; - buildInputs = lib.optionals pythonSupport [ - python3Packages.pinocchio - ]; + propagatedBuildInputs = lib.optionals pythonSupport [ python3Packages.pinocchio ]; - cmakeFlags = lib.optionals (!pythonSupport) [ - "-DBUILD_PYTHON_INTERFACE=OFF" - ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ]; doCheck = true; # The package expect to find an `example-robot-data/robots` folder somewhere # either in install prefix or in the sources # where it can find the meshes for unit tests preCheck = "ln -s source ../../${finalAttrs.pname}"; - pythonImportsCheck = [ - "example_robot_data" - ]; + pythonImportsCheck = [ "example_robot_data" ]; meta = with lib; { description = "Set of robot URDFs for benchmarking and developed examples"; homepage = "https://github.com/Gepetto/example-robot-data"; license = licenses.bsd3; - maintainers = with maintainers; [ nim65s wegank ]; + maintainers = with maintainers; [ + nim65s + wegank + ]; platforms = platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ex/ext4fuse/package.nix b/third_party/nixpkgs/pkgs/by-name/ex/ext4fuse/package.nix index b083ec1c63..4ab5612fe8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ex/ext4fuse/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ex/ext4fuse/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { which ]; - buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ]; + buildInputs = [ (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse) ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix index 627376f49d..3380e98a11 100644 --- a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; buildFeatures = lib.optional gitSupport "git"; diff --git a/third_party/nixpkgs/pkgs/by-name/fa/facter/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/facter/package.nix index fa92def6b1..8d5f3bc03a 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/facter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/facter/package.nix @@ -35,7 +35,7 @@ bundlerApp { procps util-linux ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ iproute2 virt-what zfs diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fail2ban/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fail2ban/package.nix index 20f89c501d..6943ccc447 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fail2ban/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fail2ban/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; pythonPath = with python3.pkgs; - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ systemd pyinotify @@ -83,7 +83,7 @@ python3.pkgs.buildPythonApplication rec { rm $out/bin/fail2ban-python ln -s ${python3.interpreter} $out/bin/fail2ban-python - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -r "${sitePackages}/usr" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fastcompmgr/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastcompmgr/package.nix new file mode 100644 index 0000000000..82d8f711ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastcompmgr/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + fetchFromGitHub, + xorg, + pkgs, + lib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "fastcompmgr"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "tycho-kirchner"; + repo = "fastcompmgr"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-UKX0gjhbbXSXfyw/NGA31vTOfgd4kdnxO7lIs+mkgFs="; + }; + + nativeBuildInputs = [ pkgs.pkg-config ]; + + buildInputs = [ + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrender + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp fastcompmgr $out/bin + + runHook postInstall + ''; + + meta = { + description = "Fast compositor for X11"; + homepage = "https://github.com/tycho-kirchner/fastcompmgr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ camerondugan ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix index d240ac5abd..3a52b165b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix @@ -43,17 +43,17 @@ x11Support ? true, }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-MnN+XZTiIjXGVM6rF5J7sDTndLijGCdgsBF8oYzRHqY="; + hash = "sha256-I8In6JK9XWM29QdAj3wU2WHn/RsrDJo7s5S7R79HV8g="; }; outputs = [ @@ -77,7 +77,7 @@ stdenv'.mkDerivation (finalAttrs: { sqlite yyjson ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus dconf ddcutil @@ -103,8 +103,8 @@ stdenv'.mkDerivation (finalAttrs: { xorg.libXdmcp xorg.libXext ] - ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ xfce.xfconf ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ Apple80211 @@ -138,10 +138,10 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_X11" x11Support) (lib.cmakeBool "ENABLE_XCB" x11Support) (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) - (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) + (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.hostPlatform.isDarwin))) (lib.cmakeBool "ENABLE_XRANDR" x11Support) ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fastqc/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastqc/package.nix index e7973ab0d6..9c63a98e77 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fastqc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastqc/package.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; nativeBuildInputs = [ makeWrapper imagemagick ] - ++ lib.optional stdenv.isLinux copyDesktopItems # postInstallHook - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; #fixupOutputHook + ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems # postInstallHook + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; #fixupOutputHook buildInputs = [ jre perl]; desktopItem = (makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fatrop/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fatrop/package.nix index e85eede1e2..87d66c6780 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fatrop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fatrop/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ blasfeo ] ++ lib.optionals pythonSupport [ python3Packages.pybind11 ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; cmakeFlags = [ (lib.cmakeBool "BUILD_DOCS" true) diff --git a/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix index 654046067d..5897fae85a 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/febio-studio/package.nix @@ -25,7 +25,7 @@ let stdenv' = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinSdkVersion = "11.0"; darwinMinVersion = "10.15"; diff --git a/third_party/nixpkgs/pkgs/by-name/fe/febio/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/febio/package.nix index 01897ae760..3f70ad711d 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/febio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/febio/package.nix @@ -14,7 +14,7 @@ }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { @@ -56,7 +56,7 @@ stdenv'.mkDerivation (finalAttrs: { buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.CoreVideo darwin.apple_sdk.frameworks.Accelerate diff --git a/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix index 0e38132aff..f282b70c4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix @@ -17,7 +17,7 @@ let # Rust rocksdb bindings have C++ compilation/linking errors on Darwin when using newer clang # Forcing it to clang 12 fixes the issue. buildRustPackage = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then rustPlatform.buildRustPackage.override { stdenv = llvmPackages_12.stdenv; } else rustPlatform.buildRustPackage; @@ -44,7 +44,7 @@ buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv Security diff --git a/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix index 99307c37dc..0ed5aed53c 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/feishin/package.nix @@ -34,8 +34,8 @@ buildNpmPackage { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = - lib.optionals (stdenv.isLinux) [ copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ darwin.autoSignDarwinBinariesHook ]; + lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.autoSignDarwinBinariesHook ]; postPatch = '' @@ -47,7 +47,7 @@ buildNpmPackage { substituteInPlace src/main/main.ts \ --replace-fail "autoUpdater.checkForUpdatesAndNotify();" "" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # https://github.com/electron/electron/issues/31121 substituteInPlace src/main/main.ts \ --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" @@ -77,7 +77,7 @@ buildNpmPackage { ''; postBuild = - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle. cp -r ${electron.dist}/Electron.app ./ find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw @@ -90,7 +90,7 @@ buildNpmPackage { + '' npm exec electron-builder -- \ --dir \ - -c.electronDist=${if stdenv.isDarwin then "./" else electron.dist} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "./" else electron.dist} \ -c.electronVersion=${electron.version} \ -c.npmRebuild=false ''; @@ -99,12 +99,12 @@ buildNpmPackage { '' runHook preInstall '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} cp -r release/build/**/Feishin.app $out/Applications/ makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/feishin pushd release/build/*/ cp -r locales resources{,.pak} $out/share/feishin diff --git a/third_party/nixpkgs/pkgs/by-name/fi/fim-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/fim-rs/package.nix index f2b1cf85df..2b1cdc313c 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/fim-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/fim-rs/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index a4614f5ae2..106069c1e7 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ let pname = "firefly-iii-data-importer"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; rev = "v${version}"; - hash = "sha256-nAeLXxUwaw/wHYh3NywI4/mFi82i/2b3McFfCFGAIjE="; + hash = "sha256-IIlcOGulcBJsYz7Yx3YWV/c6yvb8+82AvFghQ05dUcI="; }; in @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-yLu/FMKn/uUy5g6td3mfPAb9ptjJne4vd478fjaS9U0="; + vendorHash = "sha256-j1rCcHt5E1aFwgnOKZZccaGPs5JfpBtN05edeSvId94="; npmDeps = fetchNpmDeps { inherit src; name = "${pname}-npm-deps"; - hash = "sha256-35mS+0Ea69CAwV9liTU3lcKp3ww3qLbTRWlF0AQNx5w="; + hash = "sha256-mdBQubfV5Bgk9NxsWokTS6zA4r3gggWVSwhrfKPUi5s="; }; composerRepository = php83.mkComposerRepository { diff --git a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix index 45c8377568..13ca4fbcd6 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { libs = let libs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ cups ffmpeg libglvnd diff --git a/third_party/nixpkgs/pkgs/by-name/fi/fittrackee/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/fittrackee/package.nix index b69d3b428a..e12db808ac 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/fittrackee/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/fittrackee/package.nix @@ -2,6 +2,7 @@ fetchFromGitHub, fetchPypi, lib, + stdenv, postgresql, postgresqlTestHook, python3, @@ -27,14 +28,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "fittrackee"; - version = "0.8.8"; + version = "0.8.9"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "refs/tags/v${version}"; - hash = "sha256-IO6M+HXAR3Gn0/71KwkaQr6sB0eCQzmnqHYgO+mzIZM="; + hash = "sha256-raN6Ef/Z/JbdJDMKBIaBL8nmvFwvuZFX4rfC0ZgWgKI="; }; build-system = [ @@ -47,6 +48,8 @@ python.pkgs.buildPythonApplication rec { "gunicorn" "pyjwt" "pyopenssl" + "pytz" + "sqlalchemy" ]; dependencies = @@ -95,8 +98,10 @@ python.pkgs.buildPythonApplication rec { export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABASE?host=$PGHOST ''; + doCheck = !stdenv.hostPlatform.isDarwin; # tests are a bit flaky on darwin + preCheck = '' - export TMP=$(mktemp -d) + export TMP=$TMPDIR ''; meta = { @@ -104,7 +109,6 @@ python.pkgs.buildPythonApplication rec { homepage = "https://github.com/SamR1/FitTrackee"; changelog = "https://github.com/SamR1/FitTrackee/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ traxys ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/fj/fjo/package.nix b/third_party/nixpkgs/pkgs/by-name/fj/fjo/package.nix index d451f83426..7671073cd3 100644 --- a/third_party/nixpkgs/pkgs/by-name/fj/fjo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fj/fjo/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.agpl3Only; mainProgram = "berg"; maintainers = with lib.maintainers; [ ehmry ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flake-checker/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flake-checker/package.nix index 5ccab79d97..80512e1bf7 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flake-checker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flake-checker/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-0iH5owyNfIpRz6nYwrJUoqd9lVGZ3T3K8rmsOk2UoGI="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flake-edit/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flake-edit/package.nix index e3d0522026..cfe799a143 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flake-edit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flake-edit/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flameshot/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flameshot/package.nix index c86e5cc62b..e89d27abe3 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flameshot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flameshot/package.nix @@ -16,10 +16,10 @@ enableMonochromeIcon ? false, }: -assert stdenv.isDarwin -> (!enableWlrSupport); +assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation { @@ -49,11 +49,11 @@ stdenv'.mkDerivation { (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true) (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon) ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) (lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5") ]; @@ -65,7 +65,7 @@ stdenv'.mkDerivation { libsForQt5.wrapQtAppsHook makeBinaryWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick libicns ]; @@ -75,7 +75,7 @@ stdenv'.mkDerivation { libsForQt5.kguiaddons ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix icns generation running concurrently with png generation sed -E -i '/"iconutil -o/i\ )\ @@ -89,7 +89,7 @@ stdenv'.mkDerivation { src/CMakeLists.txt ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/flameshot.app $out/Applications @@ -106,7 +106,10 @@ stdenv'.mkDerivation { postFixup = let binary = - if stdenv.isDarwin then "Applications/flameshot.app/Contents/MacOS/flameshot" else "bin/flameshot"; + if stdenv.hostPlatform.isDarwin then + "Applications/flameshot.app/Contents/MacOS/flameshot" + else + "bin/flameshot"; in '' wrapProgram $out/${binary} \ diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix index d6cd2eac60..07af37b5dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { requests setuptools qt6.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix index b0bb52f1d3..b70a559ac6 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix @@ -9,7 +9,7 @@ , pkg-config , stdenv , withJlink ? true -, withGpio ? stdenv.isLinux +, withGpio ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation (finalAttrs: { @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libftdi1 libusb1 - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pciutils ] ++ lib.optionals (withJlink) [ libjaylink @@ -46,10 +46,10 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" "CONFIG_JLINK_SPI=${yesNo withJlink}" "CONFIG_LINUX_GPIO_SPI=${yesNo withGpio}" - "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=${yesNo (!stdenv.isDarwin)}" - "CONFIG_INTERNAL_X86=${yesNo (!(stdenv.isDarwin) && stdenv.isx86_64)}" - "CONFIG_INTERNAL_DMI=${yesNo (!(stdenv.isDarwin) && stdenv.isx86_64)}" - "CONFIG_RAYER_SPI=${yesNo (!(stdenv.isDarwin) && stdenv.isx86_64)}" + "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=${yesNo (!stdenv.hostPlatform.isDarwin)}" + "CONFIG_INTERNAL_X86=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" + "CONFIG_INTERNAL_DMI=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" + "CONFIG_RAYER_SPI=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flatpak/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flatpak/package.nix index 6e98f54fac..231b682cc2 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flatpak/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flatpak/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, runCommand, appstream, autoreconfHook, @@ -120,6 +121,22 @@ stdenv.mkDerivation (finalAttrs: { # Try mounting fonts and icons from NixOS locations if FHS locations don't exist. # https://github.com/NixOS/nixpkgs/issues/119433 ./fix-fonts-icons.patch + + # TODO: Remove when updating to 1.16 + # Ensure flatpak uses the system's zoneinfo from $TZDIR + # https://github.com/NixOS/nixpkgs/issues/238386 + (fetchpatch { + url = "https://github.com/flatpak/flatpak/pull/5850/commits/a8a35bf4d9fc3d76e1a5049a6a591faec04a42fd.patch"; + hash = "sha256-JqkPbnzgZNZq/mplZqohhHFdjRrvYFjE4C02pI3feBo="; + }) + (fetchpatch { + url = "https://github.com/flatpak/flatpak/pull/5850/commits/5ea13b09612215559081c27b60df4fb720cb08d5.patch"; + hash = "sha256-BWbyQ2en3RtN4Ec5n62CULAhvywlQLhcl3Fmd4fsR1s="; + }) + (fetchpatch { + url = "https://github.com/flatpak/flatpak/pull/5850/commits/7c8a81f08908019bbf69358de199748a9bcb29e3.patch"; + hash = "sha256-RiG2jPmG+Igskxv8oQquOUYsG4srgdMXWe34ojMXslo="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flatter/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flatter/package.nix index bd8d5605ed..5ef1b6a014 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flatter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flatter/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { mpfr fplll eigen - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flawz/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flawz/package.nix index d149b41086..fb40c65dc2 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flawz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flawz/package.nix @@ -52,6 +52,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "flawz"; maintainers = with lib.maintainers; [ anas ]; platforms = with lib.platforms; unix ++ windows; - broken = stdenv.isDarwin; # needing some apple_sdk packages + broken = stdenv.hostPlatform.isDarwin; # needing some apple_sdk packages }; } diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix index 3080bd4237..343fef81b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.45"; + version = "3.11.46"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-QtxtkXKBYf46cS+TAxJGQNQktHpLgGDIf7Czfznzr1s="; + hash = "sha256-zaysfvfsuA4XTj46vN1FHggqEaL8rfHL0UJVILhrwjg="; }; # relax dep constrains, keep environment constraints diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flip-link/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flip-link/package.nix index b4ba056ee3..f652cb11cc 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flip-link/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flip-link/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-x3JnqztoLol5dNMact/qMveQuvcMTg/jqHxW0lksB7Y="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; checkFlags = [ # requires embedded toolchains diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flite/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flite/package.nix index 1edb95c2d4..514ded6772 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flite/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - buildInputs = lib.optional stdenv.isLinux ( + buildInputs = lib.optional stdenv.hostPlatform.isLinux ( { alsa = alsa-lib; pulseaudio = libpulseaudio; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-shared" - ] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-audio=${audioBackend}" ]; # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop diff --git a/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix index dbbb418525..8f38391308 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { }; # optional only to avoid linux rebuild - patches = lib.optionals stdenv.isDarwin [ ./macos-11-sdk-compat.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macos-11-sdk-compat.patch ]; nativeBuildInputs = [ cmake @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { libyaml postgresql ] - ++ lib.optionals stdenv.isLinux [ systemd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Foundation ]; @@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_OUT_PGSQL=ON" - ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; env.NIX_CFLAGS_COMPILE = toString ( # Used by the embedded luajit, but is not predefined on older mac SDKs. - lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" ] + lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" ] # Assumes GNU version of strerror_r, and the posix version has an # incompatible return type. ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ "-Wno-int-conversion" ] diff --git a/third_party/nixpkgs/pkgs/by-name/fo/follow/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/follow/package.nix new file mode 100644 index 0000000000..dba8ba8eb2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fo/follow/package.nix @@ -0,0 +1,107 @@ +{ + electron, + fetchFromGitHub, + imagemagick, + lib, + makeDesktopItem, + makeWrapper, + nodejs, + pnpm, + stdenv, +}: +stdenv.mkDerivation rec { + pname = "follow"; + + version = "0.0.1-alpha.17"; + + src = fetchFromGitHub { + owner = "RSSNext"; + repo = "Follow"; + rev = "v${version}"; + hash = "sha256-amW+jpJ2E7muKwiWbblONRFzH849js2SaT+poUWQWZI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeWrapper + imagemagick + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + hash = "sha256-JFAONU1C8pB2Hu4PJqqdqcXk9Ec+iPiAL8J+dk4oPj0="; + }; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # This environment variables inject the production Vite config at build time. + # Copy from: + # 1. https://github.com/RSSNext/Follow/blob/0745ac07dd2a4a34e4251c034678ace15c302697/.github/workflows/build.yml#L18 + # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml + VITE_WEB_URL = "https://app.follow.is"; + VITE_API_URL = "https://api.follow.is"; + VITE_IMGPROXY_URL = "https://thumbor.follow.is"; + VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008"; + VITE_BUILD_TYPE = "production"; + VITE_POSTHOG_KEY = "phc_EZGEvBt830JgBHTiwpHqJAEbWnbv63m5UpreojwEWNL"; + }; + + desktopItem = makeDesktopItem { + name = "follow"; + desktopName = "Follow"; + comment = "Next generation information browser"; + icon = "follow"; + exec = "follow"; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/follow" ]; + }; + + icon = src + "/resources/icon.png"; + + buildPhase = '' + runHook preBuild + + pnpm --offline electron-vite build + # Remove dev dependencies. + pnpm --ignore-scripts prune --prod + # Clean up broken symlinks left behind by `pnpm prune` + find node_modules/.bin -xtype l -delete + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{applications,follow} + cp -r . $out/share/follow + rm -rf $out/share/follow/{.vscode,.github} + + makeWrapper "${electron}/bin/electron" "$out/bin/follow" \ + --inherit-argv0 \ + --add-flags --disable-gpu-compositing \ + --add-flags $out/share/follow \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + + install -m 444 -D "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + for size in 16 24 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/follow.png + done + + runHook postInstall + ''; + + meta = { + description = "Next generation information browser"; + homepage = "https://github.com/RSSNext/Follow"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ iosmanthus ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "follow"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix index 57c1aa9fa7..21fb34ccf9 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "forbidden"; - version = "11.2"; + version = "12.5"; pyproject = true; src = fetchFromGitHub { owner = "ivan-sincek"; repo = "forbidden"; rev = "refs/tags/v${version}"; - hash = "sha256-XRN5zQgyBbMxDKAutW3XNIAbBVdAeXZtxsNbmjLyKRc="; + hash = "sha256-ZxEkkg1gFs/pSAnrW85UqDQKczXqLW1q4kW58TagEA0="; }; build-system = with python3.pkgs; [ @@ -20,6 +20,7 @@ python3.pkgs.buildPythonApplication rec { ]; dependencies = with python3.pkgs; [ + alive-progress colorama datetime pycurl diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forecast/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fo/forecast/Cargo.lock new file mode 100644 index 0000000000..49a40caae7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fo/forecast/Cargo.lock @@ -0,0 +1,7017 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.2" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" + +[[package]] +name = "accesskit_consumer" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "icrate 0.1.2", + "objc2 0.5.0", + "once_cell", +] + +[[package]] +name = "accesskit_unix" +version = "0.7.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "async-executor", + "async-task", + "atspi", + "futures-lite 1.13.0", + "futures-util", + "once_cell", + "serde", + "tokio", + "tokio-stream", + "zbus 3.15.2", +] + +[[package]] +name = "accesskit_windows" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "once_cell", + "paste", + "static_assertions", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.18.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_unix", + "accesskit_windows", + "raw-window-handle", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.5.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs 2.1.2", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 4.3.0", +] + +[[package]] +name = "ashpd" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 4.3.0", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-executor" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.0.2", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io 2.3.2", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.32", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.0", + "futures-lite 2.3.0", + "rustix 0.38.32", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.32", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" +dependencies = [ + "rustix 0.38.32", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +dependencies = [ + "atspi-common", + "atspi-connection", + "atspi-proxies", +] + +[[package]] +name = "atspi-common" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +dependencies = [ + "enumflags2", + "serde", + "static_assertions", + "zbus 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "atspi-connection" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +dependencies = [ + "atspi-common", + "atspi-proxies", + "futures-lite 1.13.0", + "zbus 3.15.2", +] + +[[package]] +name = "atspi-proxies" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +dependencies = [ + "atspi-common", + "serde", + "zbus 3.15.2", +] + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] + +[[package]] +name = "bitstream-io" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +dependencies = [ + "block-sys", + "objc2 0.5.0", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "built" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" + +[[package]] +name = "bumpalo" +version = "3.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" + +[[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.4", + "rustix 0.38.32", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", + "rustix 0.38.32", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.4", +] + +[[package]] +name = "clipboard-win" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +dependencies = [ + "error-code", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "dnd", + "mime 0.1.0", + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "thiserror", + "x11rb", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs", + "iced_futures", + "known-folders", + "notify", + "once_cell", + "ron", + "serde", + "tokio", + "tracing", + "xdg", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-ext-forecast" +version = "0.1.0" +dependencies = [ + "bytes", + "chrono", + "i18n-embed", + "i18n-embed-fl", + "include_dir", + "libcosmic", + "log", + "open", + "reqwest", + "rust-embed", + "serde", + "tokio", + "vergen", +] + +[[package]] +name = "cosmic-text" +version = "0.12.1" +source = "git+https://github.com/pop-os/cosmic-text.git#c7512170201910cfb8a021f8d749c4125dfed18d" +dependencies = [ + "bitflags 2.5.0", + "fontdb", + "log", + "rangemap", + "rayon", + "rustc-hash", + "rustybuzz 0.14.1", + "self_cell 1.0.3", + "smol_str", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "dirs", + "lazy_static", + "palette", + "ron", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "css-color" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "ctor-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.5.0", + "libloading 0.8.3", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.71", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.3", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "dnd" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "bitflags 2.5.0", + "mime 0.1.0", + "raw-window-handle", + "smithay-client-toolkit 0.19.2", + "smithay-clipboard", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix 0.38.32", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix 0.38.32", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "etagere" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-types" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" +dependencies = [ + "dirs", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.2", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glyphon" +version = "0.5.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.5.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.5.0", + "com", + "libc", + "libloading 0.8.3", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "i18n-config" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" +dependencies = [ + "basic-toml", + "log", + "serde", + "serde_derive", + "thiserror", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e901c87176ac0b615033c81dbe927c230f74700abfd60ed953a6f547c87bbe6d" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d73fe51b9655599147183495551696628b335f75b2dbfa225196b16d69d7288e" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.71", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "iced" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "iced_winit", + "image 0.24.9", + "mime 0.1.0", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "accesskit", + "accesskit_unix", + "accesskit_winit", +] + +[[package]] +name = "iced_core" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "bitflags 2.5.0", + "dnd", + "iced_accessibility", + "log", + "mime 0.1.0", + "num-traits", + "palette", + "raw-window-handle", + "serde", + "smithay-client-toolkit 0.19.2", + "smol_str", + "thiserror", + "web-time", + "window_clipboard", + "xxhash-rust", +] + +[[package]] +name = "iced_futures" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "cosmic-text", + "glam", + "half", + "iced_core", + "iced_futures", + "image 0.24.9", + "kamadak-exif", + "log", + "lyon_path", + "once_cell", + "raw-window-handle", + "rustc-hash", + "thiserror", + "unicode-segmentation", + "xxhash-rust", +] + +[[package]] +name = "iced_renderer" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.19.2", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.19.2", + "thiserror", + "tracing", + "wayland-backend", + "wayland-protocols 0.32.3", + "window_clipboard", + "xkbcommon", + "xkbcommon-dl", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "xxhash-rust", +] + +[[package]] +name = "iced_wgpu" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "as-raw-xcb-connection", + "bitflags 2.5.0", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustix 0.38.32", + "smithay-client-toolkit 0.19.2", + "tiny-xlib", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.3", + "wayland-sys", + "wgpu", + "x11rb", +] + +[[package]] +name = "iced_widget" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", + "window_clipboard", +] + +[[package]] +name = "iced_winit" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_graphics", + "iced_runtime", + "iced_style", + "log", + "thiserror", + "tracing", + "web-sys", + "winapi", + "window_clipboard", + "winit", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2 0.5.0", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 0.13.1", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "color_quant", + "exr", + "gif 0.13.1", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.3", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "known-folders" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "apply", + "ashpd 0.9.1", + "chrono", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_style", + "iced_tiny_skia", + "iced_wgpu", + "iced_widget", + "iced_winit", + "image 0.25.2", + "lazy_static", + "palette", + "rfd", + "serde", + "slotmap", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", + "zbus 4.3.0", +] + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.4", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.5.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0" +dependencies = [ + "float_next_after", + "lyon_path", + "num-traits", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "smithay-clipboard", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.5.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9c7f0d511a4ce26b078183179dca908171cfc69f88986fe36c5138e1834476" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser 0.20.0", +] + +[[package]] +name = "palette" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.2", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 0.38.32", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.71", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "read-fonts" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +dependencies = [ + "bytemuck", + "font-types", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox 0.1.3", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "reqwest" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +dependencies = [ + "async-compression", + "base64 0.22.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime 0.3.17", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "resvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +dependencies = [ + "gif 0.12.0", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rfd" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +dependencies = [ + "ashpd 0.8.1", + "block", + "dispatch", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.5.0", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rust-embed" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.71", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.0", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.9.4", + "smithay-client-toolkit 0.18.1", + "tiny-skia", +] + +[[package]] +name = "security-framework" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.3", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + +[[package]] +name = "serde" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "skrifa" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +dependencies = [ + "bytemuck", + "read-fonts", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.5.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix 0.38.32", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "pkg-config", + "rustix 0.38.32", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.3", + "wayland-protocols-wlr 0.3.3", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a" +dependencies = [ + "libc", + "raw-window-handle", + "smithay-client-toolkit 0.19.2", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "softbuffer" +version = "0.4.1" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases 0.2.0", + "cocoa", + "core-graphics", + "drm", + "fastrand 2.0.2", + "foreign-types 0.5.0", + "js-sys", + "log", + "memmap2 0.9.4", + "objc", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix 0.38.32", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", + "windows-sys 0.52.0", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "svg_fmt" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" + +[[package]] +name = "svgtypes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +dependencies = [ + "skrifa", + "yazi", + "zeno", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.12", + "version-compare", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.0.2", + "rustix 0.38.32", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" +dependencies = [ + "as-raw-xcb-connection", + "ctor-lite", + "libloading 0.8.3", + "pkg-config", + "tracing", +] + +[[package]] +name = "tinystr" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.6", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.9", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.5", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "usvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +dependencies = [ + "base64 0.21.7", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.12.1", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cfg-if", + "rustversion", + "time", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.32", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +dependencies = [ + "bitflags 2.5.0", + "rustix 0.38.32", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.5.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix 0.38.32", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.3", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.5.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.3", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.5.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window_clipboard" +version = "0.4.1" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "clipboard-win", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "dnd", + "mime 0.1.0", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winit" +version = "0.29.10" +source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.5.0", + "bytemuck", + "calloop 0.12.4", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate 0.0.4", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk", + "ndk-sys", + "objc2 0.4.1", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix 0.38.32", + "sctk-adwaita", + "smithay-client-toolkit 0.18.1", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.3", + "once_cell", + "rustix 0.38.32", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.5.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "xxhash-rust" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs 1.6.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process 1.8.1", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.3.0", + "zbus_names 3.0.0", + "zvariant 4.1.2", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.2", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive 4.1.2", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forecast/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/forecast/package.nix new file mode 100644 index 0000000000..9caca19caf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fo/forecast/package.nix @@ -0,0 +1,105 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + autoPatchelfHook, + just, + pkg-config, + wrapGAppsHook3, + + # buildInputs + libxkbcommon, + openssl, + vulkan-loader, + wayland, + nix-update-script, + + cosmic-icons, +}: + +rustPlatform.buildRustPackage rec { + pname = "forecast"; + version = "0-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "cosmic-utils"; + repo = "forecast"; + rev = "d3c274932847aa101fb7aacf1d01ded265b6fad4"; + hash = "sha256-6hlh9T0h1Yi8io2sMU/r8uMtP6isH6JJxE5LvZrj9Cs="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; + "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; + "cosmic-config-0.1.0" = "sha256-zamYPvxmIqh4IT4G+aqceP1mXNNBA1TAcJwAtjlbYAU="; + "cosmic-text-0.12.1" = "sha256-5Gk220HTiHuxDvyqwz1Dwr+BaLvH/6X7M14IirQzcsE="; + "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; + "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; + "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; + }; + }; + + nativeBuildInputs = [ + autoPatchelfHook + just + pkg-config + wrapGAppsHook3 + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + buildInputs = [ + libxkbcommon + openssl + vulkan-loader + wayland + ]; + + env = { + # COSMIC applications now uses vergen for the About page + VERGEN_GIT_COMMIT_DATE = "1970-01-01"; + VERGEN_GIT_SHA = src.rev; + }; + + runtimeDependencies = [ + libxkbcommon + wayland + ]; + + postFixup = '' + wrapProgram $out/bin/cosmic-ext-forecast \ + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" + ''; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-forecast" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Weather app written in rust and libcosmic"; + homepage = "https://github.com/cosmic-utils/forecast"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.linux; + mainProgram = "cosmic-ext-forecast"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forgejo-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/forgejo-cli/package.nix index c8965fa3be..ee49edd291 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forgejo-cli/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage { openssl zlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix index a2a1e51850..8ca9a12e96 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/generic.nix @@ -158,7 +158,7 @@ buildGoModule rec { changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gitea"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/fo/formatjson5/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/formatjson5/package.nix index 852b409625..112f94aa83 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/formatjson5/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/formatjson5/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "--example formatjson5" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fo/fortune-kind/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/fortune-kind/package.nix index 1fd3783735..bea0bec5c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/fortune-kind/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/fortune-kind/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-hxbvsAQsZWUAgj8QAlcxqBA5YagLO3/vz9lQGJMHUjw="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; diff --git a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix index da6d32c5c7..9cae030df8 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix @@ -19,9 +19,9 @@ let phpEmbedWithZts = php.override { embedSupport = true; ztsSupport = true; - staticSupport = stdenv.isDarwin; + staticSupport = stdenv.hostPlatform.isDarwin; zendSignalsSupport = false; - zendMaxExecutionTimersSupport = stdenv.isLinux; + zendMaxExecutionTimersSupport = stdenv.hostPlatform.isLinux; }; phpUnwrapped = phpEmbedWithZts.unwrapped; phpConfig = "${phpUnwrapped.dev}/bin/php-config"; @@ -45,7 +45,7 @@ in buildGoModule rec { vendorHash = "sha256-U2B0ok6TgqUPMwlnkzpPkJLG22S3VpoU80bWwZAeaJo="; buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs; - nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ]; + nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ]; subPackages = [ "frankenphp" ]; @@ -63,7 +63,7 @@ in buildGoModule rec { export CGO_LDFLAGS="-DFRANKENPHP_VERSION=${version} \ $(${phpConfig} --ldflags) \ $(${phpConfig} --libs)" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # replace hard-code homebrew path substituteInPlace ../frankenphp.go \ --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${libiconv}/lib" diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix index f272988ee5..fda823b667 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix @@ -23,7 +23,7 @@ , pkg-config , python311Packages , runCommand # for passthru.tests -, spaceNavSupport ? stdenv.isLinux +, spaceNavSupport ? stdenv.hostPlatform.isLinux , stdenv , swig , vtk diff --git a/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix index 6cc8b189e7..57d8de7846 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; @@ -65,6 +65,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "fretboard"; maintainers = with maintainers; [ michaelgrahamevans ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix b/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix index d1fb07167e..ee2a3e2457 100644 --- a/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ft/ftgl/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ freetype - ] ++ (if stdenv.isDarwin then [ + ] ++ (if stdenv.hostPlatform.isDarwin then [ OpenGL GLUT ] else [ diff --git a/third_party/nixpkgs/pkgs/by-name/fu/furmark/package.nix b/third_party/nixpkgs/pkgs/by-name/fu/furmark/package.nix index c3e84546f8..adc2f9dc66 100644 --- a/third_party/nixpkgs/pkgs/by-name/fu/furmark/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fu/furmark/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL libGLU - ] ++ lib.optionals stdenv.isAarch64 [ libxcrypt-legacy ]; + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ libxcrypt-legacy ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix b/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix index f366b9290a..523253607e 100644 --- a/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix @@ -67,7 +67,7 @@ let haveDell = isx86; # only redfish for x86_64 - haveRedfish = stdenv.isx86_64; + haveRedfish = stdenv.hostPlatform.isx86_64; # only use msr if x86 (requires cpuid) haveMSR = isx86; @@ -121,7 +121,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.24"; + version = "1.9.25"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-jAR/c8hedprteCj5wrjST4yo8TxJ4JmLbPXSwBO3gJs="; + hash = "sha256-Yfj2Usto4BSnnBSvffdF02UeK4Ys8ZKzEsxrd2/XZe8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fy/fyne/package.nix b/third_party/nixpkgs/pkgs/by-name/fy/fyne/package.nix index a2e2e38265..fafe2a36a3 100644 --- a/third_party/nixpkgs/pkgs/by-name/fy/fyne/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fy/fyne/package.nix @@ -40,7 +40,7 @@ buildGoModule rec { libXrandr libXxf86vm ] - ++ (lib.optionals stdenv.isDarwin ( + ++ (lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ Carbon diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gambit-project/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gambit-project/package.nix index 630549a59c..1c254e0251 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/gambit-project/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/gambit-project/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optional withGui wxGTK31 - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gapcast/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gapcast/package.nix new file mode 100644 index 0000000000..c68e19f640 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ga/gapcast/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + libpcap, + xorg, +}: + +buildGoModule rec { + pname = "gapcast"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "ANDRVV"; + repo = "gapcast"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ei5XfcnbUoegB8lNEEQ3PrCzNJGaVeVd2lfrMWYoODw="; + }; + + vendorHash = "sha256-jn0zTorp/rkd91+ZGDbsNVcTxEndFMMrsb+/dGrZcy4="; + + buildInputs = [ + libpcap + xorg.libX11 + ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "802.11 broadcast analyzer & injector"; + homepage = "https://github.com/ANDRVV/gapcast"; + changelog = "https://github.com/ANDRVV/gapcast/releases/tag/v${version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "gapcast"; + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gavin-bc/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gavin-bc/package.nix index ad8364d41c..58c9ce6103 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/gavin-bc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/gavin-bc/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: cover most of configure settings diff --git a/third_party/nixpkgs/pkgs/by-name/gc/gcs/package.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcs/package.nix index 954128a40b..53fe4896f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/gc/gcs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gc/gcs/package.nix @@ -71,7 +71,7 @@ buildGoModule rec { fontconfig freetype ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Carbon darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.Kernel @@ -100,6 +100,6 @@ buildGoModule rec { maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; # incompatible vendor/github.com/richardwilkes/unison/internal/skia/libskia_linux.a - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/gd/gdlv/package.nix b/third_party/nixpkgs/pkgs/by-name/gd/gdlv/package.nix index 27628ae34d..3c7900c80a 100644 --- a/third_party/nixpkgs/pkgs/by-name/gd/gdlv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gd/gdlv/package.nix @@ -23,12 +23,13 @@ buildGoModule rec { subPackages = "."; preBuild = - lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' export MACOSX_DEPLOYMENT_TARGET=10.15 ''; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics Foundation diff --git a/third_party/nixpkgs/pkgs/by-name/ge/geesefs/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/geesefs/package.nix index 264ca14c40..7393705254 100644 --- a/third_party/nixpkgs/pkgs/by-name/ge/geesefs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ge/geesefs/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -let version = "0.41.2"; +let version = "0.41.3"; in buildGoModule { pname = "geesefs"; inherit version; @@ -12,7 +12,7 @@ in buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-W7f3vYjU1f6lxwkz24WjS3UzYy95bxk7nKoLpLsvUwM="; + hash = "sha256-KdxqOkz8U8ts/pU/sTMuDIBLxwvdtrkkGptYboh06Qo="; }; # hashes differ per architecture otherwise. diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gen-license/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gen-license/package.nix new file mode 100644 index 0000000000..a69b44d784 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/gen-license/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "gen-license"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "nexxeln"; + repo = "license-generator"; + rev = "${version}"; + hash = "sha256-VOmt8JXd2+ykhkhupv/I4RfXz9P0eEesW3JGAoXStUI="; + }; + + cargoHash = "sha256-TEsWACxEs4eJ8rO4RnKJWpwT1KcDoBEGftHSJt4YXVw="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Create licenses for your projects right from your terminal"; + mainProgram = "gen-license"; + homepage = "https://github.com/nexxeln/license-generator"; + license = licenses.mit; + maintainers = [ maintainers.ryanccn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ge/geoserver/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/geoserver/package.nix index ed1c82f806..76a68eea8c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ge/geoserver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ge/geoserver/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: rec { installPhase = let inputs = finalAttrs.buildInputs or [ ]; - ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnvName = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gepetto-viewer-corba/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gepetto-viewer-corba/package.nix new file mode 100644 index 0000000000..1760bea79a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/gepetto-viewer-corba/package.nix @@ -0,0 +1,69 @@ +{ + boost, + cmake, + doxygen, + fetchFromGitHub, + fontconfig, + gepetto-viewer, + lib, + pkg-config, + python3Packages, + libsForQt5, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gepetto-viewer-corba"; + version = "5.8.0"; + pyproject = false; # CMake + + src = fetchFromGitHub { + owner = "gepetto"; + repo = "gepetto-viewer-corba"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w="; + }; + + outputs = [ + "out" + "doc" + ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \ + --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES} + ''; + + buildInputs = [ libsForQt5.qtbase ]; + + nativeBuildInputs = [ + cmake + doxygen + libsForQt5.wrapQtAppsHook + pkg-config + python3Packages.omniorb + ]; + + propagatedBuildInputs = [ + python3Packages.boost + python3Packages.gepetto-viewer + python3Packages.omniorbpy + ]; + + doCheck = true; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + meta = { + homepage = "https://github.com/gepetto/gepetto-viewer-corba"; + description = "CORBA client/server for gepetto-viewer."; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gepetto-viewer/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gepetto-viewer/package.nix new file mode 100644 index 0000000000..8e87bb3b18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -0,0 +1,140 @@ +{ + boost, + cmake, + darwin, + doxygen, + fetchFromGitHub, + fetchpatch, + fontconfig, + lib, + jrl-cmakemodules, + libsForQt5, + makeWrapper, + openscenegraph, + osgqt, + pkg-config, + python3Packages, + qgv, + stdenv, + runCommand, +}: +let + gepetto-viewer = stdenv.mkDerivation (finalAttrs: { + pname = "gepetto-viewer"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "gepetto"; + repo = "gepetto-viewer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8="; + }; + + patches = [ + # fix use of CMAKE_INSTALL_BINDIR for $bin output + (fetchpatch { + url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch"; + hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs="; + }) + # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output + (fetchpatch { + url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch"; + hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc="; + }) + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin)) + ]; + + outputs = [ + "out" + "dev" + "bin" + "doc" + ]; + + buildInputs = [ + python3Packages.boost + python3Packages.python-qt + libsForQt5.qtbase + ]; + + nativeBuildInputs = + [ + cmake + doxygen + libsForQt5.wrapQtAppsHook + pkg-config + python3Packages.python + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + darwin.autoSignDarwinBinariesHook + ]; + + propagatedBuildInputs = [ + jrl-cmakemodules + openscenegraph + osgqt + qgv + ]; + + doCheck = true; + + # wrapQtAppsHook uses isMachO, which fails to detect binaries without this + # ref. https://github.com/NixOS/nixpkgs/pull/138334 + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin "export LC_ALL=C"; + + postFixup = '' + # CMake is not aware exports are in $dev + substituteInPlace $dev/lib/cmake/gepetto-viewer/gepetto-viewerConfig.cmake --replace-fail \ + "$out/lib/cmake" \ + "$dev/lib/cmake" + + # wrapQtAppsHook does only wrap stuff in $out, we want $bin + echo wrapping $bin/bin/gepetto-gui + wrapQtApp $bin/bin/gepetto-gui + ''; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + passthru.withPlugins = + plugins: + runCommand "gepetto-gui" + { + meta = { + # can't just "inherit (gepetto-viewer) meta;" because: + # error: derivation '/nix/store/…-gepetto-gui.drv' does not have wanted outputs 'bin' + inherit (gepetto-viewer.meta) + description + homepage + license + maintainers + mainProgram + platforms + ; + }; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = plugins; + } + '' + makeWrapper ${lib.getExe gepetto-viewer} $out/bin/gepetto-gui \ + --set GEPETTO_GUI_PLUGIN_DIRS ${lib.makeLibraryPath plugins} + ''; + + meta = { + description = "Graphical Interface for Pinocchio and HPP."; + homepage = "https://github.com/gepetto/gepetto-viewer"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.nim65s ]; + mainProgram = "gepetto-gui"; + platforms = lib.platforms.unix; + }; + }); +in +gepetto-viewer diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gex/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gex/package.nix index 2b404b98f4..b23169f058 100644 --- a/third_party/nixpkgs/pkgs/by-name/ge/gex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ge/gex/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { [ libgit2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gf/gfal2/package.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfal2/package.nix index 3b3debaf7f..205f6e192b 100644 --- a/third_party/nixpkgs/pkgs/by-name/gf/gfal2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gf/gfal2/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { lfc = false; # Break because of redundant `-luuid`. This needs to be fixed from the gfal2 upstream. # TODO: Change back to `true` once fixed. - mock = !stdenv.isDarwin; + mock = !stdenv.hostPlatform.isDarwin; rfio = false; sftp = true; srm = false; diff --git a/third_party/nixpkgs/pkgs/by-name/gh/gh-eco/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/gh-eco/package.nix index 0023620018..4918546f79 100644 --- a/third_party/nixpkgs/pkgs/by-name/gh/gh-eco/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gh/gh-eco/package.nix @@ -2,10 +2,9 @@ lib, fetchFromGitHub, buildGoModule, - fetchpatch, }: let - version = "0.1.3"; + version = "0.1.5"; in buildGoModule { pname = "gh-eco"; @@ -15,19 +14,10 @@ buildGoModule { owner = "jrnxf"; repo = "gh-eco"; rev = "refs/tags/v${version}"; - hash = "sha256-TE1AymNlxjUtkBnBO/VBjYaqLuRyxL75s6sMidKUXTE="; + hash = "sha256-Xtlz+u31hO81M53V0ZUtxmOgJ60zlspgVyCr181QrRE="; }; - patches = [ - # Fix package breaking on runtime by updating deps - (fetchpatch { - name = "update-deps.patch"; - url = "https://github.com/jrnxf/gh-eco/commit/d45b1e7de8cbcb692def0e94111262cdeff2835d.patch"; - hash = "sha256-vW5YX6C552dVYjBkYVoDbzT2PP8CaZzxh5g1TKHjrbU="; - }) - ]; - - vendorHash = "sha256-O3FQ+Z3KVYgTafwVXUhrGRuOAWlWlOhtVegKVoZBnDE="; + vendorHash = "sha256-mPZQPjZ+nnsRMYnSWDM9rYeAPvPwAp3vLZXwTNNHSx0="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix index b505e405e1..db5353c926 100644 --- a/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bE2cNgmq1TxtEDmLuyJVJpaj0Gbt73fnD1j/X42OL/w="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gh/ghex/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghex/package.nix index 0d81d0ba96..a0de4d0c65 100644 --- a/third_party/nixpkgs/pkgs/by-name/gh/ghex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gh/ghex/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Dvapi=true" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # mremap does not exist on darwin "-Dmmap-buffer-backend=false" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/girouette/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/girouette/package.nix index 2c2a733c31..09b0d61fcc 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/girouette/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/girouette/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-agecrypt/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-agecrypt/package.nix index a9c2d85ff6..bdd9beba17 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-agecrypt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-agecrypt/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config git ]; buildInputs = [ libgit2 zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-gr/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-gr/package.nix index 96a03ed49e..a50d389c04 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-gr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-gr/package.nix @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [installShellFiles] - ++ lib.optional stdenv.isLinux pkg-config; + ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = - lib.optional stdenv.isLinux openssl - ++ lib.optionals stdenv.isDarwin [ + lib.optional stdenv.hostPlatform.isLinux openssl + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-igitt/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-igitt/package.nix index a8c2819916..65ee35a5e7 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-igitt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-igitt/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { libgit2 oniguruma zlib - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix index d05e9fab87..18ab6f5fa0 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix @@ -37,6 +37,6 @@ rustPlatform.buildRustPackage { license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ mightyiam quodlibetor ]; changelog = "https://github.com/quodlibetor/git-instafix/releases/tag/v${version}"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-together/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-together/package.nix index e71668a83a..44ae1249a5 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-together/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-together/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin darwin.Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.Security; OPENSSL_NO_VENDOR = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-upstream/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-upstream/package.nix index f038db5a9d..d94ca080b6 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-upstream/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-upstream/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let pname = "git-upstream"; - version = "1.1.0"; + version = "1.2.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -14,17 +14,17 @@ in owner = "9999years"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Pq0Z1WwrTP7dCwk6V/E0zu9sLLWr3kNuT3aJRZuRzhI="; + hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA="; }; - cargoHash = "sha256-jNpleFrOvt1m2TXTeBXfhTSjWNpCknNoKooF2xsO46w="; + cargoHash = "sha256-a12C/fpeo0ZJ0MFQlKHVZER9dVrXF95YI1i8MwCTCJo="; - meta = with lib; { + meta = { homepage = "https://github.com/9999years/git-upstream"; changelog = "https://github.com/9999years/git-upstream/releases/tag/v${version}"; description = "Shortcut for `git push --set-upstream`"; - license = [licenses.mit]; - maintainers = [maintainers._9999years]; + license = [lib.licenses.mit]; + maintainers = [lib.maintainers._9999years]; mainProgram = "git-upstream"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix index 66da05851d..21fe0bb309 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitbutler/package.nix @@ -67,12 +67,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libsoup webkitgtk ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -144,13 +144,13 @@ rustPlatform.buildRustPackage rec { '' runHook preInstall '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin cp -r target/release/bundle/macos $out/Applications mv $out/Applications/GitButler.app/Contents/MacOS/GitButler $out/bin/git-butler ln -s $out/bin/git-butler $out/Applications/GitButler.app/Contents/MacOS/GitButler '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' cp -r target/release/bundle/"$tauriBundle"/*/data/usr $out desktop-file-edit \ diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitea-actions-runner/package.nix similarity index 73% rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix rename to third_party/nixpkgs/pkgs/by-name/gi/gitea-actions-runner/package.nix index 10e07234aa..d84c0de480 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitea-actions-runner/package.nix @@ -1,23 +1,24 @@ -{ lib -, fetchFromGitea -, buildGoModule -, testers -, gitea-actions-runner +{ + lib, + fetchFromGitea, + buildGo123Module, + testers, + gitea-actions-runner, }: -buildGoModule rec { +buildGo123Module rec { pname = "gitea-actions-runner"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${version}"; - hash = "sha256-YRWFBMHw9Fcmzkmglh2I1kXJkAAivqvCBcenLTjE/bI="; + hash = "sha256-PmDa8XIe1uZ4SSrs9zh5HBmFaOuj+uuLm7jJ4O5V1dI="; }; - vendorHash = "sha256-8sdSQhg9DnRLgghDZzWrUMM4vjinhCgu3dTKU7MBVQU="; + vendorHash = "sha256-lYJFySGqkhT89vHDp1FcTiiC7DG4ziQ1DaBHLh/kXQc="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix index fbfc407b81..d5a0b78f49 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "githooks"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "gabyx"; repo = "githooks"; rev = "v${version}"; - hash = "sha256-gTvbvW+AFyZUBt7gSKJGc9lrl7CAy+cOElcADlIvuRk="; + hash = "sha256-9IsE9XGeMgOPPEyBvGLZaZKyz5HjnugiELP76+alFmU="; }; modRoot = "./githooks"; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/github-runner/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/github-runner/package.nix index 535aaeed42..a2923b66b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/github-runner/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/github-runner/package.nix @@ -113,7 +113,7 @@ buildDotnetModule rec { nativeBuildInputs = [ which git - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; @@ -230,7 +230,7 @@ buildDotnetModule rec { substituteInPlace $out/lib/github-runner/config.sh \ --replace './bin/Runner.Listener' "$out/bin/Runner.Listener" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/lib/github-runner/config.sh \ --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \ --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \ @@ -256,7 +256,7 @@ buildDotnetModule rec { install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js mkdir -p $out/lib/github-runner/checkScripts install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH makeWrapperArgs=() diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 98c7c39499..55bfc010ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-0aVwI+E/UmYDSQDArQZsaNc0jDXXOG/zDr/5o0I1aLw="; + hash = "sha256-wkL6ko43oWrpyscEpCMuoFamDMJk9+xI3qYOs+DgI8g="; }; - cargoHash = "sha256-rZXIc9O+pIdR/M8kV7judiHTCwnKcX+7P1LWEqZLeD8="; + cargoHash = "sha256-H/p29QbCaZRa81g+5eUsG47tUJPVgB1J9zZYY5/n5Vk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix index 64f1f24e74..28119445dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip failing test "-skip TestHTTPSCustomCA" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-timelogs/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-timelogs/package.nix index 23c03763e3..c0dc2a2a61 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration iconv ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix index eda3c91c59..33eb8d0c9b 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitui/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitui/package.nix index a93cad7868..df3adcb0e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitui/package.nix @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux xclip - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux xclip + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.AppKit diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix index 6d6b0bb03d..0b1419c8f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "glance"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; rev = "v${version}"; - hash = "sha256-0P1f7IDEPSlVHtrygIsD502lIHqLISsSAi9pqB/gFdA="; + hash = "sha256-neoRuduQOC3DHeIy/sh1BWUwcwXPGQIgZRWQcL7gzlk="; }; vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08="; diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix index 3d5050a8d4..a5a7b33a0a 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ libGL ]; nativeBuildInputs = [ cmake extra-cmake-modules ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ] - ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; buildInputs = - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa Kernel ]) - ++ lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa Kernel ]) + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland wayland-protocols libxkbcommon @@ -48,12 +48,12 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/wl_init.c \ --replace-fail "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" \ --replace-fail "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" \ @@ -63,7 +63,7 @@ stdenv.mkDerivation { ''; # glfw may dlopen libwayland-client.so: - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf ''${!outputLib}/lib/libglfw.so --add-rpath ${lib.getLib wayland}/lib ''; diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glrnvim/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glrnvim/package.nix index 92a606699e..af11d0a666 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glrnvim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glrnvim/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ DiskArbitration Foundation ]); diff --git a/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix index ff501861b8..7dcd816c31 100644 --- a/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ aleksana ]; mainProgram = "gmetronome"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/gm/gmic/package.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmic/package.nix index 602f9cc802..71402ab7e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/gm/gmic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gm/gmic/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-maps/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-maps/package.nix index 85515a19ad..789e0c4d9b 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-maps/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-maps/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lAtBuXQLCBMyXjkWdYcWz4+g7k4MkZHyYM7AbZITWDU="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ gettext diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-panel/wrapper.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-panel/wrapper.nix index b52bab9694..9fb6d3c2d1 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-panel/wrapper.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-panel/wrapper.nix @@ -2,7 +2,6 @@ stdenv, lib, buildEnv, - gnome, gnome-panel, gnome-flashback, xorg, diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix index 2643d0f9a9..23d0a8eaa7 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix @@ -7,7 +7,6 @@ meson, ninja, pkg-config, - gnome, perl, gettext, gtk3, diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnucap/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnucap/package.nix index d67fc5d2c7..2713a2283d 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnucap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnucap/package.nix @@ -20,7 +20,7 @@ It performs nonlinear dc and transient analyses, fourier analysis, and ac analys changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; platforms = platforms.all; - broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH + broken = stdenv.hostPlatform.isDarwin; # Relies on LD_LIBRARY_PATH maintainers = [ maintainers.raboof ]; mainProgram = "gnucap"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnucobol/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnucobol/package.nix index 7c698954e5..75341f91bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/gn/gnucobol/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnucobol/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { aclocal automake '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # when building with nix on darwin, configure will use GNU strip, # which fails due to using --strip-unneeded, which is not supported substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip' @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { # error: call to undeclared function 'xmlCleanupParser' # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - env.CFLAGS = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-ethereum/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-ethereum/package.nix index 4b15286f7f..05e8768bde 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/go-ethereum/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/go-ethereum/package.nix @@ -50,7 +50,7 @@ in buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit ]; passthru.tests = { inherit (nixosTests) geth; }; diff --git a/third_party/nixpkgs/pkgs/by-name/go/gobang/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gobang/package.nix index 2889747b07..aaefff5aa3 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/gobang/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/gobang/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { buildInputs = with darwin.apple_sdk.frameworks; - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix b/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix index 14fe785c49..39249fbde7 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/goofcord/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Milkshiift"; repo = "GoofCord"; rev = "v${finalAttrs.version}"; - hash = "sha256-hG8nHAuEHw/tjFnGKhSXwO+2l91OOnQUIAK05SvEquU="; + hash = "sha256-ly0HkDFofdOgXOmlUW1za4u2INopiPs6B2kTC217/T0="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire stdenv.cc.cc.lib @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm'.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-wF7G8rs1Fg7whEftQ554s4C2CixP5/1oFudR5yY07Rk="; + hash = "sha256-455MGicIaC9WSUiwsbhdXxc8Cs3oqaneyOrMDPWsABw="; }; env = { @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Milkshiift/GoofCord"; downloadPage = "https://github.com/Milkshiift/GoofCord"; license = lib.licenses.osl3; - maintainers = with lib.maintainers; [ nyanbinary ]; + maintainers = with lib.maintainers; [ nyabinary ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix index 663991c8ed..4698f9c9a4 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix @@ -164,11 +164,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "128.0.6613.137"; + version = "129.0.6668.58"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-Ggah8tabckPemWtKehx8So1Y55J0UdhAFf5rPRSwV6Q="; + hash = "sha256-lFYGwpdicvp+E4S+sw4+3uFQSwGKvhyFenBZMVgVnMo="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -258,11 +258,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "128.0.6613.138"; + version = "129.0.6668.59"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/gtm24cqmnwgcp7dtscvlmsbrwa_128.0.6613.138/GoogleChrome-128.0.6613.138.dmg"; - hash = "sha256-wd6n3AeKxKdz+5X9XxTi1QHzmByzKRgIWcc3iBHhtZs="; + url = "http://dl.google.com/release2/chrome/acinjqjzbtmzhvrebvzymzvzfaoq_129.0.6668.59/GoogleChrome-129.0.6668.59.dmg"; + hash = "sha256-02J3TpcAsCvsB71C8/bfgIxiqcGIxjKiTWR32On66+g="; }; dontPatch = true; @@ -309,4 +309,4 @@ let mainProgram = "google-chrome-stable"; }; in -if stdenvNoCC.isDarwin then darwin else linux +if stdenvNoCC.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh index 0e63c9bb60..cf5113eac6 100755 --- a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/update.sh @@ -10,7 +10,7 @@ get_version_info() { local start_pattern="$2" local end_pattern="$3" - local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases" + local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction>=0.5&order_by=version%20desc" local response local version local current_version diff --git a/third_party/nixpkgs/pkgs/by-name/go/goss/package.nix b/third_party/nixpkgs/pkgs/by-name/go/goss/package.nix index 3f3a7fcebc..0b618c195d 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/goss/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/goss/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { postInstall = let runtimeDependencies = [ bash getent ] - ++ lib.optionals stdenv.isLinux [ systemd ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; in '' wrapProgram $out/bin/goss \ --prefix PATH : "${lib.makeBinPath runtimeDependencies}" diff --git a/third_party/nixpkgs/pkgs/by-name/go/gossip/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gossip/package.nix index f6c4927316..518539351c 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/gossip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/gossip/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { pkg-config rustPlatform.bindgenHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.CoreGraphics @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.ForceFeedback darwin.apple_sdk.frameworks.AVFoundation ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland xorg.libX11 xorg.libXcursor @@ -99,7 +99,7 @@ rustPlatform.buildRustPackage rec { ln -s $out/logo/gossip.png $out/share/icons/hicolor/128x128/apps/gossip.png ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' patchelf $out/bin/gossip \ --add-rpath ${ lib.makeLibraryPath [ diff --git a/third_party/nixpkgs/pkgs/by-name/go/got/package.nix b/third_party/nixpkgs/pkgs/by-name/go/got/package.nix index 29931498cc..d872cd7960 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/got/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/got/package.nix @@ -21,7 +21,7 @@ }: let - stdenv' = if stdenv.isDarwin && stdenv.isx86_64 + stdenv' = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv; in @@ -35,12 +35,12 @@ stdenv'.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ pkg-config bison ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ libressl libbsd libevent libuuid libmd zlib ncurses ] - ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' # The configure script assumes dependencies on Darwin are installed via # Homebrew or MacPorts and hardcodes assumptions about the paths of # dependencies which fails the nixpkgs configurePhase. @@ -53,12 +53,12 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optionals withSsh [ ''-DGOT_DIAL_PATH_SSH="${lib.getExe openssh}"'' ''-DGOT_TAG_PATH_SSH_KEYGEN="${lib.getExe' openssh "ssh-keygen"}"'' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ''-DGOT_TAG_PATH_SIGNIFY="${lib.getExe signify}"'' ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-error=implicit-function-declaration" "-Wno-error=int-conversion" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # error: conflicting types for 'strmode' "-DHAVE_STRMODE=1" # Undefined symbols for architecture arm64: "_bsd_getopt" diff --git a/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix index c68a6255fd..e783eb8069 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix @@ -88,6 +88,7 @@ buildGoModule rec { meta = { description = "Converts numerous document formats into PDF files"; + mainProgram = "gotenberg"; homepage = "https://gotenberg.dev"; changelog = "https://github.com/gotenberg/gotenberg/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpauth/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpauth/package.nix new file mode 100644 index 0000000000..e1199c9ed3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpauth/package.nix @@ -0,0 +1,50 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + libsoup, + openssl, + pkg-config, + perl, + webkitgtk, +}: + +rustPlatform.buildRustPackage rec { + pname = "gpauth"; + version = "2.3.7"; + + src = fetchFromGitHub { + owner = "yuezk"; + repo = "GlobalProtect-openconnect"; + rev = "v${version}"; + hash = "sha256-Zr888II65bUjrbStZfD0AYCXKY6VdKVJHQhbKwaY3is="; + }; + + buildAndTestSubdir = "apps/gpauth"; + cargoHash = "sha256-AuYw8CC0bMJzIJJQXhcQajQ4SACz4aKv6rG4HMq7U18="; + + nativeBuildInputs = [ + perl + pkg-config + ]; + buildInputs = [ + libsoup + openssl + webkitgtk + ]; + + meta = with lib; { + changelog = "https://github.com/${src.owner}/${src.repo}/blob/${src.rev}/changelog.md"; + description = "A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method"; + longDescription = '' + A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO + authentication method. Inspired by gp-saml-gui. + + The CLI version is always free and open source in this repo. It has almost + the same features as the GUI version. + ''; + homepage = "https://github.com/${src.owner}/${src.repo}"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ binary-eater ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpclient/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpclient/package.nix new file mode 100644 index 0000000000..786123e74d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpclient/package.nix @@ -0,0 +1,41 @@ +{ + rustPlatform, + gpauth, + openconnect, + openssl, + perl, + vpnc-scripts, +}: + +rustPlatform.buildRustPackage rec { + pname = "gpclient"; + + inherit (gpauth) version src meta; + + buildAndTestSubdir = "apps/gpclient"; + cargoHash = "sha256-aJYFBvVrj1n2+9WLLBH5WTRRzTle19LsdJ2DielJYik="; + + nativeBuildInputs = [ perl ]; + buildInputs = [ + gpauth + openconnect + openssl + ]; + + preConfigure = '' + substituteInPlace crates/gpapi/src/lib.rs \ + --replace-fail /usr/bin/gpauth ${gpauth}/bin/gpauth + substituteInPlace crates/common/src/vpn_utils.rs \ + --replace-fail /usr/sbin/vpnc-script ${vpnc-scripts}/bin/vpnc-script + ''; + + postInstall = '' + mkdir -p $out/share/applications + cp packaging/files/usr/share/applications/gpgui.desktop $out/share/applications/gpgui.desktop + ''; + + postFixup = '' + substituteInPlace $out/share/applications/gpgui.desktop \ + --replace-fail /usr/bin/gpclient $out/bin/gpclient + ''; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix index b0e87221f8..bb72042c21 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libxslt pkg-config wrapGAppsHook3 - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ exiv2 diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix index 515cb79553..a034a08aa7 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-Kf/ckUuG+SA8WQN2MKL+Xrz91RGPuA7X2/MjryRXsts="; propagatedBuildInputs = with darwin; - lib.optionals stdenv.isDarwin [Security]; + lib.optionals stdenv.hostPlatform.isDarwin [Security]; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix index e9eb1133f1..c09e7725b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix @@ -79,7 +79,7 @@ buildGoModule rec { # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isLinux [ "-I${lib.getDev systemd}/include" ]; checkFlags = [ "-tags nonetwork" # disable network tests @@ -89,7 +89,7 @@ buildGoModule rec { # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at # runtime. # Add to RUNPATH so it can be found. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/alloy)" \ $out/bin/alloy diff --git a/third_party/nixpkgs/pkgs/by-name/gr/granian/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/gr/granian/Cargo.lock new file mode 100644 index 0000000000..f6a3c5cd67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/granian/Cargo.lock @@ -0,0 +1,1421 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "granian" +version = "1.6.0" +dependencies = [ + "anyhow", + "crossbeam-channel", + "futures", + "http-body-util", + "hyper", + "hyper-util", + "itertools", + "log", + "mimalloc", + "pem", + "percent-encoding", + "pin-project", + "pkcs8", + "pyo3", + "pyo3-log", + "rustls-pemfile", + "socket2", + "tikv-jemallocator", + "tls-listener", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" +dependencies = [ + "aes", + "cbc", + "der", + "pbkdf2", + "scrypt", + "sha2", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "pkcs5", + "rand_core", + "spki", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +dependencies = [ + "anyhow", + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +dependencies = [ + "once_cell", + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.11.0" +source = "git+https://github.com/vorner/pyo3-log?rev=b62a250533#b62a250533f0a85e245dfcd189cadb368b1c73fc" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tls-listener" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a296135fdab7b3a1f708c338c50bab570bcd77d44080cde9341df45c0c6d73" +dependencies = [ + "futures-util", + "pin-project-lite", + "thiserror", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/third_party/nixpkgs/pkgs/by-name/gr/granian/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/granian/package.nix new file mode 100644 index 0000000000..ce2b033f27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/granian/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + python3Packages, + libiconv, +}: + +python3Packages.buildPythonApplication rec { + pname = "granian"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "emmett-framework"; + repo = "granian"; + rev = "v${version}"; + hash = "sha256-ZIwZrLl7goweYUj3t5e0yaOqeppFHXvK9PL3chNZZRw="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "pyo3-log-0.11.0" = "sha256-UU8064vM7cf20lwfifyPC205CY4tIgif0slDz/Pjf9Q="; + }; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + buildInputs = [ + libiconv + ]; + + dependencies = [ + python3Packages.uvloop + python3Packages.click + ]; + + meta = { + description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; + homepage = "https://github.com/emmett-framework/granian"; + license = lib.licenses.bsd3; + mainProgram = "granian"; + maintainers = with lib.maintainers; [ lucastso10 ]; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix index 6d5809e303..b8a1958677 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.80.0"; + version = "0.80.2"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-28/BR4oKOW7CK4gv4ESVZsvsyd6gKwW2XPvA1vU8/Wc="; + hash = "sha256-Q3KixUjyiPMLxoBIafyAUOeYRK6fhqgc150bLdwEk7M="; # 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; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-F8r332smhjVRxAQ42CvJDmBl2rjxgwUZpoMDhFsBYSA="; + vendorHash = "sha256-PXx5SyuKvxOZwJBspIiL8L7QzXzort6ZU3ZfrE8o700="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix index c75d4ee0f0..3a8c9be429 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-unused-function"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-unused-function"; meta = with lib; { description = "Bindings to Avahi for GNU Guile"; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-chickadee/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-chickadee/package.nix index f4a454bf4e..aa34a0d36d 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-chickadee/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-chickadee/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { command = "chickadee -v"; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Game development toolkit for Guile Scheme with SDL2 and OpenGL"; @@ -75,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ chito ]; mainProgram = "chickadee"; platforms = guile.meta.platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix index aa5bcbc4bc..4175b9c5d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; # tests hang on darwin, and fail randomly on aarch64-linux on ofborg - doCheck = !stdenv.isDarwin && !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Spritely Goblins for Guile"; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix index 21c9c6c539..a465849470 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; # tests fail on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "GNU Guile library providing bindings to lzlib"; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix index 89a361ef9e..9f7b941f06 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://ngyro.com/software/guile-lzma.html"; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-quickcheck/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-quickcheck/package.nix index 0a7a0c836a..2c3c0f9c4b 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-quickcheck/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-quickcheck/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ guile pkg-config ]; buildInputs = [ guile ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://ngyro.com/software/guile-quickcheck.html"; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-zstd/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-zstd/package.nix index 70fea933ea..2c0f9b8d04 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-zstd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-zstd/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zstd ]; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "GNU Guile library providing bindings to zstd"; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/gungnir/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/gungnir/package.nix index 571a9e1ac7..5ca7388338 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/gungnir/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/gungnir/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gungnir"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "g0ldencybersec"; repo = "gungnir"; rev = "v${version}"; - hash = "sha256-A4MPRsUSeYwKlhCHByty6T33wEp/BopZMDWOnOqlQqQ="; + hash = "sha256-iMawBuSPPeJztQ3Pdd2dUKSNaWCbbKcUW/IGBFifyng="; }; - vendorHash = "sha256-r2aU59L0fnSdc/lpR04K/GQ1eZ7ihV+tKlyuS6sPX2o="; + vendorHash = "sha256-2RCIZS8oawaXtAYZDiLgNsco9llWCxNwQcA67F51rag="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock index b8f19e6443..6bbad68198 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.26" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -78,6 +78,27 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +[[package]] +name = "alsa" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +dependencies = [ + "alsa-sys", + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "android-activity" version = "0.6.0" @@ -85,14 +106,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", "jni-sys", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", "ndk-sys 0.6.0+11769913", "num_enum", @@ -137,9 +158,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -205,9 +226,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -241,9 +262,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -255,7 +276,7 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -271,9 +292,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel", "async-io", @@ -286,7 +307,7 @@ dependencies = [ "futures-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -297,14 +318,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -315,7 +336,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -326,13 +347,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -380,6 +401,26 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.74", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -409,9 +450,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -464,22 +505,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -490,9 +531,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bytesize" @@ -506,7 +547,21 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.6.0", "log", "polling", "rustix", @@ -520,7 +575,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "calloop", + "calloop 0.12.4", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", "rustix", "wayland-backend", "wayland-client", @@ -528,13 +595,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -543,6 +610,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -573,14 +649,31 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] -name = "clipboard-win" -version = "5.3.1" +name = "clang-sys" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.5", +] + +[[package]] +name = "claxon" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -681,6 +774,26 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -693,9 +806,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -722,20 +835,42 @@ dependencies = [ ] [[package]] -name = "cosmic-text" -version = "0.10.0" +name = "coreaudio-rs" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cosmic-text" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2" +dependencies = [ + "bitflags 2.6.0", "fontdb", - "libm", "log", "rangemap", - "rustc-hash", + "rayon", + "rustc-hash 1.1.0", "rustybuzz", "self_cell", "swash", "sys-locale", + "ttf-parser 0.21.1", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -743,10 +878,33 @@ dependencies = [ ] [[package]] -name = "cpufeatures" -version = "0.2.12" +name = "cpal" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni", + "js-sys", + "libc", + "mach2", + "ndk 0.8.0", + "ndk-context", + "oboe", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.54.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -819,8 +977,8 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading 0.8.5", "winapi", ] @@ -840,6 +998,12 @@ dependencies = [ "zbus", ] +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + [[package]] name = "data" version = "0.1.0" @@ -847,14 +1011,17 @@ dependencies = [ "base64 0.21.7", "bytes", "chrono", + "const_format", "dirs-next", "flate2", "futures", "hex", "iced_core", "irc", - "itertools", + "itertools 0.12.1", "log", + "nom", + "once_cell", "palette", "rand", "rand_chacha", @@ -870,6 +1037,7 @@ dependencies = [ "tokio-stream", "toml", "url", + "walkdir", "xdg", ] @@ -957,7 +1125,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading 0.8.5", ] [[package]] @@ -983,7 +1151,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "drm-ffi", "drm-fourcc", @@ -1013,20 +1181,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embed-resource" -version = "2.4.2" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" dependencies = [ "cc", "memchr", @@ -1069,7 +1237,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -1196,9 +1364,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -1221,34 +1389,34 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" dependencies = [ "bytemuck", ] [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.15.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.8.0", + "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.19.2", + "ttf-parser 0.20.0", ] [[package]] @@ -1278,7 +1446,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -1372,7 +1540,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -1469,6 +1637,12 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "glow" version = "0.13.1" @@ -1493,12 +1667,12 @@ dependencies = [ [[package]] name = "glyphon" version = "0.5.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=f07e7bab705e69d39a5e6e52c73039a93c4552f8#f07e7bab705e69d39a5e6e52c73039a93c4552f8" +source = "git+https://github.com/hecrj/glyphon.git?rev=feef9f5630c2adb3528937e55f7bfad2da561a65#feef9f5630c2adb3528937e55f7bfad2da561a65" dependencies = [ "cosmic-text", "etagere", "lru", - "rustc-hash", + "rustc-hash 2.0.0", "wgpu", ] @@ -1508,7 +1682,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -1518,7 +1692,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1540,7 +1714,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown 0.14.5", ] @@ -1551,7 +1725,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1606,17 +1780,20 @@ dependencies = [ "iced", "image", "ipc", + "itertools 0.13.0", "log", "notify-rust", "once_cell", "open", "palette", "rfd", + "rodio", "thiserror", "timeago", "tokio", "unicode-segmentation", "uuid", + "windows_exe_info", ] [[package]] @@ -1644,10 +1821,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "thiserror", "widestring", "winapi", @@ -1683,6 +1860,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "hound" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" + [[package]] name = "http" version = "1.1.0" @@ -1696,9 +1879,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1725,9 +1908,9 @@ checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1778,9 +1961,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -1822,7 +2005,7 @@ dependencies = [ [[package]] name = "iced" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_core", "iced_futures", @@ -1836,9 +2019,9 @@ dependencies = [ [[package]] name = "iced_core" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "dark-light", "glam", @@ -1846,7 +2029,7 @@ dependencies = [ "num-traits", "once_cell", "palette", - "rustc-hash", + "rustc-hash 2.0.0", "smol_str", "thiserror", "web-time", @@ -1855,12 +2038,12 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "futures", "iced_core", "log", - "rustc-hash", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", @@ -1869,9 +2052,9 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "cosmic-text", "half", @@ -1882,7 +2065,7 @@ dependencies = [ "log", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", ] @@ -1890,7 +2073,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -1902,7 +2085,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "bytes", "iced_core", @@ -1914,14 +2097,14 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", "kurbo", "log", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", ] @@ -1929,9 +2112,9 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "futures", "glam", @@ -1940,7 +2123,7 @@ dependencies = [ "iced_graphics", "log", "once_cell", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "wgpu", ] @@ -1948,13 +2131,14 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_renderer", "iced_runtime", "num-traits", + "once_cell", "ouroboros", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", ] @@ -1962,13 +2146,13 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_futures", "iced_graphics", "iced_runtime", "log", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "tracing", "wasm-bindgen-futures", @@ -2008,9 +2192,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2093,7 +2277,7 @@ dependencies = [ name = "irc_proto" version = "0.1.0" dependencies = [ - "itertools", + "itertools 0.12.1", "nom", "thiserror", ] @@ -2135,6 +2319,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2165,9 +2358,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2183,9 +2376,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2206,7 +2399,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", ] @@ -2226,6 +2419,18 @@ dependencies = [ "smallvec", ] +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "lebe" version = "0.5.2" @@ -2233,10 +2438,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] -name = "libc" -version = "0.2.155" +name = "lewton" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "libloading" @@ -2250,12 +2466,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2270,7 +2486,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -2281,7 +2497,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -2293,9 +2509,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "lock_api" @@ -2309,15 +2525,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" [[package]] name = "mac-notification-sys" @@ -2332,6 +2548,15 @@ dependencies = [ "time", ] +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -2347,15 +2572,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.4" @@ -2380,7 +2596,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -2413,13 +2629,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2435,13 +2652,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "codespan-reporting", "hexf-parse", "indexmap", "log", "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -2465,13 +2682,27 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "thiserror", +] + [[package]] name = "ndk" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys 0.6.0+11769913", @@ -2506,13 +2737,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -2529,9 +2760,9 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.11.0" +version = "4.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +checksum = "26a1d03b6305ecefdd9c6c60150179bb8d9f0cd4e64bbcad1e41419e7bf5e414" dependencies = [ "log", "mac-notification-sys", @@ -2546,6 +2777,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -2567,23 +2809,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -2629,7 +2871,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "libc", "objc2", @@ -2645,7 +2887,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-core-location", @@ -2669,7 +2911,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-foundation", @@ -2711,7 +2953,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "dispatch", "libc", @@ -2736,7 +2978,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-foundation", @@ -2748,7 +2990,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-foundation", @@ -2771,7 +3013,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-cloud-kit", @@ -2803,7 +3045,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-core-location", @@ -2830,13 +3072,45 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] +[[package]] +name = "oboe" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" +dependencies = [ + "jni", + "ndk 0.8.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -2845,9 +3119,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.4" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -2856,11 +3130,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2877,7 +3151,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -2888,9 +3162,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2945,20 +3219,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck", - "itertools", + "itertools 0.12.1", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.21.1", + "ttf-parser 0.24.1", ] [[package]] @@ -2982,7 +3256,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -3034,9 +3308,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3087,7 +3361,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -3116,7 +3390,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -3133,9 +3407,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -3163,9 +3437,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", @@ -3173,7 +3447,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3190,9 +3464,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -3211,9 +3488,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3226,7 +3503,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "version_check", "yansi", ] @@ -3255,6 +3532,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.36" @@ -3334,9 +3620,9 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" dependencies = [ "bytemuck", "font-types", @@ -3362,11 +3648,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3382,9 +3668,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3497,10 +3783,24 @@ dependencies = [ ] [[package]] -name = "roxmltree" +name = "rodio" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb" +dependencies = [ + "claxon", + "cpal", + "hound", + "lewton", + "symphonia", + "thiserror", +] + +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-ini" @@ -3524,6 +3824,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -3539,7 +3845,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", @@ -3548,9 +3854,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.10" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -3562,9 +3868,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3575,9 +3881,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3585,15 +3891,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -3602,15 +3908,15 @@ dependencies = [ [[package]] name = "rustybuzz" -version = "0.11.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "bytemuck", "libm", "smallvec", - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -3655,14 +3961,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169" +checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", - "smithay-client-toolkit", + "memmap2", + "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -3674,11 +3980,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3687,9 +3993,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3709,31 +4015,32 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3746,14 +4053,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3792,6 +4099,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3815,9 +4128,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" dependencies = [ "bytemuck", "read-fonts", @@ -3853,33 +4166,58 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.5.0", - "calloop", - "calloop-wayland-source", + "bitflags 2.6.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2", "rustix", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.3", + "wayland-protocols-wlr 0.3.3", "wayland-scanner", "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.2", "wayland-backend", ] @@ -3904,9 +4242,9 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae0d2e93c874cca74fe830bccbd1132299318932d273d2a3c77ad77476a3d7e" +checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd" dependencies = [ "as-raw-xcb-connection", "bytemuck", @@ -3917,13 +4255,13 @@ dependencies = [ "foreign-types 0.5.0", "js-sys", "log", - "memmap2 0.9.4", + "memmap2", "objc2", "objc2-app-kit", "objc2-foundation", "objc2-quartz-core", "raw-window-handle", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "rustix", "tiny-xlib", "wasm-bindgen", @@ -3959,7 +4297,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3976,9 +4314,9 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svg_fmt" @@ -3988,15 +4326,64 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "swash" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ "skrifa", "yazi", "zeno", ] +[[package]] +name = "symphonia" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" +dependencies = [ + "lazy_static", + "symphonia-bundle-mp3", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-bundle-mp3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core", +] + [[package]] name = "syn" version = "1.0.109" @@ -4010,9 +4397,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -4061,21 +4448,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml", + "quick-xml 0.31.0", "windows 0.56.0", "windows-version", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4089,22 +4477,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -4181,16 +4569,16 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", "tracing", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4209,33 +4597,32 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -4285,21 +4672,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -4317,15 +4704,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] @@ -4345,15 +4732,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4374,7 +4761,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -4392,12 +4779,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "ttf-parser" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" - [[package]] name = "ttf-parser" version = "0.20.0" @@ -4410,6 +4791,12 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + [[package]] name = "typenum" version = "1.17.0" @@ -4435,15 +4822,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" @@ -4522,9 +4909,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] @@ -4537,9 +4924,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vswhom" @@ -4588,34 +4975,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4625,9 +5013,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4635,22 +5023,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-timer" @@ -4669,9 +5057,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", @@ -4683,11 +5071,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "rustix", "wayland-backend", "wayland-scanner", @@ -4699,16 +5087,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" dependencies = [ "rustix", "wayland-client", @@ -4721,7 +5109,19 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +dependencies = [ + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -4733,10 +5133,10 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -4746,29 +5146,42 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.3", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.31.2" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.34.0", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.2" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -4778,9 +5191,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4835,7 +5248,7 @@ checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "indexmap", @@ -4845,7 +5258,7 @@ dependencies = [ "parking_lot 0.12.3", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "web-sys", @@ -4855,15 +5268,15 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +checksum = "bfabcfc55fd86611a855816326b2d54c3b2fd7972c27ce414291562650552703" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -4877,7 +5290,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "log", "metal", "naga", @@ -4889,7 +5302,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -4904,7 +5317,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -4933,11 +5346,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4967,7 +5380,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", ] [[package]] @@ -4977,7 +5400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ "windows-core 0.56.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4986,7 +5409,17 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -4998,7 +5431,7 @@ dependencies = [ "windows-implement", "windows-interface", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5009,7 +5442,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -5020,7 +5453,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -5029,7 +5462,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5056,7 +5489,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5091,18 +5533,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5111,7 +5553,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5128,9 +5570,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5146,9 +5588,18 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_exe_info" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff" +dependencies = [ + "embed-resource", +] [[package]] name = "windows_i686_gnu" @@ -5164,15 +5615,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5188,9 +5639,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5206,9 +5657,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5224,9 +5675,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5242,9 +5693,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -5254,10 +5705,10 @@ dependencies = [ "ahash 0.8.11", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "bytemuck", - "calloop", + "calloop 0.12.4", "cfg_aliases 0.2.1", "concurrent-queue", "core-foundation", @@ -5266,8 +5717,8 @@ dependencies = [ "dpi", "js-sys", "libc", - "memmap2 0.9.4", - "ndk", + "memmap2", + "ndk 0.9.0", "objc2", "objc2-app-kit", "objc2-foundation", @@ -5279,7 +5730,7 @@ dependencies = [ "redox_syscall 0.4.1", "rustix", "sctk-adwaita", - "smithay-client-toolkit", + "smithay-client-toolkit 0.18.1", "smol_str", "tracing", "unicode-segmentation", @@ -5287,7 +5738,7 @@ dependencies = [ "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", "web-time", @@ -5308,9 +5759,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5354,7 +5805,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "once_cell", "rustix", "x11rb-protocol", @@ -5368,9 +5819,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg" @@ -5380,12 +5831,12 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5394,7 +5845,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -5409,9 +5860,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "yansi" @@ -5427,9 +5878,9 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -5466,14 +5917,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "zvariant_utils", ] @@ -5496,22 +5947,23 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -5531,9 +5983,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -5545,24 +5997,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix index 44fd206c57..04af62588d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix @@ -13,25 +13,26 @@ vulkan-loader, wayland, xorg, + alsa-lib, }: rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.8"; + version = "2024.11"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-OxxXjenZjP+3KrkxyXYxOXRFmrYm3deeiCuGrhpnF2I="; + hash = "sha256-kmdsC0SQoL5gppzBhnF0LfOFj14zeI3C6SdCBiVoKj0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "dpi-0.1.1" = "sha256-25sOvEBhlIaekTeWvy3UhjPI1xrJbOQvw/OkTg12kQY="; - "glyphon-0.5.0" = "sha256-+z2my51aUeK9txLZKVAyQcWJ6f2YDY1mjxfc8Xsqi8E="; - "iced-0.13.0-dev" = "sha256-eHlauEZibbuqK5mdkNP6gsy1z9qxqEDn/xfFw7W5TcY="; + "glyphon-0.5.0" = "sha256-OGXLqiMjaZ7gR5ANkuCgkfn/I7c/4h9SRE6MZZMW3m4="; + "iced-0.13.0-dev" = "sha256-XQUaI16lGEMGFxqK3UNd8jQfUiBzomxlT/I+yeZncFo="; }; }; @@ -43,6 +44,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ + alsa-lib libxkbcommon openssl vulkan-loader @@ -51,7 +53,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreGraphics @@ -61,7 +63,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.Security ] - ++ lib.optionals stdenv.isLinux [ wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; desktopItems = [ (makeDesktopItem { @@ -87,7 +89,7 @@ rustPlatform.buildRustPackage rec { }) ]; - postFixup = lib.optional stdenv.isLinux ( + postFixup = lib.optional stdenv.hostPlatform.isLinux ( let rpathWayland = lib.makeLibraryPath [ wayland @@ -104,7 +106,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \ $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' APP_DIR="$out/Applications/Halloy.app/Contents" mkdir -p "$APP_DIR/MacOS" diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix index ca51b3f8ec..80abccbf14 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.19.2"; + version = "2.19.3"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-+mp195Yyj4O5k/WxnAllVHbeTt/ZzR7olPG27xfUrlQ="; + hash = "sha256-Re0L+2P/Sxzj+fnuZi5uK2Hk72d8EvQGdjhglVbt41M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ha/handbrake/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/handbrake/package.nix index 50c487a466..264520341e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/handbrake/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/handbrake/package.nix @@ -11,7 +11,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, # For tests testers, runCommand, @@ -66,7 +65,7 @@ # which in turn depends on systemd. systemd is not supported on Darwin, so # for now we disable GTK GUI support on Darwin. (It may be possible to remove # this restriction later.) - useGtk ? !stdenv.isDarwin, + useGtk ? !stdenv.hostPlatform.isDarwin, appstream, desktop-file-utils, meson, @@ -199,7 +198,7 @@ let -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ -i make/configure.py '' - + optionalString stdenv.isDarwin '' + + optionalString stdenv.hostPlatform.isDarwin '' # Prevent the configure script from failing if xcodebuild isn't available, # which it isn't in the Nix context. (The actual build goes fine without # xcodebuild.) @@ -270,7 +269,7 @@ let xz zimg ] - ++ optional (!stdenv.isDarwin) numactl + ++ optional (!stdenv.hostPlatform.isDarwin) numactl ++ optionals useGtk [ dbus-glib glib @@ -287,7 +286,7 @@ let udev ] ++ optional useFdk fdk_aac - ++ optionals stdenv.isDarwin [ + ++ optionals stdenv.hostPlatform.isDarwin [ AudioToolbox Foundation libobjc @@ -295,7 +294,7 @@ let ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" - ++ optional stdenv.isLinux nv-codec-headers; + ++ optional stdenv.hostPlatform.isLinux nv-codec-headers; configureFlags = [ @@ -304,7 +303,7 @@ let ] ++ optional (!useGtk) "--disable-gtk" ++ optional useFdk "--enable-fdk-aac" - ++ optional stdenv.isDarwin "--disable-xcode" + ++ optional stdenv.hostPlatform.isDarwin "--disable-xcode" ++ optional stdenv.hostPlatform.isx86 "--harden"; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing @@ -363,7 +362,7 @@ let ]; mainProgram = "HandBrakeCLI"; platforms = with platforms; unix; - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 }; }; in diff --git a/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix index e6639eeec7..a18ab300af 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/harper/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "elijah-potter"; repo = "harper"; rev = "v${version}"; - hash = "sha256-DpBCTljIigpyZdiFm8x/bqDn+kzK8ILHpzGqX0d1mI8="; + hash = "sha256-83Fg1oywYuvyc5aFeujH/g8Czi8r0wBUr1Bj6vwxNec="; }; - cargoHash = "sha256-ZMZq/HRvr+JO/fHBJcyRtKXSzCabxkJRBe6OQjij77g="; + cargoHash = "sha256-Bt2KZ+m7VJXw4FYWt+ioo1XjZHNzbg/8fo8xrfEd6lI="; meta = { description = "Grammar Checker for Developers"; diff --git a/third_party/nixpkgs/pkgs/by-name/ha/harvid/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/harvid/package.nix index 83f1148904..efbe45d667 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/harvid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/harvid/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ which unixtools.xxd ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libpng ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libharvid/Makefile \ --replace-fail /usr/bin/libtool ${cctools}/bin/libtool ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix index 5ae22d698f..ef82772526 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { setuptools ] ++ [ cargo ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; @@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec { # Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls "test_new_selected_python" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" @@ -114,9 +114,9 @@ python3Packages.buildPythonApplication rec { "test_macos_archflags" "test_macos_max_compat" ] - ++ lib.optionals stdenv.isAarch64 [ "test_resolve" ]; + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError: assert [call('test h...2p32/bin/sh')] == [call('test h..., shell=True)] # At index 0 diff: # call('test hatch-test.py3.10', shell=True, executable='/nix/store/b34ianga4diikh0kymkpqwmvba0mmzf7-bash-5.2p32/bin/sh') diff --git a/third_party/nixpkgs/pkgs/by-name/ha/havoc/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/havoc/package.nix index ee5db97c98..81b8177c4e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/havoc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/havoc/package.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "havoc"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; - broken = stdenv.isDarwin; # fatal error: 'sys/epoll.h' file not found + broken = stdenv.hostPlatform.isDarwin; # fatal error: 'sys/epoll.h' file not found }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ha/haylxon/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/haylxon/package.nix index c4a781d7cd..5f8f71f411 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/haylxon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/haylxon/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6vVsm4gdcFCxKvvmOi3wlHkFoZp8CG+u50NfxIZqCl8="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = { description = "Save screenshots of urls and webpages from terminal"; diff --git a/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix b/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix index 4b03fb2731..2b71ad126e 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "UI for configuring Ploopy Headphones"; homepage = "https://github.com/ploopyco/headphones-toolbox/"; - maintainers = with maintainers; [ knarkzel nyanbinary ]; + maintainers = with maintainers; [ knarkzel nyabinary ]; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/he/hello/package.nix b/third_party/nixpkgs/pkgs/by-name/he/hello/package.nix index 70cc95364a..659899bd5f 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/hello/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/hello/package.nix @@ -31,12 +31,6 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = hello; }; - - invariant-under-noXlibs = - testers.testEqualDerivation - "hello must not be rebuilt when environment.noXlibs is set." - hello - (nixos { environment.noXlibs = true; }).pkgs.hello; }; passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; }; diff --git a/third_party/nixpkgs/pkgs/by-name/he/heptabase/package.nix b/third_party/nixpkgs/pkgs/by-name/he/heptabase/package.nix index 888d893109..160f4d767d 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/heptabase/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.37.0"; + version = "1.39.0"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-TgVHlUYgvbERXGzntwmBH/xBmJj2EsCd1SWUbQr8nqY="; + hash = "sha256-/uRPxmMTBr2ZkkY/Sp0FHI76ttoDDO7pID6fFckvUY8="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/by-name/he/hercules/package.nix b/third_party/nixpkgs/pkgs/by-name/he/hercules/package.nix index 080d3a849b..8a7e4a16db 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/hercules/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/hercules/package.nix @@ -6,7 +6,7 @@ , cmake , zlib , bzip2 -, enableRexx ? stdenv.isLinux, regina +, enableRexx ? stdenv.hostPlatform.isLinux, regina }: let herculesCpu = diff --git a/third_party/nixpkgs/pkgs/by-name/he/hextazy/package.nix b/third_party/nixpkgs/pkgs/by-name/he/hextazy/package.nix index e78780cde0..eb17fd5687 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/hextazy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/hextazy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hextazy"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "0xfalafel"; repo = "hextazy"; rev = "${version}"; - hash = "sha256-unZAW5ErHaEPpPwlo20/3//qhTpCjcmj0ses9FKgVJc="; + hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM="; }; - cargoHash = "sha256-4JpgUGthCbXSn98f4RrPoTcaGSCyZeuJqMVdLH7gKgs="; + cargoHash = "sha256-Ue7ukYkpNkoD9IRy/EWMsB5kMzwWny8onVNeN+3WWgQ="; meta = { description = "TUI hexeditor in Rust with colored bytes"; diff --git a/third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix index 4cb0ebf507..71f245d996 100644 --- a/third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix index 5a271432a0..027254e242 100644 --- a/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8="; - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-F${darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks" "-framework" "AppKit" @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme; diff --git a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix index 266bf0bc64..b225eb1650 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-09-09"; + version = "0-unstable-2024-09-21"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "10541f19c584fe9633c921903d8c095d5411e041"; - hash = "sha256-fj2LxTZAncL/s5NrtXe1nLfO0XDvRixtCu3kmV9jDPw="; + rev = "14929f7089268481d86b83ed31ffd88713dcd415"; + hash = "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/homebank/package.nix similarity index 60% rename from third_party/nixpkgs/pkgs/applications/office/homebank/default.nix rename to third_party/nixpkgs/pkgs/by-name/ho/homebank/package.nix index ef61bb15c3..ff5a4f5e86 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/homebank/package.nix @@ -1,16 +1,17 @@ -{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 +{ fetchurl, lib, stdenv, gtk3, pkg-config, libofx, intltool, wrapGAppsHook3 , libsoup_3, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "homebank"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-1CpForKKHXp6le8vVlObm22VTh2LqQlI9Qk4bwlzfLA="; + url = + "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; + hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; + buildInputs = [ gtk3 libofx libsoup_3 adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix index a798f05c7e..1484afa5a5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix @@ -1,30 +1,34 @@ -{ lib -, stdenv -, fetchurl -, appimageTools -, undmg +{ + lib, + stdenv, + fetchurl, + appimageTools, + undmg, }: let pname = "hoppscotch"; - version = "24.3.3-1"; + version = "24.8.1-0"; - src = fetchurl { - aarch64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-litOYRsUOx6VpkA1LPx7aGGagqIVL9fgNsYoP5n/2mo="; - }; - x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-UG89Fv9J8SnzPVoIO16LOprxPmZuu/zyox1b+jn+eNw="; - }; - x86_64-linux = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-110l1DTyvH2M0ex1r35Q+55NiJ8nYum1KdWQXDvAdxo="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + aarch64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; + hash = "sha256-Tc6lQbMZHX4Wl0R3fGClRr27fFTrYTxMtAkSPCw8mrw="; + }; + x86_64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; + hash = "sha256-c3UHntrLRoXfmz8LL3Xu8mjBtyf952/tYMFqbTyECR0="; + }; + x86_64-linux = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; + hash = "sha256-Aegc4kiLPtY+hlQtfYR3uztqs8Gj9fbUcAZ1XB8i1Pw="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - meta = with lib; { + meta = { description = "Open source API development ecosystem"; longDescription = '' Hoppscotch is a lightweight, web-based API development suite. It was built @@ -34,41 +38,56 @@ let ''; homepage = "https://hoppscotch.com"; downloadPage = "https://hoppscotch.com/downloads"; - changelog = "https://hoppscotch.com/changelog"; - license = licenses.mit; - maintainers = with maintainers; [ DataHearth ]; + changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/20${lib.head (lib.splitString "-" version)}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; mainProgram = "hoppscotch"; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation -{ - inherit pname version src meta; +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ undmg ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv Hoppscotch.app $out/Applications/ + mkdir -p "$out/Applications" + mv Hoppscotch.app $out/Applications/ - runHook postInstall - ''; -} -else appimageTools.wrapType2 { - inherit pname version src meta; - - extraInstallCommands = - let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; - in - '' - # Install .desktop files - install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + runHook postInstall ''; -} + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; + + extraInstallCommands = + let + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + # Install .desktop files + install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + ''; + } diff --git a/third_party/nixpkgs/pkgs/by-name/hp/hpipm/package.nix b/third_party/nixpkgs/pkgs/by-name/hp/hpipm/package.nix index a33efcc436..88899d752b 100644 --- a/third_party/nixpkgs/pkgs/by-name/hp/hpipm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hp/hpipm/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DHPIPM_FIND_BLASFEO=ON" "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (!stdenv.isx86_64) [ "-DTARGET=GENERIC" ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DTARGET=GENERIC" ]; meta = { description = "High-performance interior-point-method QP and QCQP solvers"; diff --git a/third_party/nixpkgs/pkgs/by-name/hp/hpp-fcl/package.nix b/third_party/nixpkgs/pkgs/by-name/hp/hpp-fcl/package.nix index 78ce6456c3..80e7154250 100644 --- a/third_party/nixpkgs/pkgs/by-name/hp/hpp-fcl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hp/hpp-fcl/package.nix @@ -28,10 +28,15 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - ] ++ lib.optionals pythonSupport [ python3Packages.numpy ]; + nativeBuildInputs = + [ + cmake + doxygen + ] + ++ lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.pythonImportsCheckHook + ]; propagatedBuildInputs = [ @@ -56,11 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - # pythonImportsCheck, but in stdenv.mkDerivation - postInstall = lib.optionalString pythonSupport '' - PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH - python -c "import hppfcl" - ''; + pythonImportsCheck = [ "hppfcl" ]; outputs = [ "dev" @@ -77,5 +78,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/humanoid-path-planner/hpp-fcl"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix index dbbe025bf6..df3c8cde12 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix @@ -38,9 +38,9 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnome-keyring - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix index c1cf23d22a..3cb4665f5e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ evey ]; # cannot find -lpthread: No such file or directory - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ht/htgettoken/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/htgettoken/package.nix index 30d34adeb2..6fa7bc4baa 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/htgettoken/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/htgettoken/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "htgettoken"; - version = "2.0"; + version = "2.0-2"; src = fetchFromGitHub { owner = "fermitools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yHUD8UaRNclALKKToFNzC49w5jivabXBt28xi6/u0Ow="; + hash = "sha256-1rF72zo/Jj4ZeEG2Nk6Wla+AfaDo5iPZhZP1j9WAK5I="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/ht/httpdirfs/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpdirfs/package.nix index 22dbceaf37..6b6ed108fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/httpdirfs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/httpdirfs/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PUYsT0VDEzerPqwrLJrET4kSsWsQhtnfmLepeaqtA+I="; }; - postPatch = lib.optional stdenv.isDarwin '' + postPatch = lib.optional stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace-fail '-fanalyzer' '-Xanalyzer' ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { # Disabled for Darwin because requires macFUSE installed outside NixOS - tests.version = lib.optionalAttrs stdenv.isLinux ( + tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux ( testers.testVersion { command = "${lib.getExe finalAttrs.finalPackage} --version"; package = finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/by-name/ht/httping/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/httping/package.nix index fbae6f89a7..1318c5d236 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/httping/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/httping/package.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - ]; - installPhase = '' runHook preInstall install -D httping $out/bin/httping diff --git a/third_party/nixpkgs/pkgs/by-name/ht/httptoolkit/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/httptoolkit/package.nix index 173e093cb7..5b2acf02bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/httptoolkit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/httptoolkit/package.nix @@ -29,7 +29,9 @@ buildNpmPackage rec { CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ copyDesktopItems ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; npmBuildScript = "build:src"; @@ -50,7 +52,7 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/httptoolkit cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/httptoolkit @@ -64,7 +66,7 @@ buildNpmPackage rec { --inherit-argv0 ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"HTTP Toolkit.app" $out/Applications diff --git a/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix b/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix index 439bc97d7a..11e9680d17 100644 --- a/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, buildGo123Module +, buildGoModule , fetchFromGitHub , installShellFiles , buildPackages @@ -8,15 +8,15 @@ , hugo }: -buildGo123Module rec { +buildGoModule rec { pname = "hugo"; - version = "0.134.2"; + version = "0.134.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-/jq8YMBgADC2Y98HzZNcDYZ9xhh6am6+G/dgouOGowE="; + hash = "sha256-rdXiuFWMB+cTK5mhtpabWq8Uf9ihDnkHNG1JnD3rLKE="; }; vendorHash = "sha256-oDa5uWQ/vFSmTNwZ3zsYtsuLCzddV9DeaEGx5krwWRE="; diff --git a/third_party/nixpkgs/pkgs/by-name/hu/hurl/package.nix b/third_party/nixpkgs/pkgs/by-name/hu/hurl/package.nix index b758e77970..db2f161970 100644 --- a/third_party/nixpkgs/pkgs/by-name/hu/hurl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hu/hurl/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libxml2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix index ca09fcee48..8c88d03c21 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hydra/package.nix @@ -124,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-09-15"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "b6f44b5cd020d95c405e149e4c3a0e9dc785e31a"; - hash = "sha256-dXDOX6IvAeznNoh73P2QWstBJ/jqfzEKjgNvdfsGTuY="; + rev = "44248d3cf4162944ec2e6a45f8cc058758bf5a86"; + hash = "sha256-WJ7M/1a8j5gRJJVzCJL6JrkGPckD5ZhKzTlmiKNdtm0="; }; buildInputs = [ @@ -173,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: { darcs gnused breezy - ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix index 82de87a7cc..13f9920c23 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-activewindow"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "FieldOfClay"; repo = "hyprland-activewindow"; rev = "v${version}"; - hash = "sha256-kRxA2DLbbABPJFwv/L7yeNJ8eqNUbuV6U/PB5iJNoAw="; + hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk="; }; - cargoHash = "sha256-s3Ho0+OzuLuWqFvaBu9NLXoasByHSuun9eJGAAISOJc="; + cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ="; meta = with lib; { description = "Multi-monitor-aware Hyprland workspace widget helper"; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix index 73c7ebe1ec..dd96593d5d 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc="; + hash = "sha256-cTIh/UwtVVAWdJEcwOxKmYHBA6XXAaAQz/yW0Xs0y1k="; }; - cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA="; + cargoHash = "sha256-NPphNQ2FLUrYLbquc2IzxuEjfmov+IPa1ixS6VGomPs="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix index bb8b059f7e..076b776049 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs="; + hash = "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprwayland-scanner/package.nix index b0a73bbcef..c6c46e9fb1 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwayland-scanner"; rev = "v${finalAttrs.version}"; - hash = "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU="; + hash = "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix b/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix index 8b9c4b6ad1..0cd000a97e 100644 --- a/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.10"; + version = "1.0.0"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-CZdulSe4qPb9ZOyH26dMVCiv/Y2T/u8fLohK8VeS1Ao="; + hash = "sha256-Xa/9xDfVadwFEelxoXVjvPgOojNtol6XeDoBbDLbdS0="; }; - cargoHash = "sha256-K+fDdAWrAKLQSMIMtEavhk7gIHINmL2eJLBhDLc1Jtg="; + cargoHash = "sha256-k4bWJjcOkYKh3WOnTM1+otWLw4C7sVzF6IVkYmpiNeQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ig/ignite-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ig/ignite-cli/package.nix index f4595e0b04..0db9b0a99b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ig/ignite-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ig/ignite-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.5.2"; + version = "28.5.3"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-RaK8NooOYYuk8RhxeeU9mB9PNSgWJ9nOxxcpi87YQQ0="; + hash = "sha256-ziuzSV7LjRgR1wNE1QD+OszIeXiip7pPU4/BD8fhV5s="; }; - vendorHash = "sha256-u/EwT43K7Tu7ns0NIWkRl7OiQuP37zz4ERUwCLXY1TE="; + vendorHash = "sha256-5Z5AuZtPwfENKp8wMYfRqmnkX4W4fWTjWulT5uNusPo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/im/imgpkg/package.nix b/third_party/nixpkgs/pkgs/by-name/im/imgpkg/package.nix new file mode 100644 index 0000000000..66b32695c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/imgpkg/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "imgpkg"; + version = "0.43.1"; + + src = fetchFromGitHub { + owner = "carvel-dev"; + repo = "imgpkg"; + rev = "v${version}"; + hash = "sha256-RjTVJjuzjNTZrg1VZ4NrDf1SZmS+CGzofYTBQEZNIag="; + }; + + vendorHash = null; + + subPackages = [ "cmd/imgpkg" ]; + + CGO_ENABLED = "0"; + ldflags = [ "-X=carvel.dev/imgpkg/pkg/imgpkg/cmd.Version=${version}" ]; + + meta = { + description = "Store application configuration files in Docker/OCI registries"; + homepage = "https://carvel.dev/imgpkg"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benchand ]; + mainProgram = "imgpkg"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix index f057d192ca..7bf1f14574 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix @@ -31,6 +31,6 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -in if stdenv.isDarwin +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version src meta; } else callPackage ./linux.nix { inherit pname version src meta; } diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich-cli/package.nix new file mode 100644 index 0000000000..d41dc764f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/immich-cli/package.nix @@ -0,0 +1,36 @@ +{ + lib, + immich, + buildNpmPackage, + nodejs, + makeWrapper, +}: +buildNpmPackage { + pname = "immich-cli"; + src = "${immich.src}/cli"; + inherit (immich.sources.components.cli) version npmDepsHash; + + nativeBuildInputs = [ makeWrapper ]; + + inherit (immich.web) preBuild; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv package.json package-lock.json node_modules dist $out/ + + makeWrapper ${lib.getExe nodejs} $out/bin/immich --add-flags $out/dist/index.js + + runHook postInstall + ''; + + meta = { + description = "Self-hosted photo and video backup solution (command line interface)"; + homepage = "https://immich.app/docs/features/command-line-interface"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; + inherit (nodejs.meta) platforms; + mainProgram = "immich"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/machine-learning.nix b/third_party/nixpkgs/pkgs/by-name/im/immich/machine-learning.nix new file mode 100644 index 0000000000..7a64518251 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/machine-learning.nix @@ -0,0 +1,105 @@ +{ + lib, + src, + fetchFromGitHub, + immich, + python3, + # Override Python packages using + # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } + # Applied after defaultOverrides + packageOverrides ? self: super: { }, +}: +let + defaultOverrides = self: super: { + pydantic = super.pydantic_1; + + versioningit = super.versioningit.overridePythonAttrs (_: { + doCheck = false; + }); + + albumentations = super.albumentations.overridePythonAttrs (_: rec { + version = "1.4.3"; + src = fetchFromGitHub { + owner = "albumentations-team"; + repo = "albumentations"; + rev = version; + hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA="; + }; + }); + }; + + python = python3.override { + self = python; + packageOverrides = lib.composeExtensions defaultOverrides packageOverrides; + }; +in +python.pkgs.buildPythonApplication { + pname = "immich-machine-learning"; + inherit (immich) version; + src = "${src}/machine-learning"; + pyproject = true; + + postPatch = '' + substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi' + ''; + + pythonRelaxDeps = [ "setuptools" ]; + pythonRemoveDeps = [ "opencv-python-headless" ]; + + build-system = with python.pkgs; [ + poetry-core + cython + ]; + + dependencies = + with python.pkgs; + [ + insightface + opencv4 + pillow + fastapi + uvicorn + aiocache + rich + ftfy + setuptools + python-multipart + orjson + gunicorn + huggingface-hub + tokenizers + pydantic + ] + ++ uvicorn.optional-dependencies.standard; + + doCheck = false; + + postInstall = '' + mkdir -p $out/share/immich + cp log_conf.json $out/share/immich + + cp -r ann $out/${python.sitePackages}/ + + makeWrapper ${lib.getExe python.pkgs.gunicorn} "''${!outputBin}"/bin/machine-learning \ + --prefix PYTHONPATH : "$out/${python.sitePackages}:$PYTHONPATH" \ + --set-default MACHINE_LEARNING_WORKERS 1 \ + --set-default MACHINE_LEARNING_WORKER_TIMEOUT 120 \ + --set-default MACHINE_LEARNING_CACHE_FOLDER /var/cache/immich \ + --set-default IMMICH_HOST "[::]" \ + --set-default IMMICH_PORT 3003 \ + --add-flags "app.main:app -k app.config.CustomUvicornWorker \ + -w \"\$MACHINE_LEARNING_WORKERS\" \ + -b \"\$IMMICH_HOST:\$IMMICH_PORT\" \ + -t \"\$MACHINE_LEARNING_WORKER_TIMEOUT\" + --log-config-json $out/share/immich/log_conf.json" + ''; + + meta = { + description = "Self-hosted photo and video backup solution (machine learning component)"; + homepage = "https://immich.app/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; + mainProgram = "machine-learning"; + inherit (immich.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix new file mode 100644 index 0000000000..ea64fd6594 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix @@ -0,0 +1,232 @@ +{ + lib, + stdenvNoCC, + buildNpmPackage, + fetchFromGitHub, + python3, + nodejs, + node-gyp, + runCommand, + nixosTests, + callPackage, + # build-time deps + glib, + pkg-config, + makeWrapper, + curl, + cacert, + unzip, + # runtime deps + ffmpeg-headless, + imagemagick, + libraw, + libheif, + vips, + perl, +}: +let + buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; + sources = lib.importJSON ./sources.json; + inherit (sources) version; + + buildLock = { + sources = + builtins.map + (p: { + name = p.pname; + inherit (p) version; + inherit (p.src) rev; + }) + [ + imagemagick + libheif + libraw + ]; + + packages = [ ]; + }; + + # The geodata website is not versioned, so we use the internet archive + geodata = + runCommand "immich-geodata" + { + outputHash = "sha256-imqSfzXaEMNo9T9tZr80sr/89n19kiFc8qwidFzRUaY="; + outputHashMode = "recursive"; + nativeBuildInputs = [ + cacert + curl + unzip + ]; + + meta.license = lib.licenses.cc-by-40; + } + '' + mkdir $out + url="https://web.archive.org/web/20240724153050/http://download.geonames.org/export/dump" + curl -Lo ./cities500.zip "$url/cities500.zip" + curl -Lo $out/admin1CodesASCII.txt "$url/admin1CodesASCII.txt" + curl -Lo $out/admin2Codes.txt "$url/admin2Codes.txt" + curl -Lo $out/ne_10m_admin_0_countries.geojson \ + https://raw.githubusercontent.com/nvkelso/natural-earth-vector/ca96624a56bd078437bca8184e78163e5039ad19/geojson/ne_10m_admin_0_countries.geojson + + unzip ./cities500.zip -d $out/ + echo "2024-07-24T15:30:50Z" > $out/geodata-date.txt + ''; + + src = fetchFromGitHub { + owner = "immich-app"; + repo = "immich"; + rev = "v${version}"; + inherit (sources) hash; + }; + + openapi = buildNpmPackage' { + pname = "immich-openapi-sdk"; + inherit version; + src = "${src}/open-api/typescript-sdk"; + inherit (sources.components."open-api/typescript-sdk") npmDepsHash; + + installPhase = '' + runHook preInstall + + npm config delete cache + npm prune --omit=dev --omit=optional + + mkdir -p $out + mv package.json package-lock.json node_modules build $out/ + + runHook postInstall + ''; + }; + + web = buildNpmPackage' { + pname = "immich-web"; + inherit version; + src = "${src}/web"; + inherit (sources.components.web) npmDepsHash; + + preBuild = '' + rm node_modules/@immich/sdk + ln -s ${openapi} node_modules/@immich/sdk + # Rollup does not find the dependency otherwise + ln -s node_modules/@immich/sdk/node_modules/@oazapfts node_modules/ + ''; + + installPhase = '' + runHook preInstall + + cp -r build $out + + runHook postInstall + ''; + }; + + node-addon-api = stdenvNoCC.mkDerivation rec { + pname = "node-addon-api"; + version = "8.0.0"; + src = fetchFromGitHub { + owner = "nodejs"; + repo = "node-addon-api"; + rev = "v${version}"; + hash = "sha256-k3v8lK7uaEJvcaj1sucTjFZ6+i5A6w/0Uj9rYlPhjCE="; + }; + installPhase = '' + mkdir $out + cp -r *.c *.h *.gyp *.gypi index.js package-support.json package.json tools $out/ + ''; + }; + + vips' = vips.overrideAttrs (prev: { + mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ]; + }); +in +buildNpmPackage' { + pname = "immich"; + inherit version; + src = "${src}/server"; + inherit (sources.components.server) npmDepsHash; + + nativeBuildInputs = [ + pkg-config + python3 + makeWrapper + glib + node-gyp + ]; + + buildInputs = [ + ffmpeg-headless + imagemagick + libraw + libheif + vips' # Required for sharp + ]; + + # Required because vips tries to write to the cache dir + makeCacheWritable = true; + + preBuild = '' + cd node_modules/sharp + + mkdir node_modules + ln -s ${node-addon-api} node_modules/node-addon-api + + ${lib.getExe nodejs} install/check + + rm -r node_modules + + cd ../.. + rm -r node_modules/@img/sharp* + ''; + + installPhase = '' + runHook preInstall + + npm config delete cache + npm prune --omit=dev + + mkdir -p $out/build + mv package.json package-lock.json node_modules dist resources $out/ + ln -s ${web} $out/build/www + ln -s ${geodata} $out/build/geodata + + echo '${builtins.toJSON buildLock}' > $out/build/build-lock.json + + makeWrapper ${lib.getExe nodejs} $out/bin/admin-cli --add-flags $out/dist/main --add-flags cli + makeWrapper ${lib.getExe nodejs} $out/bin/server --add-flags $out/dist/main --chdir $out \ + --set IMMICH_BUILD_DATA $out/build --set NODE_ENV production \ + --suffix PATH : "${ + lib.makeBinPath [ + perl + ffmpeg-headless + ] + }" + + runHook postInstall + ''; + + passthru = { + tests = { + inherit (nixosTests) immich; + }; + + machine-learning = callPackage ./machine-learning.nix { inherit src; }; + + inherit + src + sources + web + geodata + ; + updateScript = ./update.sh; + }; + + meta = { + description = "Self-hosted photo and video backup solution"; + homepage = "https://immich.app/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; + platforms = lib.platforms.linux; + mainProgram = "server"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json new file mode 100644 index 0000000000..a07d6c0b1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json @@ -0,0 +1,22 @@ +{ + "version": "1.115.0", + "hash": "sha256-H2FCR55redomrDjnnCQys47AaYbWEmlxO5NJEcVMBwY=", + "components": { + "cli": { + "npmDepsHash": "sha256-+zKtPHXjBd1KAKvI5xaY2/9qzVUg+8Ho/wrV9+TlU64=", + "version": "2.2.19" + }, + "server": { + "npmDepsHash": "sha256-6CehRhPepspDpQW1h0Bx7EpH7hn42Ygqma/6wim14jA=", + "version": "1.115.0" + }, + "web": { + "npmDepsHash": "sha256-ZmXfYktgOmMkDjfqSGyyflr2CmnC9yVnJ1gAcmd6A00=", + "version": "1.115.0" + }, + "open-api/typescript-sdk": { + "npmDepsHash": "sha256-l1mLYFpFQjYxytY0ZWLq+ldUhZA6so0HqPgCABt0s9k=", + "version": "1.115.0" + } + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/update.sh b/third_party/nixpkgs/pkgs/by-name/im/immich/update.sh new file mode 100755 index 0000000000..1558577b8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq prefetch-npm-deps nix-prefetch-github coreutils + +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +old_version=$(jq -r ".version" sources.json || echo -n "0.0.1") +version=$(curl -s "https://api.github.com/repos/immich-app/immich/releases/latest" | jq -r ".tag_name") +version="${version#v}" + +echo "Updating to $version" + +if [[ "$old_version" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +echo "Fetching src" +src_hash=$(nix-prefetch-github immich-app immich --rev "v${version}" | jq -r .hash) +upstream_src="https://raw.githubusercontent.com/immich-app/immich/v$version" + +sources_tmp="$(mktemp)" +cat < "$sources_tmp" +{ + "version": "$version", + "hash": "$src_hash", + "components": {} +} +EOF + +lock=$(mktemp) +for npm_component in cli server web "open-api/typescript-sdk"; do + echo "fetching $npm_component" + curl -s -o "$lock" "$upstream_src/$npm_component/package-lock.json" + hash=$(prefetch-npm-deps "$lock") + echo "$(jq --arg npm_component "$npm_component" \ + --arg hash "$hash" \ + --arg version "$(jq -r '.version' <"$lock")" \ + '.components += {($npm_component): {npmDepsHash: $hash, version: $version}}' \ + "$sources_tmp")" > "$sources_tmp" +done + +rm "$lock" +cp "$sources_tmp" sources.json diff --git a/third_party/nixpkgs/pkgs/by-name/im/implot/demos/default.nix b/third_party/nixpkgs/pkgs/by-name/im/implot/demos/default.nix index b3a369668c..677448924d 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/implot/demos/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/implot/demos/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/epezent/implot_demos"; broken = stdenv.hostPlatform.isAarch64 # Target "mandel" relies on AVX2 - || stdenv.isDarwin; + || stdenv.hostPlatform.isDarwin; license = lib.licenses.mit; maintainers = with lib.maintainers; [ SomeoneSerge ]; mainProgram = "implot-demos"; diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix b/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix index 7ffdc1c83e..4216710c02 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix @@ -128,8 +128,8 @@ buildGoModule rec { ui = callPackage ./ui.nix { }; - updateScript = writeScript "ovs-update.nu" '' - ${./update.nu} ${updateScriptArgs} + updateScript = writeScript "ovs-update.py" '' + ${./update.py} ${updateScriptArgs} ''; }; diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/lts.nix b/third_party/nixpkgs/pkgs/by-name/in/incus/lts.nix index ec0a38efb4..98fe4f2e7c 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/incus/lts.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/incus/lts.nix @@ -1,13 +1,12 @@ import ./generic.nix { - hash = "sha256-8GgzMiXn/78HkMuJ49cQA9BEQVAzPbG7jOxTScByR6Q="; - version = "6.0.1"; - vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; + hash = "sha256-roPBHqy5toYF0X9mATl6QYb5GGlgPoGZYOC9vKpca88="; + version = "6.0.2"; + vendorHash = "sha256-TP1NaUpsHF54mWQDcHS4uabfRJWu3k51ANNPdA4k1Go="; patches = [ # qemu 9.1 compat, remove when added to LTS ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch - ./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch ]; lts = true; - updateScriptArgs = "--lts=true --regex '6.0.*'"; + updateScriptArgs = "--lts --regex '6.0.*'"; } diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/update.nu b/third_party/nixpkgs/pkgs/by-name/in/incus/update.nu deleted file mode 100755 index 754da9b59a..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/in/incus/update.nu +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i nu -p nushell common-updater-scripts gnused - -def main [--lts = false, --regex: string] { - let attr = $"incus(if $lts {"-lts"})" - let file = $"(pwd)/pkgs/by-name/in/incus/(if $lts { "lts" } else { "package" }).nix" - - let tags = list-git-tags --url=https://github.com/lxc/incus | lines | sort --natural | str replace v '' - let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last - let current_version = nix eval --raw -f default.nix $"($attr).version" | str trim - - if $latest_tag != $current_version { - print $"Updating: new ($latest_tag) != old ($current_version)" - update-source-version $attr $latest_tag $"--file=($file)" - - let oldVendorHash = nix-instantiate . --eval --strict -A $"($attr).goModules.drvAttrs.outputHash" --json | from json - let checkBuild = do { nix-build -A $"($attr).goModules" } | complete - let vendorHash = $checkBuild.stderr | lines | str trim | find --regex 'got:[[:space:]]*sha256' | split row ' ' | last - - if $vendorHash != null { - open $file | str replace $oldVendorHash $vendorHash | save --force $file - } else { - print $checkBuild.stderr - exit 1 - } - } - - {"lts?": $lts, before: $current_version, after: $latest_tag} -} diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/update.py b/third_party/nixpkgs/pkgs/by-name/in/incus/update.py new file mode 100755 index 0000000000..1db118a596 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/in/incus/update.py @@ -0,0 +1,87 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p python3 python3Packages.looseversion common-updater-scripts nurl + +import argparse +import json +import os +import re +from looseversion import LooseVersion +from subprocess import run + +parser = argparse.ArgumentParser() +parser.add_argument("--lts", action="store_true") +parser.add_argument("--regex") +args = parser.parse_args() + +nixpkgs_path = os.environ["PWD"] + +attr = "incus" +file = f"pkgs/by-name/in/incus/package.nix" +if args.lts: + attr = "incus-lts" + file = f"pkgs/by-name/in/incus/lts.nix" + +tags = ( + run(["list-git-tags", "--url=https://github.com/lxc/incus"], capture_output=True) + .stdout.decode("utf-8") + .splitlines() +) +tags = [t.lstrip("v") for t in tags] + +latest_version = "0" +for tag in tags: + if args.regex != None and not re.match(args.regex, tag): + continue + + if LooseVersion(tag) > LooseVersion(latest_version): + latest_version = tag + +current_version = ( + run( + ["nix", "eval", "--raw", "-f", "default.nix", f"{attr}.version"], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() +) + +if LooseVersion(latest_version) <= LooseVersion(current_version): + print("No update available") + exit(0) + +print(f"Found new version {latest_version} > {current_version}") + +run(["update-source-version", attr, latest_version, f"--file={file}"]) + +current_vendor_hash = ( + run( + [ + "nix-instantiate", + ".", + "--eval", + "--strict", + "-A", + f"{attr}.goModules.drvAttrs.outputHash", + "--json", + ], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() + .strip('"') +) + +latest_vendor_hash = ( + run( + ["nurl", "--expr", f"(import {nixpkgs_path} {{}}).{attr}.goModules"], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() +) + +with open(file, "r+") as f: + file_content = f.read() + file_content = re.sub(current_vendor_hash, latest_vendor_hash, file_content) + f.seek(0) + f.write(file_content) diff --git a/third_party/nixpkgs/pkgs/by-name/in/inhibridge/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inhibridge/package.nix new file mode 100644 index 0000000000..4340d4a3e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/in/inhibridge/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitea, +}: +rustPlatform.buildRustPackage rec { + pname = "inhibridge"; + version = "0.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Scrumplex"; + repo = "inhibridge"; + rev = version; + hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM="; + }; + + cargoHash = "sha256-uKSbxAsGUR2nYfdtiTR/bgPBQunqYLzx3+CmszNilPQ="; + + meta = with lib; { + homepage = "https://codeberg.org/Scrumplex/inhibridge"; + description = "Simple daemon that bridges freedesktop.org ScreenSaver inhibitions to systemd-inhibit"; + platforms = platforms.linux; + license = licenses.agpl3Plus; + maintainers = with maintainers; [Scrumplex]; + mainProgram = "inhibridge"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix index d7a1589ccb..3b2a84ace0 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix @@ -20,8 +20,8 @@ buildNpmPackage rec { # npm ERR! int ret = openpty(&master, &slave, nullptr, NULL, static_cast(&winp)); # # when `node-gyp` tries to build the dep. The below allows `npm` to download the prebuilt binary. - makeCacheWritable = stdenv.isDarwin; - nativeBuildInputs = lib.optional stdenv.isDarwin cacert; + makeCacheWritable = stdenv.hostPlatform.isDarwin; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin cacert; meta = with lib; { description = "IDE style command line auto complete"; diff --git a/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix index 5070b60abc..31f78a23b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/third_party/nixpkgs/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 8ec3a32529..a968dd9231 100644 --- a/third_party/nixpkgs/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -13,7 +13,6 @@ libusb1, openssl, - ios-webkit-debug-proxy, nix-update-script, testers, }: @@ -61,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = ios-webkit-debug-proxy; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/ip/ipxe/package.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipxe/package.nix index c06072a410..85e3564f3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ip/ipxe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ip/ipxe/package.nix @@ -19,7 +19,7 @@ let targets = additionalTargets - // lib.optionalAttrs stdenv.isx86_64 { + // lib.optionalAttrs stdenv.hostPlatform.isx86_64 { "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; @@ -32,13 +32,13 @@ let "bin/ipxe.lkrn" = null; "bin/undionly.kpxe" = null; } - // lib.optionalAttrs stdenv.isAarch32 { + // lib.optionalAttrs stdenv.hostPlatform.isAarch32 { "bin-arm32-efi/ipxe.efi" = null; "bin-arm32-efi/ipxe.efirom" = null; "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; "bin-arm32-efi/snp.efi" = null; } - // lib.optionalAttrs stdenv.isAarch64 { + // lib.optionalAttrs stdenv.hostPlatform.isAarch64 { "bin-arm64-efi/ipxe.efi" = null; "bin-arm64-efi/ipxe.efirom" = null; "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; diff --git a/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix b/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix index 8a5956e52a..7521bab9d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { "--deselect=tests/unittests/test_render_functions.py::test_render_time" # Only execute unittests, because cli tests require a running Redis "tests/unittests/" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests "--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority" "--deselect=tests/unittests/test_utils.py::test_timer" diff --git a/third_party/nixpkgs/pkgs/by-name/is/isabelle/package.nix b/third_party/nixpkgs/pkgs/by-name/is/isabelle/package.nix index 3adf58f467..1012d06542 100644 --- a/third_party/nixpkgs/pkgs/by-name/is/isabelle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/is/isabelle/package.nix @@ -30,7 +30,7 @@ let hash = "sha256-DB/ETVZhbT82IMZA97TmHG6gJcGpFavxDKDTwPzIF80="; }; - buildPhase = (if stdenv.isDarwin then '' + buildPhase = (if stdenv.hostPlatform.isDarwin then '' LDFLAGS="-dynamic -undefined dynamic_lookup -lSystem" '' else '' LDFLAGS="-fPIC -shared" @@ -52,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: rec { dirname = "Isabelle${version}"; src = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then fetchurl { @@ -74,14 +74,14 @@ in stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ java ]; buildInputs = [ polyml veriT vampire eprover-ho nettools ] - ++ lib.optionals (!stdenv.isDarwin) [ java procps ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ java procps ]; - sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; + sourceRoot = "${dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}"; doCheck = stdenv.hostPlatform.system != "aarch64-linux"; checkPhase = "bin/isabelle build -v HOL-SMT_Examples"; - postUnpack = lib.optionalString stdenv.isDarwin '' + postUnpack = lib.optionalString stdenv.hostPlatform.isDarwin '' mv $sourceRoot ${dirname} sourceRoot=${dirname} ''; @@ -144,10 +144,10 @@ in stdenv.mkDerivation (finalAttrs: rec { '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' substituteInPlace lib/scripts/isabelle-platform \ --replace-fail 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' arch=${if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system} for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.isAarch64 " || true"} + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"} done patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process for d in contrib/kodkodi-*/jni/$arch; do @@ -221,7 +221,7 @@ in stdenv.mkDerivation (finalAttrs: rec { license = licenses.bsd3; maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru.withComponents = f: diff --git a/third_party/nixpkgs/pkgs/by-name/it/itch/package.nix b/third_party/nixpkgs/pkgs/by-name/it/itch/package.nix index e49f389bab..2955808037 100644 --- a/third_party/nixpkgs/pkgs/by-name/it/itch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/it/itch/package.nix @@ -91,6 +91,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${steam-run}/bin/steam-run $out/bin/itch \ --add-flags ${electron}/bin/electron \ --add-flags $out/share/itch/resources/app \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}:${itch-setup} ''; diff --git a/third_party/nixpkgs/pkgs/by-name/iv/iverilog/package.nix b/third_party/nixpkgs/pkgs/by-name/iv/iverilog/package.nix index 06e8a94a4c..3dbbd8056d 100644 --- a/third_party/nixpkgs/pkgs/by-name/iv/iverilog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/iv/iverilog/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # (see https://github.com/steveicarus/iverilog/issues/917) # so disable the full suite for now. doCheck = true; - doInstallCheck = !stdenv.isAarch64; + doInstallCheck = !stdenv.hostPlatform.isAarch64; nativeInstallCheckInputs = [ perl diff --git a/third_party/nixpkgs/pkgs/by-name/iw/iwqr/package.nix b/third_party/nixpkgs/pkgs/by-name/iw/iwqr/package.nix new file mode 100644 index 0000000000..5609c70d4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/iw/iwqr/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + nix-update-script, + testers, + iwqr, +}: + +rustPlatform.buildRustPackage rec { + pname = "iwqr"; + version = "0.1.1"; + + src = fetchFromGitea { + domain = "git.kroner.dev"; + owner = "kreny"; + repo = "iwqr"; + rev = "v${version}"; + hash = "sha256-z9CjCJvi6MlZGghZKx13gGSKwUnECAf0cr9P2ABskh0="; + }; + + cargoHash = "sha256-EFen2x/+a5xLsDmodNCkuGBR7+Oy2fdXcxzANLcWWZs="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = iwqr; + }; + }; + + meta = with lib; { + description = "Tool for generating qr codes for iwd networks"; + homepage = "https://git.kroner.dev/kreny/iwqr"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ h7x4 ]; + mainProgram = "iwqr"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/j/j/package.nix b/third_party/nixpkgs/pkgs/by-name/j/j/package.nix index 97a8064cc6..a832bc9533 100644 --- a/third_party/nixpkgs/pkgs/by-name/j/j/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/j/j/package.nix @@ -30,17 +30,17 @@ stdenv.mkDerivation rec { # Emulate jplatform64.sh configuration variables jplatform = - if stdenv.isDarwin then "darwin" + if stdenv.hostPlatform.isDarwin then "darwin" else if stdenv.hostPlatform.isAarch then "raspberry" - else if stdenv.isLinux then "linux" + else if stdenv.hostPlatform.isLinux then "linux" else "unsupported"; j64x = - if stdenv.is32bit then "j32" - else if stdenv.isx86_64 then - if stdenv.isLinux && avx2Support then "j64avx2" else "j64" - else if stdenv.isAarch64 then - if stdenv.isDarwin then "j64arm" else "j64" + if stdenv.hostPlatform.is32bit then "j32" + else if stdenv.hostPlatform.isx86_64 then + if stdenv.hostPlatform.isLinux && avx2Support then "j64avx2" else "j64" + else if stdenv.hostPlatform.isAarch64 then + if stdenv.hostPlatform.isDarwin then "j64arm" else "j64" else "unsupported"; env.NIX_LDFLAGS = "-lgmp"; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Only; maintainers = with maintainers; [ raskin synthetica AndersonTorres ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.all; mainProgram = "jconsole"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix index 91216d3219..eb0a8c9e49 100644 --- a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-lfN5ant3oS7uschxyCxmiKNLJUJiqWVZLaJ8djqNKzQ="; + hash = "sha256-BrNfpf9v8yAs4y3vaPlqtOI9SE7IFfZm/CYegcuZT3c="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix new file mode 100644 index 0000000000..3c79b955f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "jawiki-all-titles-in-ns0"; + version = "0-unstable-2024-09-11"; + + src = fetchFromGitHub { + owner = "musjj"; + repo = "jawiki-archive"; + rev = "d205f63665e351ea853edc72157f14daa22a227f"; + hash = "sha256-Jj2vH8UMhgSzWv+RnOipnVNSdeOF6jttcLN/kVYa4D4="; + }; + + installPhase = '' + runHook preInstall + + mkdir $out + cp jawiki-latest-all-titles-in-ns0.gz $out/jawiki-all-titles-in-ns0.gz + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "A jawiki dump list of page titles in main namespace"; + homepage = "https://dumps.wikimedia.org/backup-index.html"; + license = with lib.licenses; [ + fdl13Only + cc-by-sa-30 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides a dump gz file + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/jd/jdt-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/jd/jdt-language-server/package.nix index 33d735424c..268599a385 100644 --- a/third_party/nixpkgs/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jd/jdt-language-server/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # The application ships with different config directories for each platform. # Note the application come with ARM variants as well, although the # current included wrapper doesn't use them. - configDir = if stdenv.isDarwin then "config_mac" else "config_linux"; + configDir = if stdenv.hostPlatform.isDarwin then "config_mac" else "config_linux"; in '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix b/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix index c1f81ee3f2..ee5622baab 100644 --- a/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix @@ -16,7 +16,7 @@ let # node-canvas builds code that requires aligned_alloc, # which on Darwin requires at least the 10.15 SDK stdenv' = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.15"; darwinSdkVersion = "11.0"; @@ -42,11 +42,11 @@ buildNpmPackage' rec { npmBuildScript = [ "build:production" ]; - nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ pango ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib darwin.apple_sdk.frameworks.CoreText ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix b/third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix index aa4ab81845..a401e9633f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix b/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix index ecb59dad37..6257fbeede 100644 --- a/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xF0sxoSo7z7lxrF3wFAmU7edREoWKBFBnZ6Xq22c8q0="; - buildInputs = lib.optional stdenv.isDarwin ( + buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreGraphics diff --git a/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix index 3912f03daf..1d057f6ecd 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ asl20 mit mpl20 ]; maintainers = with lib.maintainers; [ fgaz ]; mainProgram = "jobs"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/jo/jogl/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/jogl/package.nix index a12b6b7622..d8a626ee15 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/jogl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/jogl/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { --delete '//*[@if="setup.addNativeBroadcom"]' \ jogl/make/build-newt.xml '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml rm -r jogl/oculusvr-sdk ''; @@ -67,11 +67,11 @@ stdenv.mkDerivation { git xmlstarlet stripJavaArchivesHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev xorg.libX11 xorg.libXrandr @@ -81,7 +81,7 @@ stdenv.mkDerivation { xorg.libXxf86vm xorg.libXrender mesa - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/by-name/jo/joshuto/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/joshuto/package.nix index 18ef1ea063..0d35b905a9 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/joshuto/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/joshuto/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix index 749f6e0ba2..920b294562 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ jre ]; installPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications '' else '' diff --git a/third_party/nixpkgs/pkgs/by-name/jo/jove/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/jove/package.nix index 82c3f9056d..8c4c171707 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/jove/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/jove/package.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/jp/jp-zip-codes/package.nix b/third_party/nixpkgs/pkgs/by-name/jp/jp-zip-codes/package.nix new file mode 100644 index 0000000000..bec361fb65 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/jp/jp-zip-codes/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "jp-zip-code"; + version = "0-unstable-2024-09-01"; + + # This package uses a mirror as the source because the + # original provider uses the same URL for updated content. + src = fetchFromGitHub { + owner = "musjj"; + repo = "jp-zip-codes"; + rev = "995d7cce9ae68a31efe4b5882137dd67ac26f7ff"; + hash = "sha256-VnzczwIbYPUpWpWLMm2TYGqiDxzZaDDKs7xh4F3xA0E="; + }; + + installPhase = '' + runHook preInstall + install -Dt $out ken_all.zip + install -Dt $out jigyosyo.zip + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Zip files containing japanese zip codes"; + longDescription = "Zip files with japanese zip codes for japanese IME dictionaries"; + homepage = "https://github.com/musjj/jp-zip-codes"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/third_party/nixpkgs/pkgs/by-name/jr/jrl-cmakemodules/package.nix index 8dc01688de..22c9bafe64 100644 --- a/third_party/nixpkgs/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "jrl-cmakemodules"; - version = "0-unstable-2024-08-05"; + version = "0-unstable-2024-09-17"; src = fetchFromGitHub { owner = "jrl-umi3218"; repo = "jrl-cmakemodules"; - rev = "88d3cb561d1f9faa3c6281da7b2b8d6aa76b04d5"; - hash = "sha256-3Su/tGtV39/tto1Hs5sgGgjpFWkBCvI2SZKqBIIDAjA="; + rev = "31e46019beda968ba9e516ad645a951c64256eed"; + hash = "sha256-pe21tE0ngUYGhEuGSI71TMdwyqTmZhc53hPKHngkTGQ="; }; nativeBuildInputs = [ cmake ]; @@ -23,5 +23,6 @@ stdenv.mkDerivation { homepage = "https://github.com/jrl-umi3218/jrl-cmakemodules"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix b/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix index 3dfcd639f5..1698299526 100644 --- a/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-X3noVDRnnrR6xuOBfoH4JPdcPLOBHbGQb6opNvzK/TE="; nativeBuildInputs = [ installShellFiles mdbook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preCheck = '' # USER must not be empty diff --git a/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix b/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix index 7b531d554e..86274edd4f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { mv etc/repos.json.patched etc/repos.json jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py ''; @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Generic build tool"; homepage = "https://github.com/just-buildsystem/justbuild"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/by-name/jw/jwasm/package.nix b/third_party/nixpkgs/pkgs/by-name/jw/jwasm/package.nix index a1cf1a9cf5..eaf30e5835 100644 --- a/third_party/nixpkgs/pkgs/by-name/jw/jwasm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jw/jwasm/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: generalize for Windows builds diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix index 74fdfb2c6e..4217613437 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QonOqdcdp1vbxzLnF46X0DLVay2Up1LvHZ/ZZ04LqlE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kana/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kana/package.nix index 3fc7e8d3c2..e0260d1363 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kana/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kana/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gst-plugins-base gst-plugins-bad gst-plugins-good - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kanha/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanha/package.nix index c3f713d037..583671f384 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kanha/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kanha/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix index 4a62729927..cfa9e43ba7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix @@ -24,7 +24,7 @@ }: let - arch = if stdenv.isx86_64 then "x86_64" else "generic"; + arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "generic"; in rustPlatform.buildRustPackage rec { pname = "kanidm"; @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; profile = { admin_bind_path = "/run/kanidmd/sock"; - cpu_flags = if stdenv.isx86_64 then "x86_64_legacy" else "none"; + cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none"; default_config_path = "/etc/kanidm/server.toml"; default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; htmx_ui_pkg_path = "@htmx_ui_pkg_path@"; diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kara/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kara/package.nix new file mode 100644 index 0000000000..89789a0d89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ka/kara/package.nix @@ -0,0 +1,39 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + kdePackages, + ... +}: +stdenv.mkDerivation (finalAttrs: { + pname = "kara"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "dhruv8sh"; + repo = "kara"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-G+sLHcHnNuzIRE+6bvEeXaWYVdoqqxcp5kGF8ZhD/34="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/plasma/plasmoids/org.dhruv8sh.kara + cp metadata.json $out/share/plasma/plasmoids/org.dhruv8sh.kara + cp -r contents $out/share/plasma/plasmoids/org.dhruv8sh.kara + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "KDE Plasma Applet for use as a desktop/workspace pager"; + homepage = "https://github.com/dhruv8sh/kara"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kas/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kas/package.nix index d7a3eb4118..51cbae22af 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kas/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kas/package.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kas"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "siemens"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ws2V16HSGn2zyMmcG601ScHfONSE/DBVO3Gaj8dktf4="; + hash = "sha256-J64yy2G8+5uT31Vpwhge5R7ZqId+NzE5ykXBHjc0qgQ="; }; propagatedBuildInputs = with python3.pkgs; [ setuptools kconfiglib jsonschema distro pyyaml gitpython ]; diff --git a/third_party/nixpkgs/pkgs/by-name/kb/kbld/package.nix b/third_party/nixpkgs/pkgs/by-name/kb/kbld/package.nix new file mode 100644 index 0000000000..6b2a7f9969 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kb/kbld/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "kbld"; + version = "0.44.1"; + + src = fetchFromGitHub { + owner = "carvel-dev"; + repo = "kbld"; + rev = "v${version}"; + hash = "sha256-sEzCA32r3nSY1hT1r4EPPWsF9Kgn0rXnaAKlatFjZIo="; + }; + + vendorHash = null; + + subPackages = [ "cmd/kbld" ]; + + CGO_ENABLED = 0; + + ldflags = [ + "-X=carvel.dev/kbld/pkg/kbld/version.Version=${version}" + ]; + + meta = { + description = "Seamlessly incorporates image building and image pushing into your development and deployment workflows"; + homepage = "https://carvel.dev/kbld/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benchand ]; + mainProgram = "kbld"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix index 22a3496f6a..baec68b0a5 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix @@ -5,12 +5,12 @@ appimageTools.wrapType2 rec { pname = "kchat"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "https://download.storage5.infomaniak.com/kchat/kchat-desktop-${version}-linux-x86_64.AppImage"; name = "kchat-${version}.AppImage"; - hash = "sha256-f9wWgZSPSMP7bLZGfR5F6l/eAVHVhRmF1c7S6/qLgIA="; + hash = "sha256-5Nk2IMGk7BDDL7fuoOBO3wEcbtJDDDnQvUiqa8Pt8yU="; }; extraInstallCommands = diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix index 84012a3a59..b016abe16b 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { vendorHash = "sha256-DGYYH5sKhpcWHYoUim4NyflzqsXFc4MCOqIw5jIfIiM="; # By default, libs and bins are stripped. KCL will crash on darwin if they are. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; ldflags = [ "-w -s" @@ -33,7 +33,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ kclvm kclvm_cli ] ++ ( - lib.optional stdenv.isDarwin [ + lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix index 08864ba0b6..17e9cefc8f 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = [ rustc ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ rustc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libkclvm_cli_cdylib.dylib $out/lib/libkclvm_cli_cdylib.dylib ''; diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix index 2100a96996..79b3b10f66 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo_lock.patch ]; buildInputs = [ kclvm rustc ] ++ ( - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keeweb/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keeweb/package.nix index 063d59880d..48b9a603d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keeweb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/keeweb/package.nix @@ -82,7 +82,7 @@ let platforms = builtins.attrNames srcs; }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keycard-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycard-cli/package.nix index 017990084c..1b815533d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keycard-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/keycard-cli/package.nix @@ -24,6 +24,6 @@ buildGoModule rec { homepage = "https://keycard.status.im"; license = licenses.mpl20; maintainers = [ maintainers.zimbatm ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/keycard-cli.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/keycard-cli.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix index f33b51a0fb..265f8a884f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix @@ -48,18 +48,18 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" - "USEASM=${if stdenv.isx86_64 then "true" else "false"}" + "USEASM=${if stdenv.hostPlatform.isx86_64 then "true" else "false"}" ] ++ lib.optionals (!tlsSupport) [ "BUILD_TLS=no" ] ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ] - ++ lib.optionals (!stdenv.isx86_64) [ "MALLOC=libc" ]; + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "MALLOC=libc" ]; enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kissfft/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kissfft/package.nix index 1480d73b53..03d0e7d045 100644 --- a/third_party/nixpkgs/pkgs/by-name/ki/kissfft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ki/kissfft/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { # Required for `test/testcpp.c`. env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__MATH_LONG_DOUBLE_CONSTANTS=1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D__MATH_LONG_DOUBLE_CONSTANTS=1"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/kl/klong/package.nix b/third_party/nixpkgs/pkgs/by-name/kl/klong/package.nix new file mode 100644 index 0000000000..e5ffb916df --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kl/klong/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchurl, + fetchFromSourcehut, + installShellFiles, + makeBinaryWrapper, + gv, +}: + +stdenv.mkDerivation rec { + pname = "klong"; + version = "20221212"; + + src = fetchurl { + url = "https://t3x.org/klong/klong${version}.tgz"; + hash = "sha256-XhpIdyKKPGQ6mdv9LXPmC8P6hW4mFawv54yANw5/lrQ="; + }; + + docs = fetchFromSourcehut { + owner = "~nut"; + repo = "klong-docs"; + rev = "350da558709e3728df60ddf45fafe09e3fb89139"; + hash = "sha256-yfvXljjJwCETWPa70zXhaQJOHhZYR2k+BKAd0Dw/U70="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + installShellFiles + ]; + + installPhase = '' + runHook preInstall + install -m 555 -Dt $out/bin kg kplot + install -m 444 -Dt $out/lib/klong lib/*.kg + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/kg --prefix KLONGPATH : $out/lib/klong + wrapProgram $out/bin/kplot --prefix PATH : ${ + lib.makeBinPath [ + "$out" + gv + ] + } + installManPage $docs/*.1 + ''; + + meta = { + description = "Simple Array programming language"; + homepage = "https://t3x.org/klong"; + mainProgram = "kg"; + maintainers = [ lib.maintainers.casaca ]; + platforms = lib.platforms.all; + license = with lib.licenses; [ + publicDomain + cc0 + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix b/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix index 38e09d5797..bcbe85fcef 100644 --- a/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kn/knxd/package.nix @@ -10,7 +10,7 @@ , fmt_9 , libev , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, withUsb ? stdenv.isLinux, libusb1 +, withUsb ? stdenv.hostPlatform.isLinux, libusb1 }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fmt_9 libev ] ++ lib.optional withSystemd systemd ++ lib.optional withUsb libusb1 - ++ lib.optional stdenv.isDarwin argp-standalone; + ++ lib.optional stdenv.hostPlatform.isDarwin argp-standalone; configureFlags = [ (lib.enableFeature withSystemd "systemd") diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix index 6b4a942fd4..4d1a69a3b0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix @@ -16,7 +16,7 @@ config, cudaPackages ? { }, - openblasSupport ? !stdenv.isDarwin, + openblasSupport ? !stdenv.hostPlatform.isDarwin, openblas, cublasSupport ? config.cudaSupport, @@ -24,14 +24,14 @@ # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60" cudaArches ? cudaPackages.cudaFlags.realArches or [ ], - clblastSupport ? stdenv.isLinux, + clblastSupport ? stdenv.hostPlatform.isLinux, clblast, ocl-icd, vulkanSupport ? true, vulkan-loader, - metalSupport ? stdenv.isDarwin && stdenv.isAarch64, + metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, march ? "", mtune ? "", }: @@ -44,7 +44,7 @@ let ''; darwinFrameworks = - if (stdenv.isDarwin && stdenv.isx86_64) then + if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then darwin.apple_sdk.frameworks else darwin.apple_sdk_11_0.frameworks; @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.74"; + version = "1.75.2"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-tGG1+EGlCUmFpx/axijonOXydurwFxqjuoeDwHxC+pc="; + hash = "sha256-olMlYzde97RSx0OmDULSOFlM3imUq3AVxQdXyYBPd3Q="; }; enableParallelBuilding = true; @@ -74,7 +74,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = [ tk ] ++ finalAttrs.pythonInputs - ++ lib.optionals effectiveStdenv.isDarwin [ + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ darwinFrameworks.Accelerate darwinFrameworks.CoreVideo darwinFrameworks.CoreGraphics @@ -100,7 +100,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { pythonPath = finalAttrs.pythonInputs; - darwinLdFlags = lib.optionals stdenv.isDarwin [ + darwinLdFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-F${darwinFrameworks.CoreServices}/Library/Frameworks" "-F${darwinFrameworks.Accelerate}/Library/Frameworks" "-framework CoreServices" diff --git a/third_party/nixpkgs/pkgs/by-name/ko/kokkos/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/kokkos/package.nix index eb94813071..7810bcacaa 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/kokkos/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/kokkos/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kokkos"; - version = "4.4.00"; + version = "4.4.01"; src = fetchFromGitHub { owner = "kokkos"; repo = "kokkos"; rev = finalAttrs.version; - hash = "sha256-cEHGFmnYp5tPQ9BzRKopS78kAEBH+nNMRGJuWmpoHc0="; + hash = "sha256-VpUbvSQ6PQhhm9ovj97U9XEdbfro9K+LSmeSiNpqHuI="; }; nativeBuildInputs = [ @@ -40,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ asl20-llvm ]; maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix index 61f41cd5c5..3e5186ec48 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { dbus openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix index a57c44b0c3..2d5132fb4c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { yarnBuildHook nodejs ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems wrapGAppsHook3 ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm644 assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/koodo-reader.png install -Dm644 ${./mime-types.xml} $out/share/mime/packages/koodo-reader.xml @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/lib/koodo-reader ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"Koodo Reader.app" $out/Applications makeWrapper "$out/Applications/Koodo Reader.app/Contents/MacOS/Koodo Reader" $out/bin/koodo-reader @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # we use makeShellWrapper instead of the makeBinaryWrapper provided by wrapGAppsHook for proper shell variable expansion - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' makeShellWrapper ${lib.getExe electron} $out/bin/koodo-reader \ --add-flags $out/share/lib/koodo-reader/resources/app.asar \ "''${gappsWrapperArgs[@]}" \ diff --git a/third_party/nixpkgs/pkgs/by-name/kr/krun/package.nix b/third_party/nixpkgs/pkgs/by-name/kr/krun/package.nix index d851203a30..430916abaa 100644 --- a/third_party/nixpkgs/pkgs/by-name/kr/krun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kr/krun/package.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , rustPlatform -, libiconv , libkrun , makeWrapper , passt diff --git a/third_party/nixpkgs/pkgs/by-name/kt/kty/package.nix b/third_party/nixpkgs/pkgs/by-name/kt/kty/package.nix new file mode 100644 index 0000000000..65ba33a0a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kt/kty/package.nix @@ -0,0 +1,51 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "kty"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "grampelberg"; + repo = "kty"; + rev = "refs/tags/v${version}"; + hash = "sha256-E9PqWDBKYJFYOUNyjiK+AM2WULMiwupFWTOQlBH+6d4="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk; + [ + frameworks.SystemConfiguration + ] + ); + + cargoHash = "sha256-mhXi4YgYT2NfIjtESjvSP5TMOl3UH3CJFwKlJriZ0/4="; + + meta = { + homepage = "https://kty.dev/"; + changelog = "https://github.com/grampelberg/kty/releases/tag/v${version}"; + description = "Terminal for Kubernetes"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + mainProgram = "kty"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ku/kubetui/package.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubetui/package.nix new file mode 100644 index 0000000000..4c4ce32821 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ku/kubetui/package.nix @@ -0,0 +1,42 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "kubetui"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "sarub0b0"; + repo = "kubetui"; + rev = "refs/tags/v${version}"; + hash = "sha256-0K0h/MaQClJDqgF0qQO2INb+hpzxfSikAti+751MX/8="; + }; + + checkFlags = [ + "--skip=workers::kube::store::tests::kubeconfigからstateを生成" + ]; + + buildInputs = lib.optionals (stdenv.isDarwin) ( + with darwin.apple_sdk; + [ + frameworks.CoreGraphics + frameworks.AppKit + ] + ); + cargoHash = "sha256-kfAErXqjdLn2jaCtr+eI0+0v4TcE8Hpx0DDECnuYp5w="; + + meta = { + homepage = "https://github.com/sarub0b0/kubetui"; + changelog = "https://github.com/sarub0b0/kubetui/releases/tag/v${version}"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.mit; + description = "Intuitive TUI tool for real-time monitoring and exploration of Kubernetes resources"; + mainProgram = "kubetui"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ku/kulala-fmt/package.nix b/third_party/nixpkgs/pkgs/by-name/ku/kulala-fmt/package.nix index 2a259f8ee4..204aaa00ad 100644 --- a/third_party/nixpkgs/pkgs/by-name/ku/kulala-fmt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ku/kulala-fmt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kulala-fmt"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala-fmt"; rev = "v${version}"; - hash = "sha256-VWd+lUPRgDVaM8nnwah/dXjQeHsLD3OM2D8coEJDCu4="; + hash = "sha256-yq7DMrt+g5wM/tynI7Cf6MBJs/d+fP3IppndKnTJMTw="; }; vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo="; diff --git a/third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix b/third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix index ba399a44ab..bec61ceeb4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'CLI_LIBS = ' 'CLI_LIBS = libutils.a ' '' # These tests fail on Darwin or are unreliable. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isDarwin) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) '' sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d' substituteInPlace utils/process/Kyuafile \ --replace-fail 'atf_test_program{name="executor_pid_test"}' "" @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'atf_add_test_case premature_exit' "" '' # fchflags and UF_NOUNLINK are not supported on Linux. Other tests also fail. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isLinux) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) '' sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d' substituteInPlace utils/process/Kyuafile \ --replace-fail 'atf_test_program{name="executor_pid_test"}' "" diff --git a/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix index da51d9d73a..a7a4f781ed 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "0.1.0-unstable-2024-07-09"; + version = "0.1.0-unstable-2024-09-19"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-menu-generator"; - rev = "a2b3e8e46068d82e97168772e7c194d6b6e03e3d"; - hash = "sha256-Y5gBaTgVu3OzZQwGDNLsmQkfS0txBm/vD0MG5av2Gv0="; + rev = "ebb8240bfd39ab2ffbe98d5cfe26f9c1b678822d"; + hash = "sha256-4WGBrqY30wVXmnjZ5QPhfNfauvnxqrTE6DFuITfTI4M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix index dff74b1b79..b9bf9b2ddb 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { libX11 libXtst ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; cargoHash = "sha256-pDdpmZPaClU8KjFHO7v3FDQp9D83GQN+SnFg53q2fjs="; diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix index ff32a96d78..24eab34147 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix @@ -61,7 +61,7 @@ buildNpmPackage rec { TimeLocal YAMLPP StringSimilarity - ] ++ lib.optionals stdenv.isLinux [ LinuxInotify2 ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ LinuxInotify2 ]; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/by-name/la/laszip/package.nix b/third_party/nixpkgs/pkgs/by-name/la/laszip/package.nix index 65c2e6934a..ded2abb03f 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/laszip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/laszip/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/by-name/la/latexminted/package.nix b/third_party/nixpkgs/pkgs/by-name/la/latexminted/package.nix index 313084f41d..f853dd5635 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/latexminted/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/latexminted/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.1.0b9"; + version = "0.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QUFfoX1jv5pVQDEBGaVd1madfqbTWTJyXPh4gw7P5UE="; + hash = "sha256-h7M45e8DDfpZix4Ej6fqSMQIP0zEUvCXfthJLzpIY18="; }; build-system = with python3Packages; [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ pygments latex2pydata + latexrestricted ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/by-name/la/lazymc/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lazymc/package.nix index 9202d32b2e..8df8352d8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lazymc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lazymc/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix index 9957de463d..8d6e2c93fa 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-celee8uyoirX+vtAww2iQJtRwJEHyfHL2mZA2muSRiQ="; - buildInputs = lib.optionals stdenv.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; meta = with lib; { description = "A cross-platform TUI database management tool written in Go"; diff --git a/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix b/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix index 45911bacf7..2675718466 100644 --- a/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "lbreakouthd"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL2.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/package.nix b/third_party/nixpkgs/pkgs/by-name/ld/ld64/package.nix index 2b00fdfb62..1ca2291506 100644 --- a/third_party/nixpkgs/pkgs/by-name/ld/ld64/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/package.nix @@ -142,13 +142,16 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - libtapi - llvm - libunwind - openssl - xar - ] ++ lib.optionals stdenv.isDarwin [ darwin.dyld ] ++ lib.optionals stdenv.isLinux [ libdispatch ]; + buildInputs = + [ + libtapi + llvm + libunwind + openssl + xar + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.dyld ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ]; # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations, # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector. diff --git a/third_party/nixpkgs/pkgs/by-name/le/leaf/package.nix b/third_party/nixpkgs/pkgs/by-name/le/leaf/package.nix index bda0c6d2af..1bd44f23d3 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/leaf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/leaf/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-2I0XusAI98WLzGcwEorPmtcK3VkpwpkIn0JKwn3gT1c="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/le/ledger-autosync/package.nix b/third_party/nixpkgs/pkgs/by-name/le/ledger-autosync/package.nix index 1f4e6a3413..16c273f75a 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/ledger-autosync/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/ledger-autosync/package.nix @@ -2,7 +2,6 @@ lib, python3Packages, fetchFromGitHub, - fetchpatch2, ledger, hledger, }: diff --git a/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix b/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix index 3d4fc68dbe..531b0d6815 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.7.15"; + version = "1.7.16"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-N79unpeeOwcdHJo9IbsGa/gmTyg+QQCJF599cshV3sc="; + hash = "sha256-SAFrtiSISW5QhFq9fow0CA5qvBY1RIfzZGvvfhOqxbY="; }; vendorHash = "sha256-rJdtax3r5Nwew+ptY4kIAUtxqPguwrFMMRk78zrZUcU="; diff --git a/third_party/nixpkgs/pkgs/by-name/le/legba/package.nix b/third_party/nixpkgs/pkgs/by-name/le/legba/package.nix index 3f2453a13d..efb9a35134 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/legba/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/legba/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-viDfJ214Zf5segjrLSTbHav5T5e219NAF+MvuPow+JQ="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl.dev samba ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl.dev samba ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/lg/lgogdownloader/package.nix b/third_party/nixpkgs/pkgs/by-name/lg/lgogdownloader/package.nix index e0a3d02216..bdd32121a5 100644 --- a/third_party/nixpkgs/pkgs/by-name/lg/lgogdownloader/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lg/lgogdownloader/package.nix @@ -15,19 +15,18 @@ html-tidy, libsForQt5, testers, - lgogdownloader, enableGui ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lgogdownloader"; version = "3.15"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4="; }; @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; passthru.tests = { - version = testers.testVersion { package = lgogdownloader; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = { @@ -67,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/liana/package.nix b/third_party/nixpkgs/pkgs/by-name/li/liana/package.nix index 25f72398ad..ab9b9e15cf 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/liana/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/liana/package.nix @@ -38,7 +38,7 @@ let in rustPlatform.buildRustPackage rec { pname = "liana"; - version = "6.0"; + version = "6.0"; # keep in sync with lianad src = fetchFromGitHub { owner = "wizardsardine"; @@ -94,6 +94,6 @@ rustPlatform.buildRustPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ dunxen ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/lianad/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lianad/package.nix new file mode 100644 index 0000000000..0940442746 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/lianad/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + udev, +}: + +rustPlatform.buildRustPackage rec { + pname = "lianad"; + version = "6.0"; # keep in sync with liana + + src = fetchFromGitHub { + owner = "wizardsardine"; + repo = "liana"; + rev = "v${version}"; + hash = "sha256-LLDgo4GoRTVYt72IT0II7O5wiMDrvJhe0f2yjzxQgsE="; + }; + + cargoHash = "sha256-a4hLtDXnEeTa0e1LcMkEPKEqGBp5bzWseq5Pe5ZYF1M="; + + buildInputs = [ udev ]; + + postInstall = '' + install -Dm0644 ./contrib/lianad_config_example.toml $out/etc/liana/config.toml + ''; + + # bypass broken unit tests + doCheck = false; + + meta = { + mainProgram = "lianad"; + description = "Bitcoin wallet leveraging on-chain timelocks for safety and recovery"; + homepage = "https://wizardsardine.com/liana"; + license = lib.licenses.bsd3; + maintainers = [ + lib.maintainers.dunxen + lib.maintainers.plebhash + ]; + platforms = lib.platforms.linux; + broken = stdenv.hostPlatform.isAarch64; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/lib25519/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lib25519/package.nix index 90d377948f..68d35a796a 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lib25519/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/lib25519/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libcpucycles ]; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/lib25519.1.dylib" "$out/lib/lib25519.1.dylib" for f in $out/bin/*; do install_name_tool -change "lib25519.1.dylib" "$out/lib/lib25519.1.dylib" "$f" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # failure: crypto_pow does not handle p=q overlap - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = '' runHook preInstallCheck $out/bin/lib25519-test diff --git a/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix index 09a96e829e..402514a647 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libarchive/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # access-time-related tests flakey on some systems "cpio/test/test_option_a.c" "cpio/test/test_option_t.c" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # only on some aarch64-linux systems? "cpio/test/test_basic.c" "cpio/test/test_format_newc.c" @@ -82,15 +82,15 @@ stdenv.mkDerivation (finalAttrs: { zlib zstd ] ++ lib.optional stdenv.hostPlatform.isUnix sharutils - ++ lib.optionals stdenv.isLinux [ acl attr e2fsprogs ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ acl attr e2fsprogs ] ++ lib.optional xarSupport libxml2; # Without this, pkg-config-based dependencies are unhappy - propagatedBuildInputs = lib.optionals stdenv.isLinux [ attr acl ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ attr acl ]; configureFlags = lib.optional (!xarSupport) "--without-xml2"; - preBuild = lib.optionalString stdenv.isCygwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isCygwin '' echo "#include " >> config.h ''; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libaribcaption/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libaribcaption/package.nix index 7d39841ec6..936991ef6a 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libaribcaption/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libaribcaption/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ fontconfig freetype - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices CoreFoundation CoreGraphics diff --git a/third_party/nixpkgs/pkgs/by-name/li/libation/deps.nix b/third_party/nixpkgs/pkgs/by-name/li/libation/deps.nix index e537d6e43b..2792c1f90c 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libation/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libation/deps.nix @@ -125,8 +125,6 @@ (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) - (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-DpU+PGIUCtaK6gQEl/OWSO/JKg/TA9yeD01Zzxaxy5k="; }) - (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-+TMflNyjP+Lf5bge0xVN5AKxMAk4/caWY6zZrqtyAJw="; }) (fetchNuGet { pname = "Serilog"; version = "2.10.0"; hash = "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE="; }) (fetchNuGet { pname = "Serilog"; version = "2.8.0"; hash = "sha256-MBL9AWGV8UthhiHXnqH3EsfIyXnxdLWqAdFa6QvQ2To="; }) (fetchNuGet { pname = "Serilog"; version = "3.1.0"; hash = "sha256-1CDAp+AjfFjQqoLvKYp/j6pKTUfNOGfKVlWyqCGHo7k="; }) diff --git a/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix index b84469c716..c116293827 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix @@ -28,7 +28,11 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; - dotnetFlags = [ "-p:PublishReadyToRun=false" ]; + dotnetFlags = [ + "-p:PublishReadyToRun=false" + # for some reason this is set to win-x64 in the project files + "-p:RuntimeIdentifier=" + ]; projectFile = [ "LibationAvalonia/LibationAvalonia.csproj" diff --git a/third_party/nixpkgs/pkgs/by-name/li/libcaca/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libcaca/package.nix index 6b99439fe0..bb0d571687 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libcaca/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libcaca/package.nix @@ -7,7 +7,7 @@ , ncurses , pkg-config , zlib -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/by-name/li/libclipboard/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libclipboard/package.nix index 1febf35d1c..eec120bcd6 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libclipboard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libclipboard/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ libxcb libXau libXdmcp ] - ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libcpucycles/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libcpucycles/package.nix index 4e88903de6..8429220164 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libcpucycles/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libcpucycles/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (librandombytes) hardeningDisable configurePlatforms env; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib" install_name_tool -change "libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib" "$out/bin/cpucycles-info" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libdeltachat/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libdeltachat/package.nix index 360ac8a80e..237e48a7c3 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libdeltachat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libdeltachat/package.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { pkg-config rustPlatform.cargoSetupHook cargo - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { openssl sqlcipher sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/li/libetebase/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libetebase/package.nix index d039cad842..c76b5a2320 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libetebase/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libetebase/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A C library for Etebase"; homepage = "https://www.etebase.com/"; license = licenses.bsd3; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ laalsaas ]; pkgConfigModules = [ "etebase" ]; }; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libewf-legacy/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libewf-legacy/package.nix index 3d2aee4d28..fdd202f8c9 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libewf-legacy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libewf-legacy/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ] - ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ]; meta = { description = "Legacy library for support of the Expert Witness Compression Format"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libgedit-amtk/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libgedit-amtk/package.nix index 76b5bfd5fc..631e6e623b 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libgedit-amtk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libgedit-amtk/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dbus # For dbus-run-session ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/by-name/li/libhttpserver/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libhttpserver/package.nix index 2a99246aab..a61342b99d 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libhttpserver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libhttpserver/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ pongo1231 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # configure: error: cannot find required auxiliary files: ltmain.sh + broken = stdenv.hostPlatform.isDarwin; # configure: error: cannot find required auxiliary files: ltmain.sh }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix index 5792568852..e928cd9991 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "tests" finalAttrs.doInstallCheck) ]; postInstall = - lib.optionalString (stdenv.isDarwin && !hostPlatform.isStatic) '' + lib.optionalString (stdenv.hostPlatform.isDarwin && !hostPlatform.isStatic) '' ${stdenv.cc.targetPrefix}install_name_tool "$out/lib/libiconv.2.dylib" \ -change '@rpath/libcharset.1.dylib' "$out/lib/libcharset.1.dylib" '' diff --git a/third_party/nixpkgs/pkgs/by-name/li/libisoburn/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libisoburn/package.nix index 7fc8c6aff6..498c3394d3 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libisoburn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libisoburn/package.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { zlib libburn libisofs - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl attr ]; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ acl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libisofs/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libisofs/package.nix index ac9c606b55..52b807c6c8 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libisofs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libisofs/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ acl attr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ [ zlib diff --git a/third_party/nixpkgs/pkgs/by-name/li/libmpd/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libmpd/package.nix index bf2e6c70d2..bb6c9ed45f 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libmpd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libmpd/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; # Getting DARWIN_NULL related errors - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/li/libmpdclient/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libmpdclient/package.nix index 691a1b76a2..297ca698b0 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libmpdclient/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libmpdclient/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libopus/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libopus/package.nix index cdf00a244b..f809c40000 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libopus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libopus/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "docs" false) ]; - doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails + doCheck = !stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32; # test_unit_LPC_inv_pred_gain fails passthru = { updateScript = gitUpdater { diff --git a/third_party/nixpkgs/pkgs/by-name/li/libplacebo_5/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libplacebo_5/package.nix index 5bc799ddf8..e75d44dcdf 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libplacebo_5/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libplacebo_5/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "demos" false) # Don't build and install the demo programs (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/librandombytes/package.nix b/third_party/nixpkgs/pkgs/by-name/li/librandombytes/package.nix index f36a94018e..5bb8175420 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/librandombytes/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/librandombytes/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl ]; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib" install_name_tool -change "librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib" "$out/bin/randombytes-info" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/li/librep/package.nix b/third_party/nixpkgs/pkgs/by-name/li/librep/package.nix index 84f610ce24..373f8232a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/librep/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/librep/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; # ensure libsystem/ctype functions don't get duplicated when using clang - configureFlags = lib.optionals stdenv.isDarwin [ "CFLAGS=-std=gnu89" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-std=gnu89" ]; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libresample/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libresample/package.nix index 66fd57edbe..2b8f3b2cd5 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libresample/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libresample/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - cmake, meson, ninja, pkg-config, diff --git a/third_party/nixpkgs/pkgs/by-name/li/librum/package.nix b/third_party/nixpkgs/pkgs/by-name/li/librum/package.nix index 2d6612c680..40158f72a1 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/librum/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/librum/package.nix @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { cmake qt6.qttools qt6.wrapQtAppsHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ qt6.qtbase qt6.qtsvg - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libsignal-ffi/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libsignal-ffi/package.nix index f2a8341a20..797729d7ca 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libsignal-ffi/package.nix @@ -32,12 +32,12 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hQ3iWGLef1y3yyzjWH2MWcs32A7HxUSxGG8fCyMn/KE="; }; - buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ protobuf rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; env.BORING_BSSL_PATH = "${boringssl-wrapper}"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libspatialindex/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libspatialindex/package.nix index ead9fe2b09..c420532351 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libspatialindex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libspatialindex/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs test/ ''; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib ''; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtapi/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libtapi/package.nix index b11de1756c..0e4f3db761 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libtapi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libtapi/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace tapi/test/CMakeLists.txt \ --replace-fail tapi-configs "" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Remove Darwin-specific versioning flags. substituteInPlace tapi/tools/libtapi/CMakeLists.txt \ --replace-fail '-current_version ''${DYLIB_VERSION} -compatibility_version 1' "" diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index 9de8a04c34..f5b388ea62 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ boostPython openssl zlib python311 libiconv ncurses ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; preConfigure = "./autotool.sh"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { description = "C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 4c76d021a4..3f85048e4e 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boostPython openssl zlib python3 ncurses ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; patches = [ # provide distutils alternative for python 3.12 diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtoxcore/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libtoxcore/package.nix index 6b3a2ffbcb..6bad88293e 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libtoxcore/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libtoxcore/package.nix @@ -11,7 +11,7 @@ , pkg-config }: -let buildToxAV = !stdenv.isAarch32; +let buildToxAV = !stdenv.hostPlatform.isAarch32; in stdenv.mkDerivation rec { pname = "libtoxcore"; version = "0.2.19"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix index b5b0812d01..cc308d86c8 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-W9LnUBUKwx1x3+BEeUanisBGR2Q4dnbcMM5k8mCondM="; }; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace meson.build --replace "'-arch', 'arm64'" "" ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - if stdenv.isDarwin then [ + if stdenv.hostPlatform.isDarwin then [ darwin.libobjc darwin.apple_sdk_11_0.Libsystem darwin.apple_sdk_11_0.frameworks.Cocoa @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - (lib.mesonBool "examples" (!stdenv.isDarwin)) + (lib.mesonBool "examples" (!stdenv.hostPlatform.isDarwin)) ]; passthru.updateScript = unstableGitUpdater { diff --git a/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix index ad155189f7..e4fb7e0180 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libvpl/package.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DENABLE_DRI3=ON" "-DENABLE_DRM=ON" "-DENABLE_VA=ON" diff --git a/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix b/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix index 8c7485ed0a..97db16e1fc 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Ywfn+6qdKD9CG2/xdHR2XDsj5LF5XPJ2+XR5H1o2iXk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl git gitls ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/lightning/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lightning/package.nix index f850204990..ea99a5873d 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lightning/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/lightning/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; license = with lib.licenses; [ lgpl3Plus ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # failing tests + broken = stdenv.hostPlatform.isDarwin; # failing tests }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix index 1af974647c..cee6f869d3 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix @@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ johnrtitor toastal ]; mainProgram = "lightningcss"; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix index 62c70f5b69..87a0a895fa 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix @@ -7,7 +7,6 @@ , doxygen , enet , fetchzip -, fetchurl , fmt , ffmpeg-headless , gamemode @@ -42,11 +41,11 @@ inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath; in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2117.1"; + version = "2118"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-v6AHzbuk5n55nTDO0UndtmdhovfY4kngC5TJaNIV5S4="; + hash = "sha256-Dt0YKWj+yLUic1F7uOxfWPYlPda3snTUPwFbn23i2rY="; }; nativeBuildInputs = [ @@ -110,7 +109,7 @@ in stdenv.mkDerivation (finalAttrs: { postInstall = let libs = makeLibraryPath [ vulkan-loader ]; in optionalString enableSdl2Frontend '' - for binfile in lime3ds-gui lime3ds-cli lime3ds-room + for binfile in lime3ds lime3ds-room do wrapProgram "$out/bin/$binfile" \ --prefix LD_LIBRARY_PATH : ${libs} @@ -122,17 +121,19 @@ in stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - (cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false) - (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) + (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false) (cmakeBool "USE_SYSTEM_LIBS" true) (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) (cmakeBool "DISABLE_SYSTEM_GLSLANG" true) (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) (cmakeBool "DISABLE_SYSTEM_VMA" true) (cmakeBool "DISABLE_SYSTEM_XBYAK" true) + (cmakeBool "ENABLE_QT" enableQt) (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) (cmakeBool "ENABLE_CUBEB" enableCubeb) (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ] ++ optionals enableQt [ + (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) ]; meta = { @@ -140,7 +141,7 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Lime3DS/Lime3DS"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ arthsmn ]; - mainProgram = if enableQt then "lime3ds-gui" else "lime3ds-cli"; + mainProgram = "lime3ds"; platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix b/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix index a4150b8786..f9a7693084 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { mainProgram = "littlefs-fuse"; inherit (fuse.meta) platforms; # fatal error: 'linux/fs.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix index 1c430cad3b..c218628eb1 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreServices diff --git a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix index c629ff54ea..c425b9743f 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; @@ -74,9 +74,9 @@ stdenv.mkDerivation (finalAttrs: { configurePhase = let platform = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "macosx-catalina" else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix index 3b943a83cb..1a60046123 100644 --- a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix @@ -20,7 +20,7 @@ , blas , pkg-config -, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport +, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport , vulkanSupport ? false , rpcSupport ? false , shaderc @@ -69,13 +69,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3672"; + version = "3772"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-m9mMmvIasoJkj0DAx/6TLdt5Qflbe1JqaU1VQ/8bEG0="; + hash = "sha256-gJFCFhppaXs/9GReEjEZiU/BZ51pjl7IBsUN04uTls0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -98,7 +98,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { autoAddDriverRunpath ]; - buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs + buildInputs = optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs ++ optionals cudaSupport cudaBuildInputs ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs @@ -163,6 +163,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ dit7ya elohmeier philiptaron ]; platforms = platforms.unix; badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin; - broken = (metalSupport && !effectiveStdenv.isDarwin); + broken = (metalSupport && !effectiveStdenv.hostPlatform.isDarwin); }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix index b1e759d29a..c7a0aec58a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage { buildInputs = [ libiconv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix b/third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix index 099ac24e77..cfc7edfacc 100644 --- a/third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.57.0"; + version = "3.58.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-KeskFVTZMxsFefbjnRBfrbS88Wt+2kwzboDziBsZJrY="; + hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY="; }; strictDeps = true; @@ -60,8 +60,6 @@ stdenv.mkDerivation rec { substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${ffmpeg}/bin/ffmpeg" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix index 3619f79973..6c67233849 100644 --- a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix @@ -16,7 +16,7 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; in - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } else callPackage ./linux.nix { inherit pname version meta; } diff --git a/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix index 504500cad7..b2cb74054c 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix @@ -112,4 +112,4 @@ let ]; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix index 6c0e0dd0d7..06fc0d3fd0 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix @@ -33,21 +33,21 @@ in { src = fetchurl { inherit hash; url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-${suffix}"; - name = lib.optionalString stdenv.isLinux "logseq-${version}.AppImage"; + name = lib.optionalString stdenv.hostPlatform.isLinux "logseq-${version}.AppImage"; }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.isDarwin [ unzip ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; buildInputs = [ stdenv.cc.cc.lib ]; - dontUnpack = stdenv.isLinux; + dontUnpack = stdenv.hostPlatform.isLinux; dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux ( + '' + lib.optionalString stdenv.hostPlatform.isLinux ( let appimageContents = appimageTools.extract { inherit pname src version; }; in @@ -68,7 +68,7 @@ in { substituteInPlace $out/share/applications/logseq.desktop \ --replace Exec=Logseq Exec=logseq \ --replace Icon=Logseq Icon=logseq - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications/Logseq.app,bin} cp -R . $out/Applications/Logseq.app makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq @@ -76,7 +76,7 @@ in { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs makeWrapper ${electron}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ diff --git a/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix b/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix index 99a7438256..f4ae2ad7fa 100644 --- a/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "lpairs2"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix index 40da20efbc..0d77c2d09f 100644 --- a/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix @@ -69,11 +69,11 @@ rustPlatform.buildRustPackage rec { openssl gtk3 ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ webkitgtk alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.WebKit ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ls/lsd/package.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsd/package.nix index 8cdf45c90d..9be5a2ef0d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ls/lsd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ls/lsd/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { pandoc ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = '' pandoc --standalone --to man doc/lsd.md -o lsd.1 diff --git a/third_party/nixpkgs/pkgs/by-name/ls/lsd2dsl/package.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsd2dsl/package.nix index 4ab26b40a7..95663588ed 100644 --- a/third_party/nixpkgs/pkgs/by-name/ls/lsd2dsl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ls/lsd2dsl/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qt6.wrapQtAppsHook - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ boost diff --git a/third_party/nixpkgs/pkgs/by-name/lt/ltris/package.nix b/third_party/nixpkgs/pkgs/by-name/lt/ltris/package.nix index 82137b2fbe..cb0da370cd 100644 --- a/third_party/nixpkgs/pkgs/by-name/lt/ltris/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lt/ltris/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ltris"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/package.nix index 617bfa1057..0659cd25aa 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/package.nix @@ -4,10 +4,6 @@ , lib , nix-prefetch-scripts , luarocks-nix -, lua5_1 -, lua5_2 -, lua5_3 -, lua5_4 , pluginupdate }: let @@ -16,52 +12,44 @@ let nix nix-prefetch-scripts luarocks-nix ]; - luaversions = [ - lua5_1 - lua5_2 - lua5_3 - lua5_4 - ]; - + attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); + pname = attrs.project.name; + inherit (attrs.project) version; in + python3Packages.buildPythonApplication { - pname = "luarocks-packages-updater"; - version = "0.1"; + inherit pname version; + pyproject = true; - format = "other"; + src = lib.cleanSource ./.; - nativeBuildInputs = [ - makeWrapper - python3Packages.wrapPython + build-system = [ + python3Packages.setuptools ]; - propagatedBuildInputs = [ + + dependencies = [ python3Packages.gitpython ]; - dontUnpack = true; - - installPhase = - '' - mkdir -p $out/bin $out/lib - cp ${./updater.py} $out/bin/luarocks-packages-updater - cp ${pluginupdate} $out/lib/pluginupdate.py - - # wrap python scripts - makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" \ - --set LUA_51 ${lua5_1} \ - --set LUA_52 ${lua5_2} \ - --set LUA_53 ${lua5_3} \ - --set LUA_54 ${lua5_4} - ) - wrapPythonProgramsIn "$out" + postFixup = '' + echo "pluginupdate folder ${pluginupdate}" + wrapProgram $out/bin/luarocks-packages-updater \ + --prefix PYTHONPATH : "${pluginupdate}" \ + --prefix PATH : "${path}" ''; shellHook = '' - export PYTHONPATH="maintainers/scripts:$PYTHONPATH" + export PYTHONPATH="maintainers/scripts/pluginupdate-py:$PYTHONPATH" export PATH="${path}:$PATH" ''; - meta.mainProgram = "luarocks-packages-updater"; + meta = { + inherit (attrs.project) description; + license = lib.licenses.gpl3Only; + homepage = attrs.project.urls.Homepage; + mainProgram = "luarocks-packages-updater"; + maintainers = with lib.maintainers; [ teto ]; + }; } diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/pyproject.toml b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/pyproject.toml new file mode 100644 index 0000000000..0f19ce5f83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/pyproject.toml @@ -0,0 +1,19 @@ +[build-system] +build-backend = "setuptools.build_meta" +requires = [ "setuptools" ] + +[project] +name = "luarocks-packages-updater" +version = "0.0.1" +description = """ +Module to update luarocks-packages""" + +[project.urls] +Homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/lu/luarocks-packages-updater" + +[project.scripts] +luarocks-packages-updater = "updater:main" + +[tool.ruff] +line-length = 120 +indent-width = 4 diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 335e15c444..91194879b8 100755 --- a/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -50,7 +50,7 @@ class LuaPlugin: name: str """Name of the plugin, as seen on luarocks.org""" rockspec: str - """Full path towards the rockspec""" + """Full URI towards the rockspec""" ref: Optional[str] """git reference (branch name/tag)""" version: Optional[str] @@ -60,7 +60,7 @@ class LuaPlugin: Its value can be 'http://luarocks.org/dev' """ luaversion: Optional[str] - """Attribue of the lua interpreter if a package is available only for a specific lua version""" + """lua version if a package is available only for a specific lua version""" maintainers: Optional[str] """ Optional string listing maintainers separated by spaces""" diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix index 504490b825..4e19ef4809 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-gfnfxm/xxFx77UnEinr+D8GoIN/KMz3BEbjpCYqQ6as="; + hash = "sha256-Rs+aB6H5FzeADpJjK68srjI2JE2QDV0sCIKQwbnFTMg="; }; projectFile = "CarCareTracker.sln"; diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix index 6ebddafa5d..f10a4f3ea6 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix @@ -13,10 +13,11 @@ appimageTools.wrapType2 rec { hash = "sha512-hzW7khHfWEYPtzMmedy/dXqKh7LPniqI7/0F1FtBtrlDnEIEQUq/7VUcygsVTBI6kuj8vTG5+PYcLez+cYAjqg=="; }; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/lunarclient \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/ diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxc/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxc/package.nix index 409e550109..3f00ccb82b 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxc/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxc"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fJMNdMXlV1z9q1pMDh046tNmLDuK6zh6uPahTWzWMvc="; + hash = "sha256-qc60oSs2KahQJpSmhrctXpV2Zumv7EvlnGFaOCSCX/E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxcfs/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxcfs/package.nix index b7ade8381c..7b7516ba72 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxcfs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxcfs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxcfs"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "v${version}"; - hash = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic="; + hash = "sha256-5r1X/yUXTMC/2dNhpI+BVYeClIydefg2lurCGt7iA8Y="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix index ecbbc032c1..f21511d103 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.205"; + version = "1.206"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-86EengjzmhmEVm7yOovRF/oG7i8nlhzLL44N8j/nf9w="; + hash = "sha256-jsLQLD5dfzguFkk7Q3oHe5Jd6h+XA/Qkg9MqyqHQ8v4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/lz/lzlib/package.nix b/third_party/nixpkgs/pkgs/by-name/lz/lzlib/package.nix index b25f76871a..c44456bb45 100644 --- a/third_party/nixpkgs/pkgs/by-name/lz/lzlib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lz/lzlib/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { # hash from release email }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.in --replace '-Wl,--soname=' '-Wl,-install_name,$(out)/lib/' ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 98ab599b9d..22a6e30a41 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -54,9 +54,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { ] ); + cmakeBuildType = "None"; + cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None") (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] ++ lib.optionals cudaSupport [ diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 27ef0e428c..32d43f3d05 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -20,69 +20,71 @@ let sources = lib.importJSON ./pin.json; in # https://github.com/NixOS/nixpkgs/issues/314160 -(if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation (finalAttr: { - pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; - version = if isBeta then sources.beta.version else sources.stable.version; +(if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation + (finalAttr: { + pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; + version = if isBeta then sources.beta.version else sources.stable.version; - src = fetchFromGitHub { - owner = "MaaAssistantArknights"; - repo = "MaaAssistantArknights"; - rev = "v${finalAttr.version}"; - hash = if isBeta then sources.beta.hash else sources.stable.hash; - }; + src = fetchFromGitHub { + owner = "MaaAssistantArknights"; + repo = "MaaAssistantArknights"; + rev = "v${finalAttr.version}"; + hash = if isBeta then sources.beta.hash else sources.stable.hash; + }; - nativeBuildInputs = [ - asio - cmake - fastdeploy.cmake - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = [ + asio + cmake + fastdeploy.cmake + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = - [ - fastdeploy - libcpr - onnxruntime - opencv - ] - ++ lib.optionals cudaSupport ( - with cudaPackages; + buildInputs = [ - cuda_cccl # cub/cub.cuh - libcublas # cublas_v2.h - libcurand # curand.h - libcusparse # cusparse.h - libcufft # cufft.h - cudnn # cudnn.h - cuda_cudart + fastdeploy + libcpr + onnxruntime + opencv ] - ); + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cccl # cub/cub.cuh + libcublas # cublas_v2.h + libcurand # curand.h + libcusparse # cusparse.h + libcufft # cufft.h + cudnn # cudnn.h + cuda_cudart + ] + ); - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - (lib.cmakeBool "INSTALL_FLATTEN" false) - (lib.cmakeBool "INSTALL_PYTHON" true) - (lib.cmakeBool "INSTALL_RESOURCE" true) - (lib.cmakeBool "USE_MAADEPS" false) - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None") - (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") - ]; + cmakeBuildType = "None"; - passthru.updateScript = ./update.sh; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "INSTALL_FLATTEN" false) + (lib.cmakeBool "INSTALL_PYTHON" true) + (lib.cmakeBool "INSTALL_RESOURCE" true) + (lib.cmakeBool "USE_MAADEPS" false) + (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") + ]; - postPatch = '' - cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ - ''; + passthru.updateScript = ./update.sh; - postInstall = '' - mkdir -p $out/share/${finalAttr.pname} - mv $out/{Python,resource} $out/share/${finalAttr.pname} - ''; + postPatch = '' + cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ + ''; - meta = with lib; { - description = "Arknights assistant"; - homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Cryolitia ]; - platforms = platforms.linux ++ platforms.darwin; - }; -}) + postInstall = '' + mkdir -p $out/share/${finalAttr.pname} + mv $out/{Python,resource} $out/share/${finalAttr.pname} + ''; + + meta = with lib; { + description = "Arknights assistant"; + homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Cryolitia ]; + platforms = platforms.linux ++ platforms.darwin; + }; + }) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix index 4b01e3631b..69c54cafca 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maestro/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maestro/package.nix index 37adfb274d..e0f83c3ba4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maestro/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maestro/package.nix @@ -5,15 +5,16 @@ unzip, makeWrapper, jre_headless, + writeScript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maestro"; - version = "1.37.9"; + version = "1.38.1"; src = fetchurl { - url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - hash = "sha256-bWZuD2+v6molwW1ef2a3djBnVfYscBjILLGXeeSUmoU="; + url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; + hash = "sha256-AogEVg8R73x5Q/LxZamGbFacCqB8JZeERqyf+UPXBx0="; }; dontUnpack = true; @@ -33,12 +34,24 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/maestro --prefix PATH : "${lib.makeBinPath [ jre_headless ]}" ''; + passthru.updateScript = writeScript "update-maestro" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -o errexit -o nounset -o pipefail + + NEW_VERSION=$(curl --silent https://api.github.com/repos/mobile-dev-inc/maestro/releases | jq 'first(.[].tag_name | ltrimstr("cli-") | select(contains("dev.") | not))' --raw-output) + + update-source-version "maestro" "$NEW_VERSION" --print-changes + ''; + meta = with lib; { description = "Mobile UI Automation tool"; homepage = "https://maestro.mobile.dev/"; license = licenses.asl20; platforms = lib.platforms.all; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; changelog = "https://github.com/mobile-dev-inc/maestro/blob/main/CHANGELOG.md"; maintainers = with maintainers; [ SubhrajyotiSen ]; + mainProgram = "maestro"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/manga-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/manga-tui/package.nix index e5784c1539..aafae4ab84 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/manga-tui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/manga-tui/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { openssl sqlite ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/third_party/nixpkgs/pkgs/by-name/ma/manifold/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/manifold/package.nix index 1fd237fd97..6eafc1e001 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/manifold/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/manifold/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "2.5.1-unstable-2024-09-06"; + version = "2.5.1-unstable-2024-09-15"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; - rev = "6f009ca13fab71e53f118179742cc2bb40455721"; - hash = "sha256-McP/Rdxss93YHZcPSSWaRjyGgUiQJ3mZXgzcHWldORU="; + rev = "22c66051dfdbcefa2012e30dd12c9b5a20f89a01"; + hash = "sha256-Fbev5dTgXjXdC7fzWfHnypTBel++DiMns8OzN1bH1OA="; }; nativeBuildInputs = [ cmake ]; @@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" "-DMANIFOLD_TEST=ON" "-DMANIFOLD_CROSS_SECTION=ON" @@ -50,5 +49,6 @@ stdenv.mkDerivation (finalAttrs: { hzeller pca006132 ]; + platforms = lib.platforms.linux; # currently issues with Darwin }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mapcache/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mapcache/package.nix index e0859a91a2..5d38ce3f03 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/mapcache/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mapcache/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { (lib.cmakeFeature "APACHE_MODULE_DIR" "${placeholder "out"}/modules") ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-std=c99"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-std=c99"; meta = { description = "Server that implements tile caching to speed up access to WMS layers"; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mariadb-galera/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mariadb-galera/package.nix index 0d85c9f3d5..ebb3eb23c9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mariadb-galera/package.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Only; maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ma/markuplinkchecker/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/markuplinkchecker/package.nix index f42ea53ff9..fac663fa98 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-orange/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-orange/package.nix index 2079e209b0..16de4362c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-orange/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-orange/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-orange"; - version = "20.3.1"; + version = "21"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-DdtFAUoIT51kGrEz1IpLvuJMEL+pMDICobuNV6UfC6Q="; + hash = "sha256-LJvlbvbgNH5nnfDAG8BpOBrO2W6VyDeH2yDcjRamUQI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ma/massdns/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/massdns/package.nix index 9b90c674ad..b47e162861 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/massdns/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/massdns/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "PROJECT_FLAGS=-DMASSDNS_REVISION='\"v${version}\"'" ]; - buildFlags = if stdenv.isLinux then "all" else "nolinux"; + buildFlags = if stdenv.hostPlatform.isLinux then "all" else "nolinux"; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock new file mode 100644 index 0000000000..e9013801de --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock @@ -0,0 +1,7602 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli 0.29.0", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aide" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0e3b97a21e41ec5c19bfd9b4fc1f7086be104f8b988681230247ffc91cc8ed" +dependencies = [ + "aide-macros", + "axum", + "axum-extra", + "bytes", + "cfg-if", + "http", + "indexmap 2.5.0", + "schemars", + "serde", + "serde_json", + "serde_qs", + "thiserror", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "aide-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0487f8598afe49e6bc950a613a678bd962c4a6f431022ded62643c8b990301a" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "apalis-core" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1deb48475efcdece1f23a0553209ee842f264c2a5e9bcc4928bfa6a15a044cde" +dependencies = [ + "async-stream", + "async-trait", + "chrono", + "futures", + "graceful-shutdown", + "http", + "log", + "pin-project-lite", + "serde", + "strum 0.25.0", + "thiserror", + "tokio", + "tower", + "tracing", + "ulid", +] + +[[package]] +name = "apalis-cron" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43310b7e0132f9520b09224fb6faafb32eec82a672aa79c09e46b5b488ed505b" +dependencies = [ + "apalis-core", + "async-stream", + "chrono", + "cron", + "futures", + "tokio", + "tower", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argon2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ascii_utils" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io 2.3.3", + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", + "once_cell", +] + +[[package]] +name = "async-graphql" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d37c3e9ba322eb00e9e5e997d58f08e8b6de037325b9367ac59bca8e3cd46af" +dependencies = [ + "async-graphql-derive", + "async-graphql-parser", + "async-graphql-value", + "async-stream", + "async-trait", + "base64 0.22.1", + "bytes", + "chrono", + "fast_chemail", + "fnv", + "futures-timer", + "futures-util", + "handlebars", + "http", + "indexmap 2.5.0", + "mime", + "multer", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions_next", + "tempfile", + "thiserror", + "tracing", + "tracing-futures", + "url", +] + +[[package]] +name = "async-graphql-derive" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1141703c11c6ad4fa9b3b0e1e476dea01dbd18a44db00f949b804afaab2f344" +dependencies = [ + "Inflector", + "async-graphql-parser", + "darling 0.20.10", + "proc-macro-crate", + "proc-macro2", + "quote", + "strum 0.26.3", + "syn 2.0.68", + "thiserror", +] + +[[package]] +name = "async-graphql-parser" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f66edcce4c38c18f7eb181fdf561c3d3aa2d644ce7358fc7a928c00a4ffef17" +dependencies = [ + "async-graphql-value", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-value" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0206011cad065420c27988f17dd7fe201a0e056b20c262209b7bffcd6fa176" +dependencies = [ + "bytes", + "indexmap 2.5.0", + "serde", + "serde_json", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "aws-lc-rs" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e89b6941c2d1a7045538884d6e760ccfffdf8e1ffc2613d8efa74305e1f3752" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-extra" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +dependencies = [ + "axum", + "axum-core", + "bytes", + "cookie", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bcrypt" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" +dependencies = [ + "base64 0.22.1", + "blowfish", + "getrandom", + "subtle", + "zeroize", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.68", + "which", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "blowfish" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" +dependencies = [ + "byteorder", + "cipher", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +dependencies = [ + "serde", +] + +[[package]] +name = "calendrical_calculations" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec493b209a1b81fa32312d7ceca1b547d341c7b5f16a3edbf32b1d8b455bbdf" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "chronoutil" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b58b07a67cadda9502b270eca5e0f1cd3afd08445e0ab1d52d909db01b4543" +dependencies = [ + "chrono", +] + +[[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown 0.14.5", + "stacker", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "aes-gcm", + "base64 0.22.1", + "hkdf", + "percent-encoding", + "rand", + "sha2", + "subtle", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" +dependencies = [ + "cookie", + "idna 0.5.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "cranelift-bforest" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6b33d7e757a887989eb18b35712b2a67d96171ec3149d1bfb657b29b7b367c" +dependencies = [ + "cranelift-entity", +] + +[[package]] +name = "cranelift-codegen" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9acf15cb22be42d07c3b57d7856329cb228b7315d385346149df2566ad5e4aa" +dependencies = [ + "bumpalo", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-control", + "cranelift-entity", + "cranelift-isle", + "gimli 0.28.1", + "hashbrown 0.14.5", + "log", + "regalloc2", + "rustc-hash", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e934d301392b73b3f8b0540391fb82465a0f179a3cee7c726482ac4727efcc97" +dependencies = [ + "cranelift-codegen-shared", +] + +[[package]] +name = "cranelift-codegen-shared" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb2a2566b3d54b854dfb288b3b187f6d3d17d6f762c92898207eba302931da" + +[[package]] +name = "cranelift-control" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0100f33b704cdacd01ad66ff41f8c5030d57cbff078e2a4e49ab1822591299fa" +dependencies = [ + "arbitrary", +] + +[[package]] +name = "cranelift-entity" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8cfdc315e5d18997093e040a8d234bea1ac1e118a716d3e30f40d449e78207b" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "cranelift-frontend" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f74b84f16af2e982b0c0c72233503d9d55cbfe3865dbe807ca28dc6642a28b5" +dependencies = [ + "cranelift-codegen", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-isle" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adf306d3dde705fb94bd48082f01d38c4ededc74293a4c007805f610bf08bc6e" + +[[package]] +name = "cranelift-native" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea0ebdef7aff4a79bcbc8b6495f31315f16b3bf311152f472eaa8d679352581" +dependencies = [ + "cranelift-codegen", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-wasm" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d549108a1942065cdbac3bb96c2952afa0e1b9a3beff4b08c4308ac72257576d" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "itertools 0.12.1", + "log", + "smallvec", + "wasmparser", + "wasmtime-types", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cron" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" +dependencies = [ + "chrono", + "nom", + "once_cell", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.68", +] + +[[package]] +name = "dialoguer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" +dependencies = [ + "console", + "fuzzy-matcher", + "shell-words", + "tempfile", + "thiserror", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "duration-str" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709d653e7c92498eb29fb86a2a6f0f3502b97530f33aedb32ef848d4d28b31a3" +dependencies = [ + "rust_decimal", + "thiserror", + "winnow 0.6.13", +] + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "email-encoding" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +dependencies = [ + "base64 0.22.1", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" + +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "fast_chemail" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4" +dependencies = [ + "ascii_utils", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "serde_yaml", + "tempfile", + "uncased", + "version_check", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0febbeb1118a9ecdee6e4520ead6b54882e843dd0592ad233247dbee84c53db8" +dependencies = [ + "displaydoc", + "smallvec", + "writeable", +] + +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator", + "indexmap 2.5.0", + "stable_deref_trait", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand", + "smallvec", + "spinning_top", +] + +[[package]] +name = "graceful-shutdown" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3effbaf774a1da3462925bb182ccf975c284cf46edca5569ea93420a657af484" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "handlebars" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_calendar" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb932a690c92f87955e923106181ee0d5682e688ff37fb5c7b296e1fe806edb" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22aec7d032735d9acb256eeef72adcac43c3b7572f19b51576a63d664b524ca2" + +[[package]] +name = "icu_datetime" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1508c7ed627cc0b031c81203eb98f34433e24b32b39d5b2c0238e4962a00957d" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "smallvec", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_datetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6abc569cb4ee80b30707566f05c5c9ed4bed765f91ce41e7f5a37c5e6a75b3f" + +[[package]] +name = "icu_decimal" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf994f9ed8061c17bb313f28fba6cffc736f0a16c7fab827efc9b73fd3f7778" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2de3548316b697c70f30dec1395c9212db09df1d86a27624ee24872b71326c" + +[[package]] +name = "icu_list" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6c04ec71ad1bacdbfb47164d4801f80a0533d9340f94f1a880f521eff59f54" +dependencies = [ + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f6afcf7a9a7fedece70b7f17d7a7ecdfb8df145d37ae46d0277cd1e3932532" + +[[package]] +name = "icu_locid" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" + +[[package]] +name = "icu_plurals" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d807b123eb2a9ae8f12080fb8cce479f5c8a761fba0bb5ab52da6dd5e31a03" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "zerovec", +] + +[[package]] +name = "icu_plurals_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3acd5f1f2f988ed2dae9316c3d3560dfe4e03a7516d142b4b89b92252ada41a" + +[[package]] +name = "icu_provider" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" +dependencies = [ + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "icu_relativetime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47825312a5eb0790bad7b718fa8d41a8ea1e0ba597b4f7bb84bcfe97d7fc5aba" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_relativetime_data", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_relativetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b55cc15ea8981fbba78e9347d0c4003d4490c85f76e9adc7f270290046cae8" + +[[package]] +name = "icu_timezone" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35aabe571a7c653c0f543ff1512b8a1b2ad481cfa24b3d25115298d2ff3b50f" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceee21e181cce2ab44e95923da6b3418df75369f570df82264c29c51ca398d4" + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inherent" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "insta" +version = "1.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "schemars", + "serde", +] + +[[package]] +name = "iri-string" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f5f6c2df22c009ac44f6f1499308e7a3ac7ba42cd2378475cc691510e1eef1b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "jsonptr" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +dependencies = [ + "fluent-uri", + "serde", + "serde_json", +] + +[[package]] +name = "k256" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" +dependencies = [ + "serde", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "lettre" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" +dependencies = [ + "async-std", + "async-trait", + "base64 0.22.1", + "chumsky", + "email-encoding", + "email_address", + "fastrand 2.1.0", + "futures-io", + "futures-util", + "hostname", + "httpdate", + "idna 0.5.0", + "mime", + "nom", + "percent-encoding", + "quoted_printable", + "rustls", + "rustls-pemfile", + "socket2 0.5.7", + "tokio", + "tokio-rustls", + "tracing", + "url", + "webpki-roots", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "listenfd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" +dependencies = [ + "libc", + "uuid", + "winapi", +] + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "mas-axum-utils" +version = "0.12.0" +dependencies = [ + "async-trait", + "axum", + "axum-extra", + "bytes", + "chrono", + "data-encoding", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "hyper-util", + "icu_locid", + "mas-data-model", + "mas-http", + "mas-iana", + "mas-jose", + "mas-keystore", + "mas-storage", + "mas-templates", + "mime", + "oauth2-types", + "rand", + "sentry", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "thiserror", + "tokio", + "tower", + "tracing", + "ulid", + "url", +] + +[[package]] +name = "mas-cli" +version = "0.12.0" +dependencies = [ + "anyhow", + "axum", + "bytes", + "camino", + "clap", + "console", + "dialoguer", + "dotenvy", + "figment", + "http", + "http-body", + "http-body-util", + "httpdate", + "hyper", + "ipnetwork", + "itertools 0.13.0", + "listenfd", + "mas-config", + "mas-data-model", + "mas-email", + "mas-handlers", + "mas-http", + "mas-i18n", + "mas-iana", + "mas-keystore", + "mas-listener", + "mas-matrix", + "mas-matrix-synapse", + "mas-policy", + "mas-router", + "mas-spa", + "mas-storage", + "mas-storage-pg", + "mas-tasks", + "mas-templates", + "mas-tower", + "oauth2-types", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-jaeger-propagator", + "opentelemetry-otlp", + "opentelemetry-prometheus", + "opentelemetry-resource-detectors", + "opentelemetry-semantic-conventions", + "opentelemetry-stdout", + "opentelemetry_sdk", + "prometheus", + "rand", + "rand_chacha", + "rustls", + "sentry", + "sentry-tower", + "sentry-tracing", + "serde_json", + "serde_yaml", + "sqlx", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-subscriber", + "url", + "zeroize", +] + +[[package]] +name = "mas-config" +version = "0.12.0" +dependencies = [ + "anyhow", + "camino", + "chrono", + "figment", + "governor", + "indoc", + "ipnetwork", + "mas-iana", + "mas-jose", + "mas-keystore", + "pem-rfc7468", + "rand", + "rand_chacha", + "rustls-pemfile", + "rustls-pki-types", + "schemars", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tracing", + "ulid", + "url", +] + +[[package]] +name = "mas-data-model" +version = "0.12.0" +dependencies = [ + "chrono", + "crc", + "mas-iana", + "mas-jose", + "oauth2-types", + "rand", + "rand_chacha", + "regex", + "serde", + "thiserror", + "ulid", + "url", + "woothee", +] + +[[package]] +name = "mas-email" +version = "0.12.0" +dependencies = [ + "async-trait", + "headers", + "lettre", + "mas-templates", + "thiserror", + "tracing", +] + +[[package]] +name = "mas-handlers" +version = "0.12.0" +dependencies = [ + "aide", + "anyhow", + "argon2", + "async-graphql", + "async-trait", + "axum", + "axum-extra", + "axum-macros", + "base64ct", + "bcrypt", + "camino", + "chrono", + "cookie_store", + "futures-util", + "governor", + "headers", + "hyper", + "indexmap 2.5.0", + "insta", + "lettre", + "mas-axum-utils", + "mas-config", + "mas-data-model", + "mas-http", + "mas-i18n", + "mas-iana", + "mas-jose", + "mas-keystore", + "mas-matrix", + "mas-oidc-client", + "mas-policy", + "mas-router", + "mas-spa", + "mas-storage", + "mas-storage-pg", + "mas-templates", + "mime", + "minijinja", + "nonzero_ext", + "oauth2-types", + "opentelemetry", + "opentelemetry-semantic-conventions", + "pbkdf2", + "psl", + "rand", + "rand_chacha", + "rustls", + "schemars", + "sentry", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "sqlx", + "thiserror", + "time", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", + "ulid", + "url", + "zeroize", + "zxcvbn", +] + +[[package]] +name = "mas-http" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "mas-tower", + "opentelemetry", + "opentelemetry-semantic-conventions", + "pin-project-lite", + "rustls", + "rustls-platform-verifier", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "mas-i18n" +version = "0.12.0" +dependencies = [ + "camino", + "icu_calendar", + "icu_datetime", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_provider_adapters", + "icu_relativetime", + "pad", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", + "writeable", +] + +[[package]] +name = "mas-i18n-scan" +version = "0.12.0" +dependencies = [ + "camino", + "clap", + "mas-i18n", + "minijinja", + "serde_json", + "tracing", + "tracing-subscriber", + "walkdir", +] + +[[package]] +name = "mas-iana" +version = "0.12.0" +dependencies = [ + "schemars", + "serde", +] + +[[package]] +name = "mas-iana-codegen" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "camino", + "convert_case", + "csv", + "futures-util", + "reqwest", + "serde", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mas-jose" +version = "0.12.0" +dependencies = [ + "base64ct", + "chrono", + "digest", + "ecdsa", + "elliptic-curve", + "generic-array", + "hmac", + "insta", + "k256", + "mas-iana", + "p256", + "p384", + "rand", + "rand_chacha", + "rsa", + "schemars", + "sec1", + "serde", + "serde_json", + "serde_with", + "sha2", + "signature", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "mas-keystore" +version = "0.12.0" +dependencies = [ + "aead", + "base64ct", + "chacha20poly1305", + "const-oid", + "der", + "ecdsa", + "elliptic-curve", + "generic-array", + "insta", + "k256", + "mas-iana", + "mas-jose", + "p256", + "p384", + "pem-rfc7468", + "pkcs1", + "pkcs8", + "rand", + "rand_chacha", + "rsa", + "sec1", + "spki", + "thiserror", +] + +[[package]] +name = "mas-listener" +version = "0.12.0" +dependencies = [ + "anyhow", + "bytes", + "event-listener 5.3.1", + "futures-util", + "http-body", + "hyper", + "hyper-util", + "libc", + "pin-project-lite", + "rustls-pemfile", + "socket2 0.5.7", + "thiserror", + "tokio", + "tokio-rustls", + "tokio-test", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mas-matrix" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "http", + "serde", + "tokio", + "url", +] + +[[package]] +name = "mas-matrix-synapse" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "http", + "mas-axum-utils", + "mas-http", + "mas-matrix", + "serde", + "serde_json", + "tower", + "tracing", + "url", + "urlencoding", +] + +[[package]] +name = "mas-oidc-client" +version = "0.12.0" +dependencies = [ + "assert_matches", + "base64ct", + "bitflags 2.6.0", + "bytes", + "chrono", + "form_urlencoded", + "futures-util", + "headers", + "http", + "http-body-util", + "language-tags", + "mas-http", + "mas-iana", + "mas-jose", + "mas-keystore", + "mime", + "oauth2-types", + "rand", + "rand_chacha", + "rustls", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "thiserror", + "tokio", + "tower", + "tracing", + "url", + "wiremock", +] + +[[package]] +name = "mas-policy" +version = "0.12.0" +dependencies = [ + "anyhow", + "mas-data-model", + "oauth2-types", + "opa-wasm", + "schemars", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "mas-router" +version = "0.12.0" +dependencies = [ + "axum", + "serde", + "serde_urlencoded", + "ulid", + "url", +] + +[[package]] +name = "mas-spa" +version = "0.12.0" +dependencies = [ + "camino", + "serde", + "thiserror", +] + +[[package]] +name = "mas-storage" +version = "0.12.0" +dependencies = [ + "apalis-core", + "async-trait", + "chrono", + "futures-util", + "mas-data-model", + "mas-iana", + "mas-jose", + "oauth2-types", + "opentelemetry", + "rand_core", + "serde", + "serde_json", + "thiserror", + "tracing", + "tracing-opentelemetry", + "ulid", + "url", +] + +[[package]] +name = "mas-storage-pg" +version = "0.12.0" +dependencies = [ + "async-trait", + "chrono", + "futures-util", + "mas-data-model", + "mas-iana", + "mas-jose", + "mas-storage", + "oauth2-types", + "opentelemetry-semantic-conventions", + "rand", + "rand_chacha", + "sea-query", + "sea-query-binder", + "serde", + "serde_json", + "sqlx", + "thiserror", + "tracing", + "ulid", + "url", + "uuid", +] + +[[package]] +name = "mas-tasks" +version = "0.12.0" +dependencies = [ + "anyhow", + "apalis-core", + "apalis-cron", + "async-stream", + "async-trait", + "chrono", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "mas-data-model", + "mas-email", + "mas-i18n", + "mas-matrix", + "mas-router", + "mas-storage", + "mas-storage-pg", + "mas-templates", + "mas-tower", + "opentelemetry", + "rand", + "rand_chacha", + "serde", + "serde_json", + "sqlx", + "thiserror", + "tokio", + "tower", + "tracing", + "tracing-opentelemetry", + "ulid", + "url", +] + +[[package]] +name = "mas-templates" +version = "0.12.0" +dependencies = [ + "anyhow", + "arc-swap", + "camino", + "chrono", + "http", + "mas-data-model", + "mas-i18n", + "mas-router", + "mas-spa", + "minijinja", + "oauth2-types", + "rand", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tokio", + "tracing", + "ulid", + "url", + "v_htmlescape", + "walkdir", +] + +[[package]] +name = "mas-tower" +version = "0.12.0" +dependencies = [ + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-semantic-conventions", + "pin-project-lite", + "tower", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memfd" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +dependencies = [ + "rustix 0.38.34", +] + +[[package]] +name = "memo-map" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minijinja" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" +dependencies = [ + "memo-map", + "self_cell", + "serde", + "serde_json", + "v_htmlescape", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "memchr", + "mime", + "spin", + "version_check", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "oauth2-types" +version = "0.12.0" +dependencies = [ + "assert_matches", + "chrono", + "data-encoding", + "http", + "language-tags", + "mas-iana", + "mas-jose", + "serde", + "serde_json", + "serde_with", + "sha2", + "thiserror", + "url", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "crc32fast", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opa-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b727ebe10814d69fb4c1f538e1a0772e1f9b258d30c5a097d04158f8d6017" +dependencies = [ + "anyhow", + "base64 0.22.1", + "chrono", + "chrono-tz", + "chronoutil", + "digest", + "duration-str", + "form_urlencoded", + "hex", + "hmac", + "json-patch", + "md-5", + "parse-size", + "rand", + "rayon", + "semver", + "serde", + "serde_json", + "serde_yaml", + "sha1", + "sha2", + "sprintf", + "thiserror", + "tokio", + "tracing", + "urlencoding", + "wasmtime", +] + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry-http" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab" +dependencies = [ + "async-trait", + "bytes", + "http", + "http-body-util", + "hyper", + "hyper-util", + "opentelemetry", + "tokio", +] + +[[package]] +name = "opentelemetry-jaeger-propagator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" +dependencies = [ + "async-trait", + "futures-core", + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "opentelemetry_sdk", + "prost", + "thiserror", +] + +[[package]] +name = "opentelemetry-prometheus" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" +dependencies = [ + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "prometheus", + "protobuf", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" +dependencies = [ + "opentelemetry", + "opentelemetry_sdk", + "prost", + "tonic", +] + +[[package]] +name = "opentelemetry-resource-detectors" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a7e965924ad5234917f135243605ef6f2ae3f4da8d3363065d679b2c150f2a" +dependencies = [ + "opentelemetry", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" + +[[package]] +name = "opentelemetry-stdout" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287" +dependencies = [ + "async-trait", + "chrono", + "futures-util", + "opentelemetry", + "opentelemetry_sdk", + "ordered-float", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "percent-encoding", + "rand", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-float" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "pad" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-size" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", + "password-hash", + "rayon", + "sha2", +] + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" +dependencies = [ + "aes", + "cbc", + "der", + "pbkdf2", + "scrypt", + "sha2", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "pkcs5", + "rand_core", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.68", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "version_check", + "yansi", +] + +[[package]] +name = "prometheus" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot", + "protobuf", + "thiserror", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "protobuf" +version = "2.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + +[[package]] +name = "psl" +version = "2.1.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9398ad066421139b2e3afe16ea46772ffda30bd9ba57554dc035df5e26edc8" +dependencies = [ + "psl-types", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raw-cpuid" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regalloc2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +dependencies = [ + "hashbrown 0.13.2", + "log", + "rustc-hash", + "slice-group-by", + "smallvec", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "windows-registry", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "num-traits", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-roots", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "indexmap 2.5.0", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.68", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "sea-query" +version = "0.32.0-rc.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "chrono", + "inherent", + "sea-query-attr", + "sea-query-derive", + "uuid", +] + +[[package]] +name = "sea-query-attr" +version = "0.1.2" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "darling 0.14.4", + "heck 0.4.1", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sea-query-binder" +version = "0.7.0-rc.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "chrono", + "sea-query", + "sqlx", + "uuid", +] + +[[package]] +name = "sea-query-derive" +version = "0.4.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.68", + "thiserror", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "num-bigint", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "sentry" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" +dependencies = [ + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-panic", + "sentry-tower", + "sentry-tracing", +] + +[[package]] +name = "sentry-backtrace" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" +dependencies = [ + "hostname", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-panic" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tower" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c90802b38c899a2c9e557dff25ad186362eddf755d5f5244001b172dd03bead" +dependencies = [ + "http", + "pin-project", + "sentry-core", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "sentry-tracing" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" +dependencies = [ + "debugid", + "hex", + "rand", + "serde", + "serde_json", + "thiserror", + "time", + "url", + "uuid", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "indexmap 2.5.0", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6" +dependencies = [ + "axum", + "futures", + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.5.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.5.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slice-group-by" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sprintf" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e0732124cafd6bf2c9bc15f330fce49acb262beb57c877a2997898244e7f8a" +dependencies = [ + "thiserror", +] + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] +name = "sqlformat" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +dependencies = [ + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcfa89bea9500db4a0d038513d7a060566bfc51d46d1c014847049a45cce85e8" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06e2f2bd861719b1f3f0c7dbe1d80c30bf59e76cf019f07d9014ed7eefb8e08" +dependencies = [ + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener 5.3.1", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.14.5", + "hashlink", + "hex", + "indexmap 2.5.0", + "ipnetwork", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f998a9defdbd48ed005a89362bd40dd2117502f15294f61c8d47034107dbbdc" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 2.0.68", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d100558134176a2629d46cec0c8891ba0be8910f7896abfdb75ef4ab6f4e7ce" +dependencies = [ + "dotenvy", + "either", + "heck 0.5.0", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 2.0.68", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cac0ab331b14cb3921c62156d913e4c15b74fb6ec0f3146bd4ef6e4fb3c12" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9734dbce698c67ecf67c442f768a5e90a49b2a4d61a9f1d59f73874bd4cf0710" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "ipnetwork", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75b419c3c1b1697833dd927bdc4c6545a620bc1bbafabd44e1efbe9afcd337e" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions_next" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7beae5182595e9a8b683fa98c4317f956c9a2dec3b9716990d20023cc60c766" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.5.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "tonic" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "http", + "http-body", + "http-body-util", + "percent-encoding", + "pin-project", + "prost", + "tokio-stream", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "http-range-header", + "httpdate", + "iri-string", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "futures", + "futures-task", + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "tracing", + "tracing-core", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "ulid" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" +dependencies = [ + "getrandom", + "rand", + "serde", + "uuid", + "web-time", +] + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "serde", +] + +[[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-encoder" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasmparser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +dependencies = [ + "ahash", + "bitflags 2.6.0", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "semver", + "serde", +] + +[[package]] +name = "wasmprinter" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceca8ae6eaa8c7c87b33c25c53bdf299f8c2a764aee1179402ff7652ef3a6859" +dependencies = [ + "anyhow", + "wasmparser", +] + +[[package]] +name = "wasmtime" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786d8b5e7a4d54917c5ebe555b9667337e5f93383f49bddaaeec2eba68093b45" +dependencies = [ + "anyhow", + "async-trait", + "bumpalo", + "cc", + "cfg-if", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "libc", + "libm", + "log", + "mach2", + "memfd", + "memoffset", + "object", + "once_cell", + "paste", + "postcard", + "psm", + "rayon", + "rustix 0.38.34", + "serde", + "serde_derive", + "smallvec", + "sptr", + "target-lexicon", + "wasmparser", + "wasmtime-asm-macros", + "wasmtime-component-macro", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-fiber", + "wasmtime-jit-icache-coherence", + "wasmtime-slab", + "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d697d99c341d4a9ffb72f3af7a02124d233eeb59aee010f36d88e97cca553d5e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "wasmtime-component-macro" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29b462b068e73b5b27fae092a27f47e5937cabf6b26be2779c978698a52feca" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d2912c53d9054984b380dfbd7579f9c3681b2a73b903a56bd71a1c4f175f1e" + +[[package]] +name = "wasmtime-cranelift" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3975deafea000457ba84355c7c0fce0372937204f77026510b7b454f28a3a65" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen", + "cranelift-control", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli 0.28.1", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-environ" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f444e900e848b884d8a8a2949b6f5b92af642a3e663ff8fbe78731143a55be61" +dependencies = [ + "anyhow", + "cranelift-entity", + "gimli 0.28.1", + "indexmap 2.5.0", + "log", + "object", + "postcard", + "serde", + "serde_derive", + "target-lexicon", + "wasm-encoder", + "wasmparser", + "wasmprinter", + "wasmtime-types", +] + +[[package]] +name = "wasmtime-fiber" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ded58eb2d1bf0dcd2182d0ccd7055c4b10b50d711514f1d73f61515d0fa829d" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix 0.38.34", + "wasmtime-asm-macros", + "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5afe2f0499542f9a4bcfa1b55bfdda803b6ade4e7c93c6b99e0f39dba44b0a91" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-slab" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a7de1f2bec5bbb35d532e61c85c049dc84ae671df60492f90b954ecf21169e7" + +[[package]] +name = "wasmtime-types" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "412463e9000e14cf6856be48628d2213c20c153e29ffc22b036980c892ea6964" +dependencies = [ + "cranelift-entity", + "serde", + "serde_derive", + "smallvec", + "wasmparser", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc077306b38288262e5ba01d4b21532a6987416cdc0aedf04bb06c22a68fdc" +dependencies = [ + "anyhow", + "heck 0.4.1", + "indexmap 2.5.0", + "wit-parser", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "wiremock" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.7", + "deadpool", + "futures", + "http", + "http-body-util", + "hyper", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "wit-parser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.5.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + +[[package]] +name = "woothee" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zerotrie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zxcvbn" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad76e35b00ad53688d6b90c431cabe3cbf51f7a4a154739e04b63004ab1c736c" +dependencies = [ + "chrono", + "derive_builder", + "fancy-regex", + "itertools 0.13.0", + "lazy_static", + "regex", + "time", + "wasm-bindgen", + "web-sys", +] diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix index be17eeffcb..c6de3b3a0a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -15,21 +15,26 @@ rustPlatform.buildRustPackage rec { pname = "matrix-authentication-service"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "matrix-org"; + owner = "element-hq"; repo = "matrix-authentication-service"; rev = "refs/tags/v${version}"; - hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks="; + hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc="; }; - cargoHash = "sha256-mUHN1uEc1qM1Bm/J7qf0zyMKaJvyt9YbQ8TxvxG+vcM="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "sea-query-0.32.0-rc.1" = "sha256-Q/NFiIBu8L5rQj4jwcIo8ACmAhLBy4HSTcJv06UdK8E="; + }; + }; npmDeps = fetchNpmDeps { name = "${pname}-${version}-npm-deps"; src = "${src}/${npmRoot}"; - hash = "sha256-CMdnHS3sj9gXLpVlmuKvqFJ28+7fddG2Ld6t2nSFp24="; + hash = "sha256-EfDxbdjzF0yLQlueIYKmdpU4v9dx7g8bltU63mIWfo0="; }; npmRoot = "frontend"; @@ -45,7 +50,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.frameworks.SystemConfiguration @@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec { (cd "$npmRoot" && npm run build) ''; - # Adopted from https://github.com/matrix-org/matrix-authentication-service/blob/main/Dockerfile + # Adopted from https://github.com/element-hq/matrix-authentication-service/blob/main/Dockerfile postInstall = '' install -Dm444 -t "$out/share/$pname" "policies/policy.wasm" install -Dm444 -t "$out/share/$pname/assets" "$npmRoot/dist/"* @@ -83,12 +88,12 @@ rustPlatform.buildRustPackage rec { cp -r translations "$out/share/$pname/translations" ''; - meta = with lib; { + meta = { description = "OAuth2.0 + OpenID Provider for Matrix Homeservers"; - homepage = "https://github.com/matrix-org/matrix-authentication-service"; - changelog = "https://github.com/matrix-org/matrix-authentication-service/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ teutat3s ]; + homepage = "https://github.com/element-hq/matrix-authentication-service"; + changelog = "https://github.com/element-hq/matrix-authentication-service/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ teutat3s ]; mainProgram = "mas-cli"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix index 6215f7ddc6..78e0abebe8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matrix-zulip-bridge/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-zulip-bridge/package.nix new file mode 100644 index 0000000000..89d577665a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/matrix-zulip-bridge/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "MatrixZulipBridge"; + version = "0.4.1"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "GearKite"; + repo = "MatrixZulipBridge"; + rev = "v${version}"; + hash = "sha256-5bDqZb8xx5SjThZUSmOcctwo6B15cjkIwA26QNfED2A="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + zulip + beautifulsoup4 + bidict + coloredlogs + emoji + markdownify + mautrix + python-dotenv + ruamel-yaml + zulip-emoji-mapping + ]; + + pythonRelaxDeps = [ + "bidict" + "markdownify" + "ruamel-yaml" + "zulip-emoji-mapping" + ]; + + pythonImportsCheck = [ + "matrixzulipbridge" + ]; + + meta = { + description = "Matrix puppeting appservice bridge for Zulip"; + homepage = "https://github.com/GearKite/MatrixZulipBridge"; + changelog = "https://github.com/GearKite/MatrixZulipBridge/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ robertrichter ]; + mainProgram = "matrix-zulip-bridge"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix index c4dffa14bc..b147e74c22 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix index 91ed83ea97..fa7eb781c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ik6kFS66umiHf0M1fE+6++zpZF4gJrN9LQ2l+vi9SSY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mautrix-meta/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mautrix-meta/package.nix index c86c815e5d..bf9ed25230 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mautrix-meta/package.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.3.2"; + version = "0.4.0"; - subPackages = [ "." ]; + subPackages = [ "cmd/mautrix-meta" ]; src = fetchFromGitHub { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg="; + hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio="; + vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ="; passthru = { tests = { diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maven/build-maven-package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maven/build-maven-package.nix index 3808d40c6f..a84cd64ee4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maven/build-maven-package.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // { runHook preBuild mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) + runHook afterDepsSetup mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters} runHook postBuild diff --git a/third_party/nixpkgs/pkgs/by-name/mc/mcumgr-client/package.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcumgr-client/package.nix index f8909e8e20..db03704cbf 100644 --- a/third_party/nixpkgs/pkgs/by-name/mc/mcumgr-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mc/mcumgr-client/package.nix @@ -27,8 +27,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = - lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; meta = with lib; { description = "Client for mcumgr commands"; diff --git a/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix index 8c74b4b295..e781cd8a4f 100644 --- a/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/md/mdbook-alerts/package.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-alerts/package.nix index 30f4cc3f63..a36373848d 100644 --- a/third_party/nixpkgs/pkgs/by-name/md/mdbook-alerts/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/md/mdbook-alerts/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-nzVvktweqrow7P/I8DhDoVJNj1COCeEhx6HLY536hYE="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = { description = "Preprocessor for mdbook to support the inclusion of Markdown alerts"; diff --git a/third_party/nixpkgs/pkgs/by-name/md/mdbook-d2/package.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-d2/package.nix index 8b30e7fea4..8b8a032654 100644 --- a/third_party/nixpkgs/pkgs/by-name/md/mdbook-d2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/md/mdbook-d2/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lZ92vvRYXEBMx6ka8RP1wXctf73QNp5rNE8n7O96AEc="; doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/by-name/md/mdbook/package.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook/package.nix index aa8ff3dec3..4734394cd7 100644 --- a/third_party/nixpkgs/pkgs/by-name/md/mdbook/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/md/mdbook/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd mdbook \ diff --git a/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix index 3c9da25e33..b649afd83a 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; sourceRoot = "MediaInfo/Project/GNU/GUI"; diff --git a/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix b/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix index 2fbd7e8846..6e744f5d4b 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/megatools/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib - ] ++ lib.optionals stdenv.isLinux [ fuse ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse ]; enableParallelBuilding = true; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/me/meli/package.nix b/third_party/nixpkgs/pkgs/by-name/me/meli/package.nix index a9116aa654..0fc8b082ca 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/meli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/meli/package.nix @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Terminal e-mail client and e-mail client library"; mainProgram = "meli"; homepage = "https://meli.delivery"; diff --git a/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix index 2be371c934..e6d1f39288 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-09-06"; + version = "0.9.5-unstable-2024-09-18"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "268c4f14c194b72ced33f520688fb0d3d096fad5"; - hash = "sha256-D7tponrkD+YI6MYeilP5YlpIJ3brdZYKpDV/YE9vOFA="; + rev = "2179ca2a417e356f23a09cd88707b20c1bcaf66f"; + hash = "sha256-93KbpRlVVZc8JoaZiVLKOsTezLqY2Y7J2bFL7RkCcxM="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { qtmultimedia zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland qtwayland ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; qtWrapperArgs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ libpcap @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ] }" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/memtest_vulkan/package.nix b/third_party/nixpkgs/pkgs/by-name/me/memtest_vulkan/package.nix index ee20010197..cdbcc7982b 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/memtest_vulkan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/memtest_vulkan/package.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "memtest_vulkan"; broken = stdenv.system == "aarch64-linux" # error: linker `aarch64-linux-gnu-gcc` not found - || stdenv.isDarwin; # Can't find Vulkan; might work though? + || stdenv.hostPlatform.isDarwin; # Can't find Vulkan; might work though? }; } diff --git a/third_party/nixpkgs/pkgs/by-name/me/merge-ut-dictionaries/package.nix b/third_party/nixpkgs/pkgs/by-name/me/merge-ut-dictionaries/package.nix new file mode 100644 index 0000000000..ebe05f2fd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/merge-ut-dictionaries/package.nix @@ -0,0 +1,90 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, + python3, + jawiki-all-titles-in-ns0, + ibus-engines, + + mozcdic-ut-jawiki, + mozcdic-ut-personal-names, + mozcdic-ut-place-names, + mozcdic-ut-sudachidict, + + dictionaries ? [ + mozcdic-ut-jawiki + mozcdic-ut-personal-names + mozcdic-ut-place-names + mozcdic-ut-sudachidict + ], +}: + +assert lib.assertMsg (dictionaries != [ ]) "merge-ut-dictionaries needs at least one dictionary."; + +stdenvNoCC.mkDerivation { + pname = "merge-ut-dictionaries"; + version = "0-unstable-2024-09-09"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "merge-ut-dictionaries"; + rev = "35dfcca5c8657f2bf78bc000baa349c322ecb771"; + hash = "sha256-s6m430nXrG5v6iA+Fp2CKDPfFoAZirw/c3WahLrsaL4="; + }; + + nativeBuildInputs = [ python3 ]; + + preConfigure = '' + cd src + + substituteInPlace make.sh \ + --replace-fail "git" "true #" \ + --replace-fail "mv mozcdic-ut" "#" + + substituteInPlace count_word_hits.py \ + --replace-fail 'subprocess.run' "#" \ + --replace-fail "jawiki-latest-all-titles-in-ns0.gz" "${jawiki-all-titles-in-ns0}/jawiki-all-titles-in-ns0.gz" + + substituteInPlace remove_duplicate_ut_entries.py \ + --replace-fail "url =" 'url = "${ibus-engines.mozc.src}/src/data/dictionary_oss/id.def"#' \ + --replace-fail "urllib.request.urlopen" "open" \ + --replace-fail "read().decode()" "read()" + + for dir in ${lib.concatStringsSep " " dictionaries}; do + cp -v $dir/mozcdic-ut-*.txt.tar.bz2 . + done + ''; + + buildPhase = '' + runHook preBuild + + bash make.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out mozcdic-ut.txt + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT dictionaries are additional dictionaries for Mozc."; + homepage = "https://github.com/utuhiro78/merge-ut-dictionaries"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides a dictionary + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/me/merkaartor/package.nix b/third_party/nixpkgs/pkgs/by-name/me/merkaartor/package.nix index 1989929887..8d3abd715a 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/merkaartor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/merkaartor/package.nix @@ -10,7 +10,7 @@ qt5, withGeoimage ? true, exiv2, - withGpsdlib ? (!stdenv.isDarwin), + withGpsdlib ? (!stdenv.hostPlatform.isDarwin), gpsd, withLibproxy ? false, libproxy, @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { (lib.cmakeBool "ZBAR" withZbar) ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/merkaartor.app $out/Applications # Prevent wrapping, otherwise plugins will not be loaded diff --git a/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix index d817c63708..db59daf3a6 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix @@ -108,7 +108,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -116,7 +116,7 @@ python3.pkgs.buildPythonApplication rec { OpenAL OpenGL openldap - ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin) [ # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build llvmPackages.openmp # https://github.com/mesonbuild/meson/blob/1670fca36fcb1a4fe4780e96731e954515501a35/test%20cases/frameworks/29%20blocks/meson.build @@ -144,10 +144,10 @@ python3.pkgs.buildPythonApplication rec { ''test cases/linuxlike/14 static dynamic linkage'' # Nixpkgs cctools does not have bitcode support. ''test cases/osx/7 bitcode'' - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires llvmPackages.openmp, creating cyclic dependency ''test cases/common/184 openmp'' - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ # pch doesn't work quite right on FreeBSD, I think ''test cases/common/13 pch'' ])) diff --git a/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix index d86221db87..e1e0a3b771 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mesonlsp"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "JCWasmx86"; repo = "mesonlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-eSp2QyuO5sU2AqpFTTlXOSrcGy7nQLfvrY5/3N2qIqU="; + hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs="; }; patches = [ ./disable-tests-that-require-network-access.patch ]; @@ -52,11 +52,11 @@ stdenv.mkDerivation (finalAttrs: { libpkgconf nlohmann_json ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid pkgsStatic.fmt ] - ++ lib.optionals stdenv.isLinux [ libuuid ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ]; mesonFlags = [ "-Dbenchmarks=false" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix b/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix index ed0bdb5b0f..a8ddd60cc6 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.147.0"; + version = "1.149.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-Lj+w+u8xrjYYcINgFMVg8AoLonqRoHNRCyXdeDcXWDg="; + hash = "sha256-WpF8A7TUPVk/e/ezPlypnAldqklMfUS6RfuLvVNEWOY="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-kb+CtX4Jn3UIwXdRcyyrWnUhGaldrJQUl+F7RSWzmoI="; + hash = "sha256-WsaHl8dD5Fi7WEoLhYCkxVfMB/VJ8cllGY6EveqQYgY="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/me/metronome/package.nix b/third_party/nixpkgs/pkgs/by-name/me/metronome/package.nix index f21a941a9e..6c75f65dd3 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/metronome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/metronome/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix index 48f990e902..c842e475ca 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix @@ -36,7 +36,7 @@ let updateScript = ./update.sh; }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname diff --git a/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix index ae7bdf39a2..c611ccdd7e 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.8.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-zg7OBHrveBmsljUJUE0/kz3AkIbUtTHf64BQbROUXsQ="; + hash = "sha256-mi3lM/BQ16dCVX/kVRNhIis4sh6M0TMuK05q/pXJiS8="; }; vendorHash = "sha256-aABtsS39yxBBFMN98fjr4gy6QeF3dobrZqeZmmv2ywQ="; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/package.nix index 9f4bf82566..26964c848e 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/package.nix @@ -63,7 +63,8 @@ let metalSupport = assert accelIsValid; - (acceleration == "metal") || (stdenv.isDarwin && stdenv.isAarch64 && (acceleration == null)); + (acceleration == "metal") + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null)); darwinBuildInputs = with darwin.apple_sdk.frameworks; @@ -114,7 +115,7 @@ rustPlatform.buildRustPackage rec { cudaPackages.libcurand ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.isDarwin darwinBuildInputs; + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinBuildInputs; cargoBuildFlags = [ @@ -125,7 +126,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals cudaSupport [ "--features=cuda" ] ++ lib.optionals mklSupport [ "--features=mkl" ] - ++ lib.optionals (stdenv.isDarwin && metalSupport) [ "--features=metal" ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "--features=metal" ]; env = { @@ -186,7 +187,9 @@ rustPlatform.buildRustPackage rec { withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") ( mistral-rs.override { acceleration = "mkl"; } ); - withCuda = lib.optionalAttrs stdenv.isLinux (mistral-rs.override { acceleration = "cuda"; }); + withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux ( + mistral-rs.override { acceleration = "cuda"; } + ); withMetal = lib.optionalAttrs (stdenv.hostPlatform == "aarch64-darwin") ( mistral-rs.override { acceleration = "metal"; } ); diff --git a/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix index 1f485d42aa..c5537d5f2c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, glfw -, darwin -, enableShared ? !stdenv.hostPlatform.isStatic -, enableDebug ? false +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + glfw, + darwin, + enableShared ? !stdenv.hostPlatform.isStatic, + enableDebug ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -15,24 +16,35 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "codam-coding-college"; repo = "MLX42"; - rev = "v${finalAttrs.version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-c4LoTePHhQeZTx33V1K3ZyXmT7vjB6NdkGVAiSuJKfI="; }; - postPatch = '' - patchShebangs ./tools - '' - + lib.optionalString enableShared '' - substituteInPlace CMakeLists.txt \ - --replace "mlx42 STATIC" "mlx42 SHARED" - ''; + postPatch = + '' + patchShebangs --build ./tools + '' + + lib.optionalString enableShared '' + substituteInPlace CMakeLists.txt \ + --replace-fail "mlx42 STATIC" "mlx42 SHARED" + ''; + + strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ glfw ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL Cocoa IOKit ]); + buildInputs = + [ glfw ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + OpenGL + Cocoa + IOKit + ] + ); - cmakeFlags = [ "-DDEBUG=${toString enableDebug}" ]; + cmakeFlags = [ (lib.cmakeBool "DEBUG" enableDebug) ]; postInstall = '' mkdir -p $out/lib/pkgconfig @@ -40,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - changelog = "https://github.com/codam-coding-college/MLX42/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/codam-coding-college/MLX42/releases/tag/v${finalAttrs.version}"; description = "Simple cross-platform graphics library that uses GLFW and OpenGL"; homepage = "https://github.com/codam-coding-college/MLX42"; license = lib.licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 46874c6b7b..ca32e25fb0 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -85,11 +85,11 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libsoup webkitgtk ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -149,13 +149,13 @@ rustPlatform.buildRustPackage { '' runHook preInstall '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out"/bin cp -r target/release/bundle/macos "$out"/Applications mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app ln -s "$out"/bin/modrinth-app "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' cp -r target/release/bundle/"$tauriBundle"/*/data/usr "$out" desktop-file-edit \ --set-comment "Modrinth's game launcher" \ @@ -189,6 +189,6 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ getchoo ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; # this builds on architectures like aarch64, but the launcher itself does not support them yet - broken = !stdenv.isx86_64; + broken = !stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix index 12e13017ad..c92b6319d5 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix @@ -37,7 +37,7 @@ symlinkJoin rec { wrapGAppsHook3 ]; - runtimeDependencies = lib.optionalString stdenv.isLinux (lib.makeLibraryPath [ + runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (lib.makeLibraryPath [ addDriverRunpath.driverLink flite # narrator support @@ -57,7 +57,7 @@ symlinkJoin rec { postBuild = '' gappsWrapperArgs+=( --prefix PATH : ${lib.makeSearchPath "bin/java" jdks} - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' --prefix PATH : ${lib.makeBinPath [xorg.xrandr]} --set LD_LIBRARY_PATH $runtimeDependencies ''} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix index 383abc8f77..dbd6fbd6a2 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { tbb zlib zstd - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ mimalloc ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-DMOLD_USE_SYSTEM_TBB:BOOL=ON" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-faligned-allocation" ]); @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { in { version = testers.testVersion { package = mold; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { adapter-gcc = helloTest "adapter-gcc" (hello.override (old: { stdenv = useMoldLinker gccStdenv; })); adapter-llvm = helloTest "adapter-llvm" (hello.override (old: { stdenv = useMoldLinker clangStdenv; })); wrapped = helloTest "wrapped" (hello.overrideAttrs (previousAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mollysocket/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mollysocket/package.nix index c5772f2edc..6c9e18cc8f 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mollysocket/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mollysocket/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mongodb-ce/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mongodb-ce/package.nix index d3dc490bdc..a7ee195c98 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mongodb-ce/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { or (throw "unsupported system: ${stdenv.hostPlatform.system}") ); - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontStrip = true; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mongodb-compass/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mongodb-compass/package.nix index 1f93fb99d1..aa91374cc6 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mongodb-compass/package.nix @@ -33,7 +33,7 @@ }: let - version = "1.44.0"; + version = "1.44.3"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-EtICvM7oHToQS//kztOoVb6qPw5M/5+bHjNCcuFaCRA="; + hash = "sha256-3w9alnv51KNyc1pCqCtG022YI7LNrkTihn4Ldacc01M="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix index a0ca66b61e..62a3b556a3 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/moonlight-qt/package.nix @@ -32,7 +32,7 @@ let Cocoa VideoToolbox ; - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation rec { @@ -64,7 +64,7 @@ stdenv'.mkDerivation rec { buildInputs = [ - (SDL2.override { drmSupport = stdenv.isLinux; }) + (SDL2.override { drmSupport = stdenv.hostPlatform.isLinux; }) SDL2_ttf ffmpeg libopus @@ -73,7 +73,7 @@ stdenv'.mkDerivation rec { qt6.qtsvg openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio libva @@ -83,7 +83,7 @@ stdenv'.mkDerivation rec { wayland libdrm ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation AppKit AudioUnit @@ -93,7 +93,7 @@ stdenv'.mkDerivation rec { qmakeFlags = [ "CONFIG+=disable-prebuilts" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications $out/bin mv app/Moonlight.app $out/Applications ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight diff --git a/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock index 7f88b56265..e6b1027f67 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/mo/motoc/Cargo.lock @@ -62,9 +62,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "approx" @@ -132,15 +132,15 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "cc" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "shlex", ] @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "motoc" -version = "0.2.0" +version = "0.3.1" dependencies = [ "anyhow", "bindgen 0.70.1", @@ -738,9 +738,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.36" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags", "errno", @@ -772,18 +772,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -846,9 +846,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-segmentation" diff --git a/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix index eda819a455..23b0b6b135 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/motoc/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "motoc"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "galister"; repo = "motoc"; rev = "refs/tags/v${version}"; - hash = "sha256-7p25F2bRba3LxS8UAkHvhb+GyOsKUMj7bhiK5ZJ0Jkk="; + hash = "sha256-119RWsAM5kKjsxA6wGdjhB99G31QaYlZBRaFCg5TtmI="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix index 2a80e949de..68533127f9 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-uzTnkspTS3WvJUOmp8z7L/L1ut6NvnSlnsRa5yvaTRI="; + hash = "sha256-8t/gAz08jFRuF0q3bo4y8tiIq4iYgAkXf5udYNIccu0="; fetchSubmodules = true; }; - cargoHash = "sha256-kru8CBN9Mqm8Og7SKICjqSvds7z58RRqI4W2txLvWXo="; + cargoHash = "sha256-Fz7LfAn78JVip0QshoL5KMAEHMtG8bkLzz4v95/qt3E="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mov-cli/mov-cli-test.nix b/third_party/nixpkgs/pkgs/by-name/mo/mov-cli/mov-cli-test.nix index f135d863c1..7c34524eab 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mov-cli/mov-cli-test.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mov-cli/mov-cli-test.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "A mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons"; homepage = "https://github.com/mov-cli/mov-cli-test"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/ibus-setup-mozc-jp.desktop b/third_party/nixpkgs/pkgs/by-name/mo/mozc/ibus-setup-mozc-jp.desktop similarity index 100% rename from third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/ibus-setup-mozc-jp.desktop rename to third_party/nixpkgs/pkgs/by-name/mo/mozc/ibus-setup-mozc-jp.desktop diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozc/package.nix similarity index 59% rename from third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix rename to third_party/nixpkgs/pkgs/by-name/mo/mozc/package.nix index 4c19fd9abc..b374329d23 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozc/package.nix @@ -1,36 +1,43 @@ -{ lib -, buildBazelPackage -, fetchFromGitHub -, qt6 -, pkg-config -, bazel -, ibus -, unzip -, xdg-utils +{ + lib, + buildBazelPackage, + fetchFromGitHub, + qt6, + pkg-config, + bazel, + ibus, + unzip, + xdg-utils, + jp-zip-codes, + dictionaries ? [ ], + merge-ut-dictionaries, }: + let - zip-codes = fetchFromGitHub { - owner = "musjj"; - repo = "jp-zip-codes"; - rev = "119c888a38032a92e139c52cd26f45bb495c4d54"; - hash = "sha256-uyAL2TcFJsYZACFDAxIQ4LE40Hi4PVrQRnJl5O5+RmU="; - }; + ut-dictionary = merge-ut-dictionaries.override { inherit dictionaries; }; in buildBazelPackage rec { pname = "ibus-mozc"; - version = "2.29.5374.102"; + version = "2.30.5544.102"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; rev = version; - hash = "sha256-AcIN5sWPBe4JotAUYv1fytgQw+mJzdFhKuVPLR48soA="; + hash = "sha256-w0bjoMmq8gL7DSehEG7cKqp5e4kNOXnCYLW31Zl9FRs="; fetchSubmodules = true; }; - nativeBuildInputs = [ qt6.wrapQtAppsHook pkg-config unzip ]; + nativeBuildInputs = [ + qt6.wrapQtAppsHook + pkg-config + unzip + ]; - buildInputs = [ ibus qt6.qtbase ]; + buildInputs = [ + ibus + qt6.qtbase + ]; dontAddBazelOpts = true; removeRulesCC = false; @@ -38,7 +45,7 @@ buildBazelPackage rec { inherit bazel; fetchAttrs = { - sha256 = "sha256-ToBLVJpAQErL/P1bfWJca2FjhDW5XTrwuJQLquwlrhA="; + sha256 = "sha256-+N7AhSemcfhq6j0IUeWZ0DyVvr1l5FbAkB+kahTy3pM="; # remove references of buildInputs and zip code files preInstall = '' @@ -46,7 +53,12 @@ buildBazelPackage rec { ''; }; - bazelFlags = [ "--config" "oss_linux" "--compilation_mode" "opt" ]; + bazelFlags = [ + "--config" + "oss_linux" + "--compilation_mode" + "opt" + ]; bazelTargets = [ "package" ]; @@ -55,13 +67,17 @@ buildBazelPackage rec { --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" \ --replace-fail "/usr" "$out" substituteInPlace src/WORKSPACE.bazel \ - --replace-fail "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip" "file://${zip-codes}/ken_all.zip" \ - --replace-fail "https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip" "file://${zip-codes}/jigyosyo.zip" + --replace-fail "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip" "file://${jp-zip-codes}/ken_all.zip" \ + --replace-fail "https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip" "file://${jp-zip-codes}/jigyosyo.zip" ''; - preConfigure = '' - cd src - ''; + preConfigure = + '' + cd src + '' + + lib.optionalString (dictionaries != [ ]) '' + cat ${ut-dictionary}/mozcdic-ut.txt >> data/dictionary_oss/dictionary00.txt + ''; buildAttrs.installPhase = '' runHook preInstall @@ -78,10 +94,6 @@ buildBazelPackage rec { runHook postInstall ''; - passthru = { - inherit zip-codes; - }; - meta = with lib; { isIbusEngine = true; description = "Japanese input method from Google"; @@ -89,6 +101,10 @@ buildBazelPackage rec { homepage = "https://github.com/google/mozc"; license = licenses.free; platforms = platforms.linux; - maintainers = with maintainers; [ gebner ericsagnes pineapplehunter ]; + maintainers = with maintainers; [ + gebner + ericsagnes + pineapplehunter + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix new file mode 100644 index 0000000000..40295db08c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-alt-cannadic"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-alt-cannadic"; + rev = "50fee0397b87fe508f9edd45bac56f5290d8ce66"; + hash = "sha256-KKUj3d9yR2kTTTFbroZQs+OZR4KUyAUYE/X3z9/vQvM="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-alt-cannadic.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Alt-Cannadic Dictionary is a dictionary converted from Alt-Cannadic for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-alt-cannadic"; + license = with lib.licenses; [ + asl20 + gpl2 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix new file mode 100644 index 0000000000..37551d7e0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-edict2"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-edict2"; + rev = "b2112277d0d479b9218f42772356da3601b3e8cf"; + hash = "sha256-DIIp8FooWxyHMrQmq+2KUGEmYHKy+H6NtHrvRldxXqc="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-edict2.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT EDICT2 Dictionary is a dictionary converted from EDICT2 for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; + license = with lib.licenses; [ + asl20 + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix new file mode 100644 index 0000000000..f65a5d10a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-jawiki"; + version = "0-unstable-2024-09-21"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-jawiki"; + rev = "c7bec6a8df7a3f893646bb8c017033499a8350be"; + hash = "sha256-fjIOGT3SYKLtL31QfZVNT4vKMNuHy1YAKFVjf82BWMQ="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-jawiki.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Jawiki Dictionary is a dictionary generated from the Japanese Wikipedia for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-jawiki"; + license = with lib.licenses; [ + asl20 + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix new file mode 100644 index 0000000000..686fe1e9fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-neologd"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-neologd"; + rev = "b7035b88db25ad1a933f05a33f193711c6c3b2db"; + hash = "sha256-JPTrWaDtdNs/Z0uLRwaS8Qc/l4/Y7NtwLanivyefXnk="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-neologd.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT NEologd Dictionary is a dictionary converted from mecab-ipadic-NEologd for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-neologd"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix new file mode 100644 index 0000000000..fb3c430c45 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-personal-names"; + version = "0-unstable-2024-09-21"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-personal-names"; + rev = "b61a5af7992d6fcdc82fa08b67b1c9771bbc4449"; + hash = "sha256-xcfhfO5GIiOVxLfqX3izLHYuSFZCgOlbQE3N3U+HTW4="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-personal-names.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Personal Name Dictionary is a dictionary for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-personal-names"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix new file mode 100644 index 0000000000..8cfb509f5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-place-names"; + version = "0-unstable-2024-09-03"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-place-names"; + rev = "4525819546a26fc994d7ca4a2e883fde14bf908c"; + hash = "sha256-oiSBR2QhOYyurftdEn2w6hNK1ucddlvLqGTiZk9G/4k="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-place-names.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Place Name Dictionary is a dictionary converted from the Japan Post's ZIP code data for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-place-names"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix new file mode 100644 index 0000000000..264490ad61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-skk-jisyo"; + version = "0-unstable-2024-07-27"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-skk-jisyo"; + rev = "7300f19e6a3f27334ed7af64589de8782549a13f"; + hash = "sha256-LJ1rP+uyh8K3IWCgKMDYt0EwEDiQqQL+wBdQCFbZM/k="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-skk-jisyo.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT SKK-JISYO Dictionary is a dictionary converted from SKK-JISYO for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; + license = with lib.licenses; [ + asl20 + gpl2Plus + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix new file mode 100644 index 0000000000..2ddb8fe5d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-sudachidict"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-sudachidict"; + rev = "a754f1fff5fded62cc066aa6be0ab0169059a144"; + hash = "sha256-WzhWNpqtiG9TtFHEOSbHG1mbb4ak0zCkO13g9ZWqyBE="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-sudachidict.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT SudachiDict Dictionary is a dictionary converted from SudachiDict for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mp/mpris-notifier/package.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpris-notifier/package.nix index b48c5e6d7e..3b3016a1d2 100644 --- a/third_party/nixpkgs/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mp/mpris-notifier/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "mpris-notifier"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "l1na-forever"; repo = "mpris-notifier"; rev = "v${version}"; - hash = "sha256-s7/eN2gn8VmNtrI9zEBASs7jzxgfszJjNlXR7IVr3G4="; + hash = "sha256-X9d410ijZZcHvf8+f6DgnMl8ETGeY/fN13Gpz6q3BBA="; }; - cargoHash = "sha256-DTB1Ranz2oeuWVMuFNe+kjuQFnPqBoDeqxuYFU9svSs="; + cargoHash = "sha256-f8BCnjgv7OLWQ/2X3dTUuAarCl+u+4CRARSQsO+09zE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mq/mqtt-explorer/package.nix b/third_party/nixpkgs/pkgs/by-name/mq/mqtt-explorer/package.nix index dec4322046..2aa7a6ba68 100644 --- a/third_party/nixpkgs/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { typescript fixup-yarn-lock makeWrapper - ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; # disable code signing on macos # https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export CSC_IDENTITY_AUTO_DISCOVERY=false ''; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/mqtt-explorer"/{app,icons/hicolor} cp -r build/*-unpacked/{locales,resources{,.pak}} "$out/share/mqtt-explorer/app" @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { --inherit-argv0 ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv "build/mac/MQTT Explorer.app" $out/Applications diff --git a/third_party/nixpkgs/pkgs/by-name/mq/mqttui/package.nix b/third_party/nixpkgs/pkgs/by-name/mq/mqttui/package.nix index e4bbd4974f..d2617f51e1 100644 --- a/third_party/nixpkgs/pkgs/by-name/mq/mqttui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mq/mqttui/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ln -sf ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = "Terminal client for MQTT"; diff --git a/third_party/nixpkgs/pkgs/by-name/ms/mscp/package.nix b/third_party/nixpkgs/pkgs/by-name/ms/mscp/package.nix new file mode 100644 index 0000000000..f95b0a249d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ms/mscp/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + openssl, + krb5, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mscp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "upa"; + repo = "mscp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-TWwvPLqGLhh/IE+hIz/jwaGLBoASs78Iqai1TxN7Wps="; + fetchSubmodules = true; + }; + + postPatch = '' + echo ${lib.escapeShellArg finalAttrs.version} > VERSION + patch -d libssh -p1 < patch/libssh-0.10.6-2-g6f1b1e76.patch + ''; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + krb5 + openssl + zlib + ]; + + meta = { + description = "Transfer files over multiple SSH (SFTP) connections"; + homepage = "https://github.com/upa/mscp"; + mainProgram = "mscp"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.deshaw.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix index 43a5f135b8..6184aa0ac3 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/muffon/package.nix @@ -17,8 +17,9 @@ in appimageTools.wrapType2 { inherit pname src version; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/muffon \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/muffon.desktop -t $out/share/applications diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix index 416de20426..291fe8e546 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/mujoco/package.nix @@ -191,6 +191,6 @@ stdenv.mkDerivation rec { samuela tmplt ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix index 42cb084e05..b4662af7b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/mullvad-browser/package.nix @@ -29,10 +29,10 @@ , pciutils , zlib -, libnotifySupport ? stdenv.isLinux +, libnotifySupport ? stdenv.hostPlatform.isLinux , libnotify -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libxkbcommon , libdrm , libGL diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mumps/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/mumps/package.nix index 17c005946f..7d0e3e154c 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/mumps/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/mumps/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/coin-or-tools/ThirdParty-Mumps/blob/stable/3.0/get.Mumps#L66 cp libseq/mpi.h libseq/mumps_mpi.h '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace-fail \ "-Wl,\''$(SONAME),libmumps_common" \ "-Wl,-install_name,$out/lib/libmumps_common" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ''; makeFlags = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ "SONAME=" "LIBEXT_SHARED=.dylib" ] @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { scotch ]; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -change libmpiseq.dylib \ $out/lib/libmpiseq.dylib \ diff --git a/third_party/nixpkgs/pkgs/by-name/mu/muon/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/muon/package.nix index a479dd23d2..0e38f4f8e9 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/muon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/muon/package.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # typical `ar failure` + broken = stdenv.hostPlatform.isDarwin; # typical `ar failure` mainProgram = "muon"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/mu/music-player/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/music-player/package.nix index 776486e692..2f2a54d36f 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/music-player/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/music-player/package.nix @@ -28,15 +28,15 @@ rustPlatform.buildRustPackage rec { protobuf rustPlatform.bindgenHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mu/musikcube/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/musikcube/package.nix index 8eb5536f39..8c59e98339 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/musikcube/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/musikcube/package.nix @@ -72,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { taglib ] ++ lib.optionals systemdSupport [ systemd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib pulseaudio ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Cocoa @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DDISABLE_STRIP=true" ]; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcube install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcubed ''; diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mutter/43/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutter/43/default.nix index b79c839ec3..bea00d83f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/mu/mutter/43/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mu/mutter/43/default.nix @@ -5,7 +5,6 @@ fetchpatch, stdenv, pkg-config, - gnome, gettext, gobject-introspection, cairo, diff --git a/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix index 266448a438..2669ff84d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ versionCheckHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix index b245404420..1c4d655efd 100644 --- a/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ bison cmake pkg-config ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf_21 re2 readline zlib zstd libfido2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix b/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix index b77a39a2c3..0a57d8818d 100644 --- a/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.57.0"; + version = "1.60.1"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-0ShG/9Hj132mbNC06HzduMCosAefufbI1M/KJUYK1TQ="; + hash = "sha256-G//+9Mucm/yH8XlA8/OO09lg9mKlo1S+Pyfmsp5MQhk="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-EfK8cmfkVebc/kIYaW+Eje1oPW1EpVpa2/jMs+KE5wg="; + hash = "sha256-61xRNwJUFQrj7aw/+SqMABb8W+sJsVZ6aTgU9N7ssDo="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { node-gyp # required to build sqlite3 bindings cacert # required for rustls-native-certs (dependency of turbo build tool) makeWrapper - ] ++ lib.optional stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ nodejs diff --git a/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix b/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix index ba20cacf8d..a342c091f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/naja/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "10.14") # For aligned allocation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/na/naps2/package.nix b/third_party/nixpkgs/pkgs/by-name/na/naps2/package.nix index 728445a1da..93161f889e 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/naps2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/naps2/package.nix @@ -55,7 +55,7 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ eliandoran ]; platforms = lib.platforms.linux; mainProgram = "naps2"; - broken = stdenv.isAarch64; # Google.Protobuf.Tools dependency fails to build. + broken = stdenv.hostPlatform.isAarch64; # Google.Protobuf.Tools dependency fails to build. }; } diff --git a/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix b/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix index d7cff84402..2f0424a059 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "narsil"; - version = "1.3.0-85-g68f1491ca"; + version = "1.3.0-187-g96d6b3bbd"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; rev = version; - hash = "sha256-uiueTkfucYcK6BQ0WpXp8Sye7E0D1uxd/InowWznBjY="; + hash = "sha256-vrYkA/kYQRXMcULVIZ9EaQOI0L4aQWVVp1M38Net0Fc="; }; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/na/navidrome/package.nix b/third_party/nixpkgs/pkgs/by-name/na/navidrome/package.nix index 971471041b..3fa847f2e6 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/navidrome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/navidrome/package.nix @@ -1,4 +1,4 @@ -{ buildGoModule +{ buildGo123Module , buildPackages , fetchFromGitHub , fetchNpmDeps @@ -15,25 +15,25 @@ , ffmpegSupport ? true }: -buildGoModule rec { +buildGo123Module rec { pname = "navidrome"; - version = "0.52.5"; + version = "0.53.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-M1BxR4Mmkfbr9Wb2YwWEeVGgKOCtD/8pgFZiv8mTi7s="; + hash = "sha256-ghjQZc+KWtgDcW9nU7L2FV8mOL6nn7V5Dn0JiG5gii8="; }; - vendorHash = "sha256-puldHJs5GiaXvyvwuzAX00nMLUxoBESpxLOEtBYD7o4="; + vendorHash = "sha256-+acLAn9cicXYRVn3tL+GzFeCxHtXHDMgKisu4BzvGQs="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/ui"; - hash = "sha256-OZvEPC+MobCJn16d3MsMtrStbsmRD9Ef0/leVSXtVZ8="; + hash = "sha256-SebqSsng/t6g2874Hejc9wubiyYLE0jb3oLFnGwTRMA="; }; nativeBuildInputs = [ @@ -82,6 +82,6 @@ buildGoModule rec { sourceProvenance = with lib.sourceTypes; [ fromSource ]; maintainers = with lib.maintainers; [ aciceri squalus ]; # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119) - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nb/nbqa/package.nix b/third_party/nixpkgs/pkgs/by-name/nb/nbqa/package.nix index f4b1a8fdf5..07fdcdde27 100644 --- a/third_party/nixpkgs/pkgs/by-name/nb/nbqa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nb/nbqa/package.nix @@ -4,112 +4,114 @@ fetchFromGitHub, # optional-dependencies - black, - blacken-docs, ruff, - # passthru - testers, - nbqa, + # tests + versionCheckHook, }: -python3.pkgs.buildPythonApplication rec { - pname = "nbqa"; - version = "1.9.0"; - pyproject = true; - src = fetchFromGitHub { - owner = "nbQA-dev"; - repo = "nbQA"; - rev = "refs/tags/${version}"; - hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY="; - }; +let + nbqa = python3.pkgs.buildPythonApplication rec { + pname = "nbqa"; + version = "1.9.0"; + pyproject = true; - build-system = with python3.pkgs; [ - setuptools - ]; + src = fetchFromGitHub { + owner = "nbQA-dev"; + repo = "nbQA"; + rev = "refs/tags/${version}"; + hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY="; + }; - passthru.optional-dependencies = { - black = [ black ]; - blacken-docs = [ blacken-docs ]; - flake8 = [ python3.pkgs.flake8 ]; - isort = [ python3.pkgs.isort ]; - jupytext = [ python3.pkgs.jupytext ]; - mypy = [ python3.pkgs.mypy ]; - pylint = [ python3.pkgs.pylint ]; - pyupgrade = [ python3.pkgs.pyupgrade ]; - ruff = [ ruff ]; - }; + build-system = with python3.pkgs; [ + setuptools + ]; - dependencies = - with python3.pkgs; - [ + optional-dependencies.toolchain = + (with python3.pkgs; [ + black + blacken-docs + flake8 + isort + jupytext + mypy + pylint + pyupgrade + ]) + ++ [ + ruff + ]; + + dependencies = with python3.pkgs; [ autopep8 ipython tokenize-rt tomli - ] - ++ builtins.attrValues passthru.optional-dependencies; + ]; - postPatch = '' - # Force using the Ruff executable rather than the Python package - substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' - ''; + postPatch = '' + # Force using the Ruff executable rather than the Python package + substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' + ''; - preCheck = '' - # Allow the tests to run `nbqa` itself from the path - export PATH="$out/bin":"$PATH" - ''; + preCheck = '' + # Allow the tests to run `nbqa` itself from the path + export PATH="$out/bin":"$PATH" + ''; - nativeCheckInputs = - [ - black - ruff - ] - ++ (with python3.pkgs; [ - autoflake - distutils - flake8 - isort - jupytext - mdformat - pre-commit-hooks - pydocstyle - pylint - pytestCheckHook - pyupgrade - yapf - ]); + nativeCheckInputs = + (with python3.pkgs; [ + autoflake + distutils + mdformat + pre-commit-hooks + pydocstyle + pytestCheckHook + yapf + ]) + ++ lib.flatten (lib.attrValues optional-dependencies) + ++ [ versionCheckHook ]; - disabledTests = [ - # Test data not found - "test_black_multiple_files" - "test_black_return_code" - "test_grep" - "test_jupytext_on_folder" - "test_mypy_works" - "test_running_in_different_dir_works" - "test_unable_to_reconstruct_message_pythonpath" - "test_with_subcommand" - "test_pylint_works" - ]; + disabledTests = [ + # Test data not found + "test_black_multiple_files" + "test_black_return_code" + "test_grep" + "test_jupytext_on_folder" + "test_mypy_works" + "test_running_in_different_dir_works" + "test_unable_to_reconstruct_message_pythonpath" + "test_with_subcommand" + "test_pylint_works" + ]; - disabledTestPaths = [ - # Test data not found - "tests/test_include_exclude.py" - ]; + disabledTestPaths = [ + # Test data not found + "tests/test_include_exclude.py" + ]; - passthru = { - tests.version = testers.testVersion { - package = nbqa; + passthru = { + # selector is a function mapping pythonPackages to a list of code quality + # tools, e.g. nbqa.withTools (ps: [ ps.black ]) + withTools = + selector: + nbqa.overridePythonAttrs ( + { dependencies, ... }: + { + dependencies = dependencies ++ selector python3.pkgs; + doCheck = false; + } + ); + }; + + meta = { + homepage = "https://github.com/nbQA-dev/nbQA"; + changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; + description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ l0b0 ]; + mainProgram = "nbqa"; }; }; - - meta = { - homepage = "https://github.com/nbQA-dev/nbQA"; - changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; - description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ l0b0 ]; - mainProgram = "nbqa"; - }; -} +in +nbqa diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neovide/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovide/package.nix index 232bc4664e..dc49789cf5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/neovide/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/neovide/package.nix @@ -20,7 +20,7 @@ , darwin , libglvnd , libxkbcommon -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland }: @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pkg-config python3 # skia removeReferencesTo - ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; nativeCheckInputs = [ neovim ]; @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { SDL2 fontconfig rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; @@ -96,11 +96,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { --prefix LD_LIBRARY_PATH : ${libPath} ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r extra/osx/Neovide.app $out/Applications ln -s $out/bin $out/Applications/Neovide.app/Contents/MacOS - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for n in 16x16 32x32 48x48 256x256; do install -m444 -D "assets/neovide-$n.png" \ "$out/share/icons/hicolor/$n/apps/neovide.png" diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix index aa7b2607fb..6251559eba 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/neovim-qt/package.nix @@ -6,7 +6,7 @@ in libsForQt5.mkDerivation { pname = "neovim-qt"; version = unwrapped.version; - buildCommand = if stdenv.isDarwin then '' + buildCommand = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neovim-remote/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-remote/package.nix index ffb686abc8..e0f8818054 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/neovim-remote/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/neovim-remote/package.nix @@ -35,7 +35,7 @@ with python3.pkgs; buildPythonApplication rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME="$(mktemp -d)" diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/package.nix index c66597da3a..b37ba7fd2d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation (finalAttrs: let - nvim-lpeg-dylib = luapkgs: if stdenv.isDarwin + nvim-lpeg-dylib = luapkgs: if stdenv.hostPlatform.isDarwin then (luapkgs.lpeg.overrideAttrs (oa: { preConfigure = '' # neovim wants clang .dylib @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: nativeBuildInputs = oa.nativeBuildInputs ++ ( - lib.optional stdenv.isDarwin fixDarwinDylibNames + lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ); })) else luapkgs.lpeg; @@ -104,7 +104,7 @@ in { neovimLuaEnv tree-sitter unibilium - ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps ] ; @@ -168,7 +168,7 @@ in { "-DLUA_PRG=${neovimLuaEnvOnBuild}/bin/luajit" ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" '' + '' mkdir -p $out/lib/nvim/parser diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nerdfetch/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nerdfetch/package.nix index 659cc3deb9..c470b12e11 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nerdfetch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nerdfetch/package.nix @@ -5,13 +5,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "nerdfetch"; - version = "8.2.1"; + version = "8.3.0"; src = fetchFromGitHub { owner = "ThatOneCalculator"; repo = "NerdFetch"; rev = "v${finalAttrs.version}"; - hash = "sha256-9S7mS+lUCT8/Q65fqlrnTksuK3mhynPX+jWPaV8U8Dg="; + hash = "sha256-CQjIxXGuEUdUbbdclVKshsz/AdkgDTTACoNCVFrHqas="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix index 9634c2b07a..5ac4e9f7a4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix @@ -19,8 +19,8 @@ buildGoModule rec { vendorHash = "sha256-DzTTESPxYuZYNGjEG3PufLoS02+R9275arVcUzImpBU="; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa - ++ lib.optional stdenv.isLinux libX11; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa + ++ lib.optional stdenv.hostPlatform.isLinux libX11; hardeningEnabled = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix index 9b51e97159..5c4bd81fa8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; # TODO: unit tests temporarily broken, remove this line for the next diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix index b6b2eb07bd..b6a3b6974d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "-DHIMBAECHEL_GOWIN_DEVICES=all" ] ++ (lib.optional enableGui "-DBUILD_GUI=ON") - ++ (lib.optional (enableGui && stdenv.isDarwin) + ++ (lib.optional (enableGui && stdenv.hostPlatform.isDarwin) "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); patchPhase = with builtins; '' diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix index cbf9a20bba..7e2414794f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nexusmods-app/package.nix @@ -6,7 +6,6 @@ desktop-file-utils, dotnetCorePackages, fetchFromGitHub, - fontconfig, lib, runCommand, pname ? "nexusmods-app", diff --git a/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix b/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix index daf9da5c8f..bb47cd4d73 100644 --- a/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix @@ -7,20 +7,20 @@ let versions = lib.importJSON ./versions.json; arch = - if stdenv.isi686 then + if stdenv.hostPlatform.isi686 then "386" - else if stdenv.isx86_64 then + else if stdenv.hostPlatform.isx86_64 then "amd64" - else if stdenv.isAarch32 then + else if stdenv.hostPlatform.isAarch32 then "arm" - else if stdenv.isAarch64 then + else if stdenv.hostPlatform.isAarch64 then "arm64" else throw "Unsupported architecture"; os = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "Unsupported os"; @@ -58,7 +58,7 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; # Stripping causes SEGFAULT on darwin - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = { description = "Allows you to expose a web server running on your local machine to the internet"; diff --git a/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix b/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix index 0d2ad0a0d3..58a9f84b07 100644 --- a/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; preFixup = '' mkdir completions diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nicstat/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nicstat/package.nix index d8da45a608..1e1e346b82 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nicstat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nicstat/package.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ juliusrickert ]; mainProgram = "nicstat"; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-btm/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-btm/package.nix index 42496a5bff..a7d94b4863 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-btm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-btm/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-qUZ3zJjQrteFQerBKFH/+Ys0uOzvI7DH9rCaVtseJMM="; - buildInputs = lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-health/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-health/package.nix index 3cb4fc881c..2081714d50 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-health/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-health/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libiconv openssl ] # Use a newer SDK for CoreFoundation, because the sysinfo crate requires # it, https://github.com/GuillaumeGomez/sysinfo/issues/915 - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ IOKit CoreFoundation ]); diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix new file mode 100644 index 0000000000..3cb6617031 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + systemd, +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-store-veritysetup-generator"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "nikstur"; + repo = "nix-store-veritysetup-generator"; + rev = version; + hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I="; + }; + + sourceRoot = "${src.name}/rust"; + + cargoHash = "sha256-NCxPLsBJX4Dp8LcWrjVrocqDBvWc587DF3WPXZg1uFY="; + + env = { + SYSTEMD_VERITYSETUP_PATH = "${systemd}/lib/systemd/systemd-veritysetup"; + SYSTEMD_ESCAPE_PATH = "${systemd}/bin/systemd-escape"; + }; + + # Use a fake path in tests so that they are not dependent on specific Nix + # Store paths and thus don't break on different Nixpkgs invocations. This is + # relevant so that this package can be compiled on different architectures. + preCheck = '' + export SYSTEMD_VERITYSETUP_PATH="systemd-veritysetup"; + ''; + + stripAllList = [ "bin" ]; + + meta = with lib; { + description = "Systemd unit generator for a verity protected Nix Store"; + homepage = "https://github.com/nikstur/nix-store-veritysetup-generator"; + license = licenses.mit; + maintainers = with lib.maintainers; [ nikstur ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-top/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-top/package.nix index 55170ec408..fa69693781 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-top/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-top/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/nix-top \ --prefix PATH : "$out/libexec/nix-top:${additionalPath}" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s /bin/stty $out/libexec/nix-top '' + '' diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix index 08f8fe9bcf..c7212f1a31 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix @@ -11,14 +11,14 @@ let self = python3Packages.buildPythonApplication { pname = "nix-update"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-update"; rev = "refs/tags/${self.version}"; - hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; + hash = "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE="; }; build-system = [ python3Packages.setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-weather/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-weather/package.nix index ea552ca9e4..02f31ee197 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-weather/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-weather/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { openssl installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix index ad97b1356b..21d6c9f15d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix @@ -26,8 +26,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-romL/RALr/pmwUA8/SN4AOwc+Vndspd1Yrqs0AHPYRY="; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional (!stdenv.isDarwin) openssl - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); postPatch = '' substituteInPlace nix-web/nix-web.service \ diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix index 55a7deb1b4..bc449ce112 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-AdSrhQhJb9ObCgM1iXnoIBBl+6cjRbuTST4Lt02AP5Q="; + hash = "sha256-ssx6Y665uoOO3PX6Mp9NAF8sqoGb7Ezfw+bTY69aGlE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/build-vms.nix similarity index 87% rename from third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/build-vms.nix index 21a257378a..12b3c44746 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/build-vms.nix @@ -1,5 +1,6 @@ { system ? builtins.currentSystem , config ? {} +, nixpkgs , networkExpr }: @@ -9,9 +10,9 @@ let imports = [ module ]; }) (import networkExpr); - pkgs = import ../../../../.. { inherit system config; }; + pkgs = import nixpkgs { inherit system config; }; - testing = import ../../../../lib/testing-python.nix { + testing = import "${pkgs.path}/nixos/lib/testing-python.nix" { inherit system pkgs; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/manpages/nixos-build-vms.8 b/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.8 similarity index 100% rename from third_party/nixpkgs/nixos/modules/installer/tools/manpages/nixos-build-vms.8 rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.8 diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh similarity index 86% rename from third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh index 490ede04e6..d55eb5d062 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh @@ -49,5 +49,6 @@ then fi # Build a network of VMs -nix-build '' \ - --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" +nix-build @buildVms@ \ + --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" \ + --arg nixpkgs "" diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/package.nix new file mode 100644 index 0000000000..fc8b4f403e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-build-vms/package.nix @@ -0,0 +1,22 @@ +{ + substituteAll, + runtimeShell, + installShellFiles, +}: +substituteAll { + name = "nixos-build-vms"; + src = ./nixos-build-vms.sh; + inherit runtimeShell; + buildVms = ./build-vms.nix; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-build-vms.8} + ''; + + meta.mainProgram = "nixos-build-vms"; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/manpages/nixos-enter.8 b/third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/nixos-enter.8 similarity index 100% rename from third_party/nixpkgs/nixos/modules/installer/tools/manpages/nixos-enter.8 rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/nixos-enter.8 diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-enter.sh b/third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/nixos-enter.sh similarity index 99% rename from third_party/nixpkgs/nixos/modules/installer/tools/nixos-enter.sh rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/nixos-enter.sh index 9141cc2857..214ab7dfbd 100755 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-enter.sh +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/nixos-enter.sh @@ -3,6 +3,8 @@ set -e +export PATH=@path@:$PATH + # Re-exec ourselves in a private mount namespace so that our bind # mounts get cleaned up automatically. if [ -z "$NIXOS_ENTER_REEXEC" ]; then diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/package.nix new file mode 100644 index 0000000000..38fe2de663 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-enter/package.nix @@ -0,0 +1,34 @@ +{ + lib, + substituteAll, + runtimeShell, + installShellFiles, + util-linuxMinimal, +}: +substituteAll { + name = "nixos-enter"; + src = ./nixos-enter.sh; + + inherit runtimeShell; + + path = lib.makeBinPath [ + util-linuxMinimal + ]; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-enter.8} + ''; + + meta = { + description = "Run a command in a NixOS chroot environment"; + homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "nixos-enter"; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/manpages/nixos-install.8 b/third_party/nixpkgs/pkgs/by-name/ni/nixos-install/nixos-install.8 similarity index 100% rename from third_party/nixpkgs/nixos/modules/installer/tools/manpages/nixos-install.8 rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-install/nixos-install.8 diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh b/third_party/nixpkgs/pkgs/by-name/ni/nixos-install/nixos-install.sh similarity index 100% rename from third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-install/nixos-install.sh diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-install/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-install/package.nix new file mode 100644 index 0000000000..fbe7561967 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-install/package.nix @@ -0,0 +1,38 @@ +{ + lib, + substituteAll, + runtimeShell, + installShellFiles, + nix, + jq, + nixos-enter, + util-linuxMinimal, +}: +substituteAll { + name = "nixos-install"; + src = ./nixos-install.sh; + + inherit runtimeShell nix; + + path = lib.makeBinPath [ + jq + nixos-enter + util-linuxMinimal + ]; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-install.8} + ''; + + meta = { + description = "Install bootloader and NixOS"; + homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install"; + license = lib.licenses.mit; + mainProgram = "nixos-install"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixtract/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixtract/package.nix index e046e49d84..2885a13f30 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nixtract/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixtract/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/nm/nmap/package.nix b/third_party/nixpkgs/pkgs/by-name/nm/nmap/package.nix index 666f6bd84e..e90fc8ec32 100644 --- a/third_party/nixpkgs/pkgs/by-name/nm/nmap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nm/nmap/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g="; }; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libz/configure \ --replace /usr/bin/libtool ar \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { install -m 444 -D nselib/data/passwords.lst $out/share/wordlists/nmap.lst ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change liblinear.so.5 ${liblinear.out}/lib/liblinear.5.dylib $out/bin/nmap ''; diff --git a/third_party/nixpkgs/pkgs/by-name/nn/nncp/package.nix b/third_party/nixpkgs/pkgs/by-name/nn/nncp/package.nix index 13c4c4812b..bbacef76fb 100644 --- a/third_party/nixpkgs/pkgs/by-name/nn/nncp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nn/nncp/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "http://www.nncpgo.org/News.html"; description = "Secure UUCP-like store-and-forward exchanging"; downloadPage = "http://www.nncpgo.org/Tarballs.html"; diff --git a/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix index a5f17f4b36..45333177d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/nomacs/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] # man pages are not installed on Darwin, see cmake/{Mac,Unix}BuildTarget.cmake - ++ lib.optionals (!stdenv.isDarwin) [ "man" ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "man" ]; sourceRoot = "${finalAttrs.src.name}/ImageLounge"; @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_QUAZIP" true) ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,lib} mv $out/nomacs.app $out/Applications/nomacs.app mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib diff --git a/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix b/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix index e862247b0d..a93db6de02 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix @@ -17,7 +17,7 @@ let leptonica tesseract4 libnotify - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wl-clipboard ]; @@ -73,21 +73,21 @@ ps.buildPythonApplication rec { ps.pytestCheckHook ps.pytest-qt ps.toml - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ps.pytest-xvfb xorg.xvfb ]; preCheck = '' export HOME=$(mktemp -d) - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # setup a virtual x11 display export DISPLAY=:$((2000 + $RANDOM % 1000)) Xvfb $DISPLAY -screen 5 1024x768x8 & xvfb_pid=$! ''; - postCheck = lib.optionalString stdenv.isLinux '' + postCheck = lib.optionalString stdenv.hostPlatform.isLinux '' # cleanup the virtual x11 display sleep 0.5 kill $xvfb_pid @@ -106,7 +106,7 @@ ps.buildPythonApplication rec { "test_synchronized_capture" # flaky "test_normcap_ocr_testcases" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires impure pbcopy "test_get_copy_func_with_pbcopy" "test_get_copy_func_without_pbcopy" @@ -128,7 +128,7 @@ ps.buildPythonApplication rec { # RuntimeError("Internal C++ object (PySide6.QtGui.QHideEvent) already deleted.") # AttributeError("'LoadingIndicator' object has no attribute 'timer'") "tests/tests_gui/test_loading_indicator.py" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires a display "tests/integration/test_normcap.py" "tests/integration/test_tray_menu.py" @@ -142,6 +142,6 @@ ps.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ cafkafk pbsds ]; mainProgram = "normcap"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix index e3d1890665..d3d3d4c4f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix @@ -4,26 +4,29 @@ fetchurl, jdk21, stdenv, - _7zz + _7zz, }: let pname = "nosql-workbench"; - version = "3.11.0"; + version = "3.13.0"; - src = fetchurl { - x86_64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; - }; - aarch64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; - hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; - }; - x86_64-linux = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; - hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + x86_64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; + hash = "sha256-Dof1F1LTD478wh7jTR5zwFmbrvyCOWVO/C1QXTebi3c="; + }; + aarch64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; + hash = "sha256-QD0F6onP3GhMRIzNifx/RZkxPIS/GMtnF4zro5ygucg="; + }; + x86_64-linux = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; + hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); meta = { description = "Visual tool that provides data modeling, data visualization, and query development features to help you design, create, query, and manage DynamoDB tables"; @@ -31,49 +34,67 @@ let changelog = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkbenchDocumentHistory.html"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ DataHearth ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation { - inherit pname version src meta; +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - # DMG file is using APFS which is unsupported by "undmg". - # Instead, use "7zz" to extract the contents. - # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 - nativeBuildInputs = [ _7zz ]; + # DMG file is using APFS which is unsupported by "undmg". + # Instead, use "7zz" to extract the contents. + # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 + nativeBuildInputs = [ _7zz ]; - buildInputs = [ jdk21 ]; + buildInputs = [ jdk21 ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv NoSQL\ Workbench.app $out/Applications/ + mkdir -p "$out/Applications" + mv NoSQL\ Workbench.app $out/Applications/ - runHook postInstall - ''; + runHook postInstall + ''; -} else appimageTools.wrapType2 { - inherit pname version src meta; + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; - extraPkgs = pkgs: [ - # Required to run DynamoDB locally - pkgs.jdk21 - ]; + extraPkgs = pkgs: [ + # Required to run DynamoDB locally + pkgs.jdk21 + ]; - extraInstallCommands = let - appimageContents = appimageTools.extract { - inherit pname version src; - }; - in '' - # Install XDG Desktop file and its icon - install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps + extraInstallCommands = + let + appimageContents = appimageTools.extract { inherit pname version src; }; + internal_filename = "@amznnosql-workbench"; + in + '' + # Install XDG Desktop file and its icon + install -Dm444 ${appimageContents}/${internal_filename}.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/${internal_filename}.png -t $out/share/pixmaps - # Replace wrong exec statement in XDG Desktop file - substituteInPlace $out/share/applications/nosql-workbench.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' - ''; -} + # Replace wrong exec statement in XDG Desktop file + substituteInPlace $out/share/applications/${internal_filename}.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' + ''; + } diff --git a/third_party/nixpkgs/pkgs/by-name/no/nostui/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nostui/package.nix index 6fbd71ac2d..9c4f320048 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/nostui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/nostui/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo="; }; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk; [ frameworks.SystemConfiguration ] ); diff --git a/third_party/nixpkgs/pkgs/by-name/no/notes/package.nix b/third_party/nixpkgs/pkgs/by-name/no/notes/package.nix index c9ca49ffe7..83af624af2 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/notes/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/notes/package.nix @@ -8,7 +8,7 @@ overrideSDK, }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "notes"; @@ -34,11 +34,11 @@ stdenv'.mkDerivation (finalAttrs: { qt6.qtbase qt6.qtdeclarative ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/Notes.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix b/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix index 101783ee60..f33aa1b03a 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.5.1"; + version = "2.5.2"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-DgeDAPE5IkZtzi+Xq2BpGfpgTRonzNjaa1NTcwnqdNo="; + hash = "sha256-xRSq6lBZ6jHtNve027uF2uNs3/40s0YdFN9F9O7m5VU="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { export QT_QPA_PLATFORM_PLUGIN_PATH=${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins/platforms ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/{icons,applications,pixmaps,mime/packages} cp -r setup/data/hicolor $out/share/icons @@ -68,6 +68,6 @@ python3.pkgs.buildPythonApplication { mainProgram = "novelwriter"; platforms = with lib.platforms; unix ++ windows; - broken = stdenv.isDarwin; # TODO awaiting build instructions for Darwin + broken = stdenv.hostPlatform.isDarwin; # TODO awaiting build instructions for Darwin }; } diff --git a/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix b/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix index a254f73417..44edb7f329 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl # required for openssl-sys - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/package.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/package.nix index 9cafd07b5c..b72c55b557 100644 --- a/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (source) version; src = fetchurl { - url = "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz"; + url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz"; inherit (platform) hash; }; diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/source.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/source.nix index f768ac96bb..6d48b72741 100644 --- a/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/source.nix +++ b/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/source.nix @@ -1,15 +1,15 @@ { - version = "7.11.1"; + version = "7.13.0"; x86_64-linux = { name = "x86_64-unknown-linux-gnu"; - hash = "sha256-faF/iA07wWiAuxeqEZciIYlnoWe4LKCtDxD0BwIyeYw="; + hash = "sha256-R3OF/340xEab+0zamfwvejY16fjy/3TrzMvQaBlVxHw="; }; x86_64-darwin = { name = "x86_64-apple-darwin"; - hash = "sha256-EImYXMIvxPgzaGuAOWi4O6mG5S1awdGSX0HQgT1iHaI="; + hash = "sha256-cnZkVkTbQ/+ciITPEx2vxxZchCC54T0JOApB4HKp8e0="; }; aarch64-darwin = { name = "aarch64-apple-darwin"; - hash = "sha256-jgigeJRHH/c761wYGMHhtRHE59ms7obZPxiH5pKeoeQ="; + hash = "sha256-5VxDQ25tW+qTXHwkltpaAm4AnQvA18qGMaflYQzE2pQ="; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/update.sh b/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/update.sh index bd3bbadbfd..a7efb9d49a 100755 --- a/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/nr/nrfutil/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq nix nix-prefetch-github xq-xml +#!nix-shell -i bash -p jq nix nix-prefetch-github nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" @@ -17,12 +17,11 @@ architectures["x86_64-linux"]="x86_64-unknown-linux-gnu" architectures["x86_64-darwin"]="x86_64-apple-darwin" architectures["aarch64-darwin"]="aarch64-apple-darwin" -binary_list=$(curl "https://developer.nordicsemi.com/.pc-tools/nrfutil/" | xq -q "#files" | grep -o -E 'nrfutil-(x86_64|aarch64)-.*?.gz' | cut -d' ' -f 1) +BASE_URL="https://files.nordicsemi.com/artifactory/swtools/external/nrfutil" for a in ${!architectures[@]}; do - versions["$a"]=$(echo "$binary_list" | grep "${architectures[${a}]}" | sed -r "s/nrfutil-${architectures[${a}]}-(.*?).tar.gz/\\1/" | tail -n 1) - echo "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz" - hashes["$a"]=$(narhash "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz") + versions["$a"]=$(curl "$BASE_URL/index/${architectures[${a}]}/index.json" | jq -r '.packages.nrfutil.latest_version') + hashes["$a"]=$(narhash "$BASE_URL/packages/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz") done { diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix index 0cf4c2bb0b..0c7aa77aca 100644 --- a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-F2JlUErplSRQwSAEavQPNDMcXYc2waeYwjGuzmZq8sc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.IOKit diff --git a/third_party/nixpkgs/pkgs/by-name/ns/nsxiv/package.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsxiv/package.nix index ba267571a9..b54c8ce55f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ns/nsxiv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ns/nsxiv/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { libXft libexif libwebp - ] ++ lib.optional stdenv.isDarwin libinotify-kqueue; + ] ++ lib.optional stdenv.hostPlatform.isDarwin libinotify-kqueue; postPatch = lib.optionalString (conf != null) '' cp ${(builtins.toFile "config.def.h" conf)} config.def.h ''; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-linotify"; makeFlags = [ "CC:=$(CC)" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/nt/ntpd-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntpd-rs/package.nix index 9bd6934cd5..df3089013d 100644 --- a/third_party/nixpkgs/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nt/ntpd-rs/package.nix @@ -14,18 +14,20 @@ rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; - rev = "v${version}"; - hash = "sha256-Yf1cPv4SpmbL3o9uf3fJ/n0/ZW0wdhW/bbe2hRxDdyY="; + rev = "refs/tags/v${version}"; + hash = "sha256-0fbl50kugqYHeS+9a/kCkwy1wPDqDCYwPIGZ37NFa/Y="; }; - cargoHash = "sha256-H3pK/MSv7/YDEtnW2mi2xt5x2t3ugCc4IN43wohM4Ig="; + cargoHash = "sha256-9HLbGC6j0Wq/lG//CeEAfnYzlGG14CnDpmluL1moHWQ="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ]; nativeBuildInputs = [ pandoc installShellFiles @@ -60,7 +62,7 @@ rustPlatform.buildRustPackage rec { passthru = { tests = { - nixos = lib.optionalAttrs stdenv.isLinux nixosTests.ntpd-rs; + nixos = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.ntpd-rs; version = testers.testVersion { package = ntpd-rs; inherit version; @@ -74,7 +76,6 @@ rustPlatform.buildRustPackage rec { description = "Full-featured implementation of the Network Time Protocol"; homepage = "https://tweedegolf.nl/en/pendulum"; changelog = "https://github.com/pendulum-project/ntpd-rs/blob/v${version}/CHANGELOG.md"; - mainProgram = "ntp-ctl"; license = with lib.licenses; [ mit # or asl20 @@ -83,7 +84,8 @@ rustPlatform.buildRustPackage rec { fpletz getchoo ]; + mainProgram = "ntp-ctl"; # note: Undefined symbols for architecture x86_64: "_ntp_adjtime" - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nu/nulloy/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/nulloy/package.nix index 8e82b6ae06..203ddf84c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/nulloy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nu/nulloy/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { mainProgram = "nulloy"; maintainers = with maintainers; [ aleksana ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix index 829b1bf8a4..ce3c954b88 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-t6vxJ0UIQJILCGv4PO5V4/QF5de/wtMQDkb8gPtE70E="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/nv/nvidia-texture-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvidia-texture-tools/package.nix index 3f2bd5ad36..13f285bc66 100644 --- a/third_party/nixpkgs/pkgs/by-name/nv/nvidia-texture-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nv/nvidia-texture-tools/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { # Make a recently added pure virtual function just virtual, # to keep compatibility. sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # remove x86_64-only libraries sed -i '/bc1enc/d' src/nvtt/tests/CMakeLists.txt sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix index aee0747973..c5ba0f1e39 100644 --- a/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,16 +12,16 @@ let pname = "nwg-drawer"; - version = "0.4.9"; + version = "0.5.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-KhgALKJNS7Y+u5pAfpvTup0W1+Vi6r1uaVFQZRiv4Dk="; + hash = "sha256-0ksvat0NDC2P+T0TyDAKh7YNLYhH+znxqLCqQ/5GDj8="; }; - vendorHash = "sha256-J7r3YyfV5lRZbjKo7ZNHQrOqR1GNbUB7GxRMlXuuw/c="; + vendorHash = "sha256-KULOXphc6GWIGP79C9sgfAIRMoqwcjaVp4jVyF6of/E="; in buildGoModule { inherit pname version src vendorHash; diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix index 359d57cda5..bcd112b55c 100644 --- a/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.38"; + version = "0.9.39"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-5vq/5QovvoDUDu9IiAeI9c06g0iy9YLi7CdpEhXbLqI="; + hash = "sha256-uXhhtE91BqYdTQjavOU5p0JoprFZTGCcxQr66iJixu4="; }; # No tests diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index e0d721fd35..6acad5ed2c 100644 --- a/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -6,7 +6,7 @@ }: let - bits = if stdenv.is64bit then "x64" else "ia32"; + bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; version = "0.91.0"; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/by-name/oa/oauth2l/package.nix b/third_party/nixpkgs/pkgs/by-name/oa/oauth2l/package.nix index 612575d2b2..c6d7070486 100644 --- a/third_party/nixpkgs/pkgs/by-name/oa/oauth2l/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oa/oauth2l/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { preCheck = "export HOME=$(mktemp -d)"; # tests fail on linux for some reason - doCheck = stdenv.isDarwin; + doCheck = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Simple CLI for interacting with Google API authentication"; diff --git a/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix index a0b8a62ed4..e853e40b35 100644 --- a/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix @@ -18,9 +18,9 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); os = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "Unsupported OS"; diff --git a/third_party/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix index 7e5782cba0..d3f77414e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -32,7 +32,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-aFzBrUsVttUhpYGEYd/yYuXmE90PGCiBmBsVjtHcHLg="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; buildInputs = with perlPackages; [ perl @@ -48,9 +48,9 @@ perlPackages.buildPerlPackage rec { ProcDaemon ProcPIDFile XMLSimple - ] ++ lib.optionals stdenv.isLinux (with perlPackages; [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (with perlPackages; [ NetCUPS # cups-filters is broken on darwin - ]) ++ lib.optionals stdenv.isDarwin (with perlPackages; [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin (with perlPackages; [ MacSysProfile ]); @@ -62,14 +62,14 @@ perlPackages.buildPerlPackage rec { ipmitool # ipmitool nmap # nmap pciutils # lspci - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dmidecode # dmidecode iproute2 # ip lvm2 # pvs usbutils # lsusb util-linux # last, lsblk, mount ]; - in lib.optionalString stdenv.isDarwin '' + in lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/ocsinventory-agent '' + '' wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies} diff --git a/third_party/nixpkgs/pkgs/by-name/oc/octoscan/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/octoscan/package.nix index c3a6e4d50b..01e7fd7d27 100644 --- a/third_party/nixpkgs/pkgs/by-name/oc/octoscan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oc/octoscan/package.nix @@ -6,14 +6,13 @@ buildGoModule rec { pname = "octoscan"; - version = "0-unstable-2024-08-25"; + version = "0.1.0"; src = fetchFromGitHub { owner = "synacktiv"; repo = "octoscan"; - # https://github.com/synacktiv/octoscan/issues/7 - rev = "69f0761fe4d31f7fe4050fde5fd807364155fde4"; - hash = "sha256-2aCjqjBDXqGbu94o22JRpJ5nUv8U46JGRcrBJCINflQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-TUQz5/ktOUP7h9uDBUbluh5yM4Msqj6mJmUOexR765o="; }; vendorHash = "sha256-9IT8qTFzn8otWGTBP7ODcT8iBckIJ/3+jkbF1dq6aDw="; @@ -26,6 +25,7 @@ buildGoModule rec { meta = { description = "Static vulnerability scanner for GitHub action workflows"; homepage = "https://github.com/synacktiv/octoscan"; + changelog = "https://github.com/synacktiv/octoscan/releases/tag/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "octoscan"; diff --git a/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix b/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix index 305b9d329d..4a14bfa443 100644 --- a/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/od/odin/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; postPatch = - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/linker.cpp \ --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} '' @@ -46,7 +46,7 @@ stdenv.mkDerivation { which ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/og/oguri/package.nix b/third_party/nixpkgs/pkgs/by-name/og/oguri/package.nix index 9156e6df39..b7cc17014e 100644 --- a/third_party/nixpkgs/pkgs/by-name/og/oguri/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/og/oguri/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; - broken = stdenv.isDarwin; # this should be enfoced by wayland platforms in the future + broken = stdenv.hostPlatform.isDarwin; # this should be enfoced by wayland platforms in the future }; } diff --git a/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix index 6fd8adbb3d..bfcc2accc9 100644 --- a/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oi/oidc-agent/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, curl -, webkitgtk -, libmicrohttpd -, libsecret -, qrencode -, libsodium -, pkg-config -, help2man -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + curl, + webkitgtk, + libmicrohttpd, + libsecret, + qrencode, + libsodium, + pkg-config, + help2man, + nix-update-script, }: stdenv.mkDerivation rec { pname = "oidc-agent"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "indigo-dc"; repo = pname; rev = "v${version}"; - hash = "sha256-SjpCD/x93kYB5759e/D0btLO48d6g4SkEUAX7PYfm2w="; + hash = "sha256-OW0hCDVC+AqmXP1dQK/7lnXeG8RbXzFLbKLEvc/8spY="; }; nativeBuildInputs = [ @@ -39,14 +40,23 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" "BIN_PATH=$(out)" "LIB_PATH=$(out)/lib" ]; + makeFlags = [ + "PREFIX=$(out)" + "BIN_PATH=$(out)" + "PROMPT_BIN_PATH=$(out)" + "LIB_PATH=$(out)/lib" + ]; - installTargets = [ "install_bin" "install_lib" "install_conf" ]; + installTargets = [ + "install_bin" + "install_lib" + "install_conf" + ]; postFixup = '' # Override with patched binary to be used by help2man cp -r $out/bin/* bin - make install_man PREFIX=$out + make install_man PREFIX=$out MAN_PATH=$out/share/man PROMPT_MAN_PATH=$out/share/man ''; passthru.updateScript = nix-update-script { }; @@ -58,4 +68,3 @@ stdenv.mkDerivation rec { license = licenses.mit; }; } - diff --git a/third_party/nixpkgs/pkgs/by-name/ol/ollama/disable-git.patch b/third_party/nixpkgs/pkgs/by-name/ol/ollama/disable-git.patch index 5f9b4b3323..5248905302 100644 --- a/third_party/nixpkgs/pkgs/by-name/ol/ollama/disable-git.patch +++ b/third_party/nixpkgs/pkgs/by-name/ol/ollama/disable-git.patch @@ -1,15 +1,17 @@ +diff --git a/llm/generate/gen_common.sh b/llm/generate/gen_common.sh +index 3825c155..d22eccd2 100644 --- a/llm/generate/gen_common.sh +++ b/llm/generate/gen_common.sh -@@ -65,6 +65,8 @@ - echo 'add_subdirectory(../ext_server ext_server) # ollama' >>${LLAMACPP_DIR}/CMakeLists.txt - fi +@@ -69,6 +69,8 @@ git_module_setup() { + } + apply_patches() { + return + - if [ -n "$(ls -A ../patches/*.diff)" ]; then - # apply temporary patches until fix is upstream - for patch in ../patches/*.diff; do -@@ -110,6 +112,8 @@ + # apply temporary patches until fix is upstream + for patch in ../patches/*.patch; do + git -c 'user.name=nobody' -c 'user.email=<>' -C ${LLAMACPP_DIR} am ${patch} +@@ -133,6 +135,8 @@ install() { # Keep the local tree clean after we're done with the build cleanup() { diff --git a/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix b/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix index d11e06833e..ababb3f68a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix @@ -8,6 +8,7 @@ makeWrapper, stdenv, addDriverRunpath, + nix-update-script, cmake, gcc12, @@ -39,13 +40,13 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-iNjqnhiM0L873BiBPAgI2Y0KEQyCInn2nEihzwLasFU="; + hash = "sha256-YYrNrlXL6ytLfnrvSHybi0va0lvgVNuIRP+IFE5XZX8="; fetchSubmodules = true; }; @@ -61,8 +62,8 @@ let rocmRequested = shouldEnable "rocm" config.rocmSupport; cudaRequested = shouldEnable "cuda" config.cudaSupport; - enableRocm = rocmRequested && stdenv.isLinux; - enableCuda = cudaRequested && stdenv.isLinux; + enableRocm = rocmRequested && stdenv.hostPlatform.isLinux; + enableCuda = cudaRequested && stdenv.hostPlatform.isLinux; rocmLibs = [ rocmPackages.clr @@ -143,12 +144,12 @@ goBuild { makeWrapper autoAddDriverRunpath ] - ++ lib.optionals stdenv.isDarwin metalFrameworks; + ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; buildInputs = lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) ++ lib.optionals enableCuda cudaLibs - ++ lib.optionals stdenv.isDarwin metalFrameworks; + ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; patches = [ # disable uses of `git` in the `go generate` script @@ -156,6 +157,9 @@ goBuild { # this also disables necessary patches contained in `ollama/llm/patches/` # those patches are applied in `postPatch` ./disable-git.patch + + # we provide our own deps at runtime + ./skip-rocm-cp.patch ]; postPatch = '' @@ -199,20 +203,24 @@ goBuild { "-X=github.com/ollama/ollama/server.mode=release" ]; - passthru.tests = - { - inherit ollama; - version = testers.testVersion { - inherit version; - package = ollama; + passthru = { + tests = + { + inherit ollama; + version = testers.testVersion { + inherit version; + package = ollama; + }; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit ollama-rocm ollama-cuda; + service = nixosTests.ollama; + service-cuda = nixosTests.ollama-cuda; + service-rocm = nixosTests.ollama-rocm; }; - } - // lib.optionalAttrs stdenv.isLinux { - inherit ollama-rocm ollama-cuda; - service = nixosTests.ollama; - service-cuda = nixosTests.ollama-cuda; - service-rocm = nixosTests.ollama-rocm; - }; + + updateScript = nix-update-script { }; + }; meta = { description = diff --git a/third_party/nixpkgs/pkgs/by-name/ol/ollama/skip-rocm-cp.patch b/third_party/nixpkgs/pkgs/by-name/ol/ollama/skip-rocm-cp.patch new file mode 100644 index 0000000000..672b3f24b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ol/ollama/skip-rocm-cp.patch @@ -0,0 +1,14 @@ +diff --git a/llm/generate/gen_linux.sh b/llm/generate/gen_linux.sh +index 48d08fd0..e50f7b36 100755 +--- a/llm/generate/gen_linux.sh ++++ b/llm/generate/gen_linux.sh +@@ -284,9 +284,6 @@ if [ -z "${OLLAMA_SKIP_ROCM_GENERATE}" -a -d "${ROCM_PATH}" ]; then + mkdir -p "${ROCM_DIST_DIR}" + for dep in $(ldd "${BUILD_DIR}/bin/ollama_llama_server" | grep "=>" | cut -f2 -d= | cut -f2 -d' ' | grep -v "${GOARCH}/rocm${ROCM_VARIANT}" | grep -e rocm -e amdgpu -e libtinfo -e libnuma -e libelf ); do + cp -a "${dep}"* "${ROCM_DIST_DIR}" +- if [ $(readlink -f "${dep}") != "${dep}" ] ; then +- cp $(readlink -f "${dep}") "${ROCM_DIST_DIR}" +- fi + done + install + dist diff --git a/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix similarity index 86% rename from third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/package.nix rename to third_party/nixpkgs/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index fdab6d29f6..0670385f2c 100644 --- a/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -1,39 +1,40 @@ -{ stdenv -, lib -, fetchurl -, buildFHSEnv +{ + stdenv, + lib, + fetchurl, + buildFHSEnv, # Alphabetic ordering below -, alsa-lib -, at-spi2-atk -, atk -, autoPatchelfHook -, cairo -, curl -, dbus -, dconf -, dpkg -, fontconfig -, gcc-unwrapped -, gdk-pixbuf -, glib -, glibc -, gsettings-desktop-schemas -, gst_all_1 -, gtk2 -, gtk3 -, libpulseaudio -, libudev0-shim -, libdrm -, makeWrapper -, mesa -, noto-fonts-cjk-sans -, nspr -, nss -, pulseaudio -, qt5 -, wrapGAppsHook3 -, xkeyboard_config -, xorg + alsa-lib, + at-spi2-atk, + atk, + autoPatchelfHook, + cairo, + curl, + dbus, + dconf, + dpkg, + fontconfig, + gcc-unwrapped, + gdk-pixbuf, + glib, + glibc, + gsettings-desktop-schemas, + gst_all_1, + gtk2, + gtk3, + libpulseaudio, + libudev0-shim, + libdrm, + makeWrapper, + mesa, + noto-fonts-cjk-sans, + nspr, + nss, + pulseaudio, + qt5, + wrapGAppsHook3, + xkeyboard_config, + xorg, }: let @@ -65,11 +66,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "8.1.0"; + version = "8.1.1"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - hash = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; + hash = "sha256-RwWIYcbYljDqWRJcXCDODjVeYnp9xreNGO2l2aqWJ9w="; }; nativeBuildInputs = [ @@ -184,15 +185,17 @@ buildFHSEnv { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; - mainProgram = "onlyoffice-desktopeditors"; homepage = "https://www.onlyoffice.com/"; downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ nh2 gtrunsec ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + nh2 + gtrunsec + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/update.sh b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-desktopeditors/update.sh similarity index 100% rename from third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/update.sh rename to third_party/nixpkgs/pkgs/by-name/on/onlyoffice-desktopeditors/update.sh diff --git a/third_party/nixpkgs/pkgs/by-name/on/onscripter-en/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onscripter-en/package.nix index 74b440b427..64c7cd931f 100644 --- a/third_party/nixpkgs/pkgs/by-name/on/onscripter-en/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/on/onscripter-en/package.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "onscripter-en"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/on/onthespot/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onthespot/package.nix index 696a7e51f7..ebda24f086 100644 --- a/third_party/nixpkgs/pkgs/by-name/on/onthespot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/on/onthespot/package.nix @@ -1,16 +1,17 @@ -{ lib -, copyDesktopItems -, fetchFromGitHub -, makeDesktopItem -, python3 -, libsForQt5 -, ffmpeg +{ + lib, + copyDesktopItems, + fetchFromGitHub, + makeDesktopItem, + python3, + libsForQt5, + ffmpeg, }: python3.pkgs.buildPythonApplication rec { pname = "onthespot"; version = "0.5"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "casualsnek"; @@ -19,12 +20,23 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg="; }; + pythonRemoveDeps = [ + "PyQt5-Qt5" + "PyQt5-stubs" + # Doesn't seem to be used in the sources and causes + # build issues + "PyOgg" + ]; + + pythonRelaxDeps = true; + nativeBuildInputs = with python3.pkgs; [ copyDesktopItems libsForQt5.wrapQtAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ + async-timeout charset-normalizer defusedxml ffmpeg @@ -43,16 +55,6 @@ python3.pkgs.buildPythonApplication rec { zeroconf ]; - pythonRemoveDeps = [ - "PyQt5-Qt5" - "PyQt5-stubs" - # Doesn't seem to be used in the sources and causes - # build issues - "PyOgg" - ]; - - pythonRelaxDeps = true; - postInstall = '' install -Dm444 $src/src/onthespot/resources/icon.png $out/share/icons/hicolor/256x256/apps/onthespot.png ''; @@ -72,13 +74,13 @@ python3.pkgs.buildPythonApplication rec { }) ]; - meta = with lib; { + meta = { description = "QT based Spotify music downloader written in Python"; homepage = "https://github.com/casualsnek/onthespot"; changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ onny ]; + platforms = lib.platforms.linux; mainProgram = "onthespot_gui"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix index 33d4e47c76..1028cfb682 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreBluetooth darwin.apple_sdk.frameworks.CoreGraphics diff --git a/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix index 4669146115..dc209b312f 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.21"; + version = "0.3.30"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "refs/tags/v${version}"; - hash = "sha256-b+r+nEv+9IM56KkCi9tZqnEbyCX69mFhp0Be5/9lR9c="; + hash = "sha256-zGgCISGpna9L8Eqze0WWagIx26DwhLpeOLCVslpcJ08="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-LH07LzYZpVzRAvkjoTgt7LJdXZZoDMt//ZAl30z7AHw="; + npmDepsHash = "sha256-508AjFAzQvWPkn+kMv/YQUeG0jikZJJxNkFqfkKi9Ks="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -76,8 +76,10 @@ python3.pkgs.buildPythonApplication rec { black boto3 chromadb + colbert-ai docx2txt duckduckgo-search + einops extract-msg fake-useragent fastapi @@ -103,6 +105,7 @@ python3.pkgs.buildPythonApplication rec { psycopg2 pydub pyjwt + pymilvus pymongo pymysql pypandoc diff --git a/third_party/nixpkgs/pkgs/by-name/op/openapi-python-client/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openapi-python-client/package.nix new file mode 100644 index 0000000000..a4445a6a56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openapi-python-client/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + darwin, + python3Packages, + fetchFromGitHub, + installShellFiles, + ruff, + testers, + openapi-python-client, +}: + +python3Packages.buildPythonApplication rec { + pname = "openapi-python-client"; + version = "0.21.5"; + pyproject = true; + + src = fetchFromGitHub { + inherit version; + owner = "openapi-generators"; + repo = "openapi-python-client"; + rev = "refs/tags/v${version}"; + hash = "sha256-/m/XXNqsr0FjYSEGMSw4zIUpWJDOqu9BzNuJKyb7fKY="; + }; + + nativeBuildInputs = + [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.ps + ]; + + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = + (with python3Packages; [ + attrs + httpx + jinja2 + pydantic + python-dateutil + ruamel-yaml + shellingham + typer + typing-extensions + ]) + ++ [ ruff ]; + + # ruff is not packaged as a python module in nixpkgs + pythonRemoveDeps = [ "ruff" ]; + + postInstall = '' + # see: https://github.com/fastapi/typer/blob/5889cf82f4ed925f92e6b0750bf1b1ed9ee672f3/typer/completion.py#L54 + # otherwise shellingham throws exception on darwin + export _TYPER_COMPLETE_TEST_DISABLE_SHELL_DETECTION=1 + installShellCompletion --cmd openapi-python-client \ + --bash <($out/bin/openapi-python-client --show-completion bash) \ + --fish <($out/bin/openapi-python-client --show-completion fish) \ + --zsh <($out/bin/openapi-python-client --show-completion zsh) + ''; + + passthru = { + tests.version = testers.testVersion { + package = openapi-python-client; + }; + }; + + meta = { + description = "Generate modern Python clients from OpenAPI"; + homepage = "https://github.com/openapi-generators/openapi-python-client"; + changelog = "https://github.com/openapi-generators/openapi-python-client/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "openapi-python-client"; + maintainers = with lib.maintainers; [ konradmalik ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix index 169e4469ab..4d38054385 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { "MAN1DIR=$(man)/share/man//man1" ]; - makefile = if stdenv.isDarwin then "Makefile.macosx" else "Makefile.linux"; + makefile = if stdenv.hostPlatform.isDarwin then "Makefile.macosx" else "Makefile.linux"; preInstall = "mkdir -p $bin/bin $dev/include $out/lib $man/share/man/man1"; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix index 2c97f9849b..0fc5da79bf 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.6.0"; + version = "1.6.1"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-Y0ffBbNQFPGoLq2B9HtImU1tH0JqhvPYgftNCUQtcJo="; + hash = "sha256-NdMv81XUHawey/xO7UUsTpbBF/4F77N7VtyYCKZjjkU="; }; - vendorHash = "sha256-+awhoYHstxLarPRDIzETAx0wR8TqoyDz3iFSQxH2vG4="; + vendorHash = "sha256-4f681Qq6cAAQpla+xcvDXCYwa0ZBqsYSWWDyq5jbdd0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix index a0025a29db..23b1b7e1d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { eigen ]; - cmakeFlakes = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - ]; - meta = { description = "Collection of computer vision methods for solving geometric vision problems"; homepage = "https://github.com/laurentkneip/opengv"; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openmsx/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openmsx/package.nix index c05b882b96..0680d48ebe 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openmsx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openmsx/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmsx"; - version = "19.1"; + version = "20_0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - hash = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; + hash = "sha256-iY+oZ7fHZnnEGunM4kOxOGH2Biqj2PfdLhbT8J4mYrA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openorienteering-mapper/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openorienteering-mapper/package.nix index 037364ed62..5d9fb8e256 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openorienteering-mapper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openorienteering-mapper/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { # See https://github.com/NixOS/nixpkgs/issues/85306 (lib.cmakeBool "LICENSING_PROVIDER" false) (lib.cmakeBool "Mapper_MANUAL_QTHELP" false) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FindGDAL is broken and always finds /Library/Framework unless this is # specified (lib.cmakeFeature "GDAL_INCLUDE_DIR" "${gdal}/include") diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix index 76e61b6658..db0ba62beb 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { "-DTBB_ROOT=${tbb.out}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isAarch64 && !stdenv.isDarwin) "-flax-vector-conversions"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin) "-flax-vector-conversions"; meta = { description = "Intel Open Path Guiding Library"; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgp-ca/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgp-ca/package.nix index e97087ccf5..e2397c5413 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgp-ca/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgp-ca/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { sqlite pcsclite nettle - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ PCSC Security SystemConfiguration ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ PCSC Security SystemConfiguration ]); # Most tests rely on gnupg being able to write to /run/user # gnupg refuses to respect the XDG_RUNTIME_DIR variable, so we skip the tests diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix index 00a4be3e9e..03d8282044 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ pcsclite ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.PCSC darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix index a720fafe20..8a96876d65 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix @@ -28,6 +28,7 @@ , libsForQt5 , libspnav , libzip +, manifold , mesa , mpfr , python3 @@ -36,61 +37,23 @@ , wayland-protocols , wrapGAppsHook3 , xorg +, mimalloc +, opencsg }: -let - # get cccl from source to avoid license issues - nvidia-cccl = clangStdenv.mkDerivation { - pname = "nvidia-cccl"; - # note, after v2.2.0, manifold dependency fails with some swap() ambiguities - version = "2.2.0"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "cccl"; - fetchSubmodules = true; - rev = "v2.2.0"; - hash = "sha256-azHDAuK0rAHrH+XkN3gHDrbwZOclP3zbEMe8VRpMjDQ="; - }; - patches = [ ./thrust-cmake.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ tbb_2021_11 ]; - cmakeFlags = [ - # only enable what we need - "-DCCCL_ENABLE_CUB=OFF" - "-DCCCL_ENABLE_LIBCUDACXX=ON" - "-DCCCL_ENABLE_THRUST=ON" - "-DCCCL_ENABLE_TESTING=OFF" - "-DCCCL_ENABLE_EXAMPLES=OFF" - - "-DTHRUST_DEVICE_SYSTEM=TBB" - "-DTHRUST_HOST_SYSTEM=CPP" - "-DTHRUST_ENABLE_HEADER_TESTING=OFF" - "-DTHRUST_ENABLE_TESTING=OFF" - "-DTHRUST_ENABLE_EXAMPLES=OFF" - - "-DLIBCUDACXX_ENABLE_CUDA=OFF" - "-DLIBCUDACXX_ENABLE_STATIC_LIBRARY=OFF" - "-DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=OFF" - ]; - meta = with lib; { - description = "CUDA C++ Core Libraries"; - homepage = "https://github.com/NVIDIA/cccl"; - license = licenses.asl20; - platforms = platforms.unix; - }; - }; -in # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-08-17"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "a16ca2a670840cfecb76254967380385d4d573cb"; - hash = "sha256-YadbrYaxxdVNejasFW0MbcYwjwTHHQbVjqen9PKEsYQ="; - fetchSubmodules = true; + rev = "1cf4e97ed488d606c823f107dcc361f218aa84ca"; + hash = "sha256-5WzLAQnjH+4JjJhh9pCgY3j8+lyNPrtY9a104tzkglo="; + fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD }; + patches = [ ./test.diff ]; + nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ numpy pillow ])) bison @@ -103,12 +66,10 @@ clangStdenv.mkDerivation rec { pkg-config ]; buildInputs = with libsForQt5; with qt5; [ - # manifold dependencies clipper2 glm tbb_2021_11 - nvidia-cccl - + mimalloc boost cairo cgal_5 @@ -119,17 +80,19 @@ clangStdenv.mkDerivation rec { ghostscript glib gmp + opencsg harfbuzz hidapi lib3mf libspnav libzip + manifold mpfr qscintilla qtbase qtmultimedia ] - ++ lib.optionals clangStdenv.isLinux [ + ++ lib.optionals clangStdenv.hostPlatform.isLinux [ xorg.libXdmcp libICE libSM @@ -138,12 +101,13 @@ clangStdenv.mkDerivation rec { qtwayland libGLU ] - ++ lib.optional clangStdenv.isDarwin qtmacextras + ++ lib.optional clangStdenv.hostPlatform.isDarwin qtmacextras ; cmakeFlags = [ "-DEXPERIMENTAL=ON" # enable experimental options "-DSNAPSHOT=ON" # nightly icons - "-DUSE_BUILTIN_OPENCSG=ON" # bundled latest opencsg + "-DUSE_BUILTIN_OPENCSG=OFF" + "-DUSE_BUILTIN_MANIFOLD=OFF" "-DOPENSCAD_VERSION=\"${builtins.replaceStrings ["-"] ["."] version}\"" "-DCMAKE_UNITY_BUILD=ON" # faster build # IPO @@ -180,6 +144,5 @@ clangStdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pca006132 raskin ]; mainProgram = "openscad"; - broken = true; # https://github.com/NixOS/nixpkgs/issues/341043 }; } diff --git a/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix index e8f799f765..47f4d7b731 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-Disable-tests-requiring-network-access.patch - ] ++ lib.optional stdenv.isDarwin ./0002-Disable-segfaulting-test-on-Darwin.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Disable-segfaulting-test-on-Darwin.patch; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix index 58ca6a4139..5d62a61c2e 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.psutil python3Packages.python ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvr/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openvr/package.nix index 7d309065df..ed17bb7c89 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openvr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openvr/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ jsoncpp libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting"; homepage = "https://github.com/ValveSoftware/openvr"; license = lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/by-name/op/ophcrack/package.nix b/third_party/nixpkgs/pkgs/by-name/op/ophcrack/package.nix index 13709ad997..bee8b7dd76 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/ophcrack/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/ophcrack/package.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; buildInputs = [ openssl ] - ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) ++ lib.optional stdenv.isDarwin expat; + ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) + ++ lib.optional stdenv.hostPlatform.isDarwin expat; configureFlags = [ "--with-libssl" ] @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { [ "--disable-gui" ] ); - installPhase = lib.optional stdenv.isDarwin '' + installPhase = lib.optional stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin cp -R src/ophcrack $out/bin ''; diff --git a/third_party/nixpkgs/pkgs/by-name/or/orbiton/package.nix b/third_party/nixpkgs/pkgs/by-name/or/orbiton/package.nix index f8fbc3484e..6e9cee2539 100644 --- a/third_party/nixpkgs/pkgs/by-name/or/orbiton/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/or/orbiton/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorHash = null; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "-Wl,--as-needed" "" diff --git a/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix b/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix index 2d13cc585a..cc5257d618 100644 --- a/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/or/ord/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/os/osgqt/package.nix b/third_party/nixpkgs/pkgs/by-name/os/osgqt/package.nix new file mode 100644 index 0000000000..12e88648ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/os/osgqt/package.nix @@ -0,0 +1,49 @@ +{ + cmake, + fetchFromGitHub, + lib, + libsForQt5, + openscenegraph, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "osgQt"; + version = "3.5.7"; + + src = fetchFromGitHub { + owner = "openscenegraph"; + repo = "osgQt"; + rev = finalAttrs.version; + hash = "sha256-iUeIqRDlcAHdKXWAi4WhEaOCxa7ZivQw0K5E7ccEKnM="; + }; + + buildInputs = [ libsForQt5.qtbase ]; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ openscenegraph ]; + + cmakeFlags = [ + "-DDESIRED_QT_VERSION=5" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "FIND_PACKAGE(Qt5Widgets REQUIRED)" \ + "FIND_PACKAGE(Qt5Widgets REQUIRED) + FIND_PACKAGE(Qt5OpenGL REQUIRED)" + ''; + + meta = { + description = "Qt bindings for OpenSceneGraph"; + homepage = "https://github.com/openscenegraph/osgQt"; + license = "OpenSceneGraph Public License - free LGPL-based license"; + maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/os/osm2pgsql/package.nix b/third_party/nixpkgs/pkgs/by-name/os/osm2pgsql/package.nix index 0ddfb737fc..85bd3dcac2 100644 --- a/third_party/nixpkgs/pkgs/by-name/os/osm2pgsql/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/osm2pgsql/package.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , expat -, fmt +, fmt_11 , proj , bzip2 , cli11 @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.11.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w="; + hash = "sha256-YtG/cwEyCIsNjoEhDikMoI/SUqx8fEtPuolpNkLGTlE="; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 cli11 expat - fmt + fmt_11 libosmium nlohmann_json opencv diff --git a/third_party/nixpkgs/pkgs/by-name/os/osqp-eigen/package.nix b/third_party/nixpkgs/pkgs/by-name/os/osqp-eigen/package.nix index 935bb0bfa6..016fbe8b0a 100644 --- a/third_party/nixpkgs/pkgs/by-name/os/osqp-eigen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/osqp-eigen/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" true) - (lib.cmakeBool "OSQPEIGEN_RUN_Valgrind_tests" stdenv.isLinux) + (lib.cmakeBool "OSQPEIGEN_RUN_Valgrind_tests" stdenv.hostPlatform.isLinux) ]; nativeBuildInputs = [ cmake ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { osqp ]; checkInputs = [ catch2 ]; - nativeCheckInputs = lib.optional stdenv.isLinux valgrind; + nativeCheckInputs = lib.optional stdenv.hostPlatform.isLinux valgrind; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/Cargo.lock new file mode 100644 index 0000000000..ff8b531c03 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/Cargo.lock @@ -0,0 +1,5432 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "cc" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.52.5", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.68", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.8.14", + "vswhom", + "winreg 0.52.0", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.1", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.2.2", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.11", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.7", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "infer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +dependencies = [ + "cfb", +] + +[[package]] +name = "infer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libappindicator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus 4.3.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overlayed" +version = "0.0.0" +dependencies = [ + "anyhow", + "cocoa 0.25.0", + "objc", + "serde", + "tauri", + "tauri-build", + "tauri-nspanel", + "tauri-plugin-single-instance", + "tauri-plugin-websocket", + "tauri-plugin-window-state", + "tokio", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plist" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +dependencies = [ + "base64 0.21.7", + "indexmap 2.2.6", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "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]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_json" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +dependencies = [ + "indexmap 2.2.6", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.6", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr 0.15.8", + "heck 0.5.0", + "pkg-config", + "toml 0.8.14", + "version-compare 0.2.0", +] + +[[package]] +name = "tao" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libappindicator", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement 0.39.0", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tauri" +version = "1.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cocoa 0.24.1", + "dirs-next", + "dunce", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "getrandom 0.2.15", + "glib", + "glob", + "gtk", + "heck 0.5.0", + "http 0.2.12", + "ico 0.2.0", + "ignore", + "indexmap 1.9.3", + "infer 0.9.0", + "minisign-verify", + "nix 0.26.4", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "percent-encoding", + "png", + "rand 0.8.5", + "raw-window-handle", + "regex", + "reqwest", + "rfd", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "state", + "sys-locale", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs-next", + "heck 0.5.0", + "json-patch", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" +dependencies = [ + "base64 0.21.7", + "brotli", + "ico 0.3.0", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-nspanel" +version = "0.0.0" +source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v1#9bf268429c8b0bebff0f5e63a18ab51b90c728de" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa 0.25.0", + "core-foundation", + "core-graphics 0.23.2", + "objc", + "objc-foundation", + "objc_id", + "tauri", +] + +[[package]] +name = "tauri-plugin-single-instance" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", + "windows-sys 0.52.0", + "zbus 3.15.2", +] + +[[package]] +name = "tauri-plugin-websocket" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51" +dependencies = [ + "futures-util", + "http 1.1.0", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "tauri", + "thiserror", + "tokio", + "tokio-tungstenite", +] + +[[package]] +name = "tauri-plugin-window-state" +version = "0.1.1" +source = "git+https://github.com/Hacksore/plugins-workspace?branch=v1#ad0b46f5fb5dae87b9ef2db5bce640e10a096b6b" +dependencies = [ + "bincode", + "bitflags 2.6.0", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" +dependencies = [ + "gtk", + "http 0.2.12", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" +dependencies = [ + "cocoa 0.24.1", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.5.0", + "html5ever", + "infer 0.13.0", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" +dependencies = [ + "quick-xml", + "windows 0.56.0", + "windows-version", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa 1.0.11", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "native-tls", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement 0.39.0", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wry" +version = "0.24.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa 0.24.1", + "core-graphics 0.22.3", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http 0.2.12", + "kuchikiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", +] + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs 1.6.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process 1.8.1", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.3.0", + "zbus_names 3.0.0", + "zvariant 4.1.1", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.1", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.1.1", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix new file mode 100644 index 0000000000..19452d768d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix @@ -0,0 +1,70 @@ +{ + rustPlatform, + lib, + callPackage, + pkg-config, + openssl, + libsoup, + webkitgtk, + fetchFromGitHub, + libayatana-appindicator, +}: + +rustPlatform.buildRustPackage rec { + pname = "overlayed"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "overlayeddev"; + repo = "overlayed"; + rev = "refs/tags/v${version}"; + hash = "sha256-yS1u7pp7SfmqzoH0QOAH060uo3nFb/N9VIng0T21tVw="; + }; + + sourceRoot = "${src.name}/apps/desktop/src-tauri"; + + webui = callPackage ./webui.nix { + inherit meta src version; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + webkitgtk + libsoup + ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-window-state-0.1.1" = "sha256-2cdO+5YAP7MOK0/YKclQemK4N9ci2JX3AfmMaeauwNI="; + "tauri-nspanel-0.0.0" = "sha256-tQHY0OX37b4dqhs89phYIzw7JzEPmMJo5e/jlyzxdMg="; + "tauri-plugin-single-instance-0.0.0" = "sha256-S1nsT/Dr0aIJdiPnW1FGamCth7CDMNAp4v34tpWqjHg="; + }; + }; + + postPatch = '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + substituteInPlace ./tauri.conf.json \ + --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \ + --replace-fail '"beforeBuildCommand": "pnpm build"' '"beforeBuildCommand": ""' + ''; + + meta = { + description = "Modern discord voice chat overlay"; + homepage = "https://github.com/overlayeddev/overlayed"; + changelog = "https://github.com/overlayeddev/overlayed/releases/tag/v${version}"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.agpl3Plus; + mainProgram = "overlayed"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix new file mode 100644 index 0000000000..7105dc8eae --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix @@ -0,0 +1,40 @@ +{ + src, + meta, + version, + stdenv, + nodejs, + pnpm, +}: + +stdenv.mkDerivation (finalAttrs: { + inherit version src meta; + pname = "overlayed-webui"; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) src pname version; + hash = "sha256-FBJrVXTgKh8Op7TiZjA/i2LY2OOIKmqGR+GwGUecqVI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + cd apps/desktop + node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix b/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix index e57c281c66..bade7387f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ov/overskride/package.nix @@ -4,7 +4,7 @@ owner = "kaii-lb"; name = "overskride"; -version = "0.5.7"; +version = "0.6.0"; in rustPlatform.buildRustPackage { @@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage { inherit owner; repo = name; rev = "v${version}"; - hash = "sha256-vuCpUTn/Re2wZIoCmKHwBRPdfpHDzNHi42iwvBFYjXo="; + hash = "sha256-TbakYKYbVe8wEFOrfj97m2bdAb1BJ7zoi/lyYLobw/k="; }; - cargoHash = "sha256-hX3GHRiE/CbeT/zblQHzbxLPEc/grDddXgqoAe64zUM="; + cargoHash = "sha256-p2PmcLoHfeRUEG2v33vVyiKBkOjpNDbVteSmH5R3RmI="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/ow/owmods-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ow/owmods-cli/package.nix index 23db013295..92809dab62 100644 --- a/third_party/nixpkgs/pkgs/by-name/ow/owmods-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ow/owmods-cli/package.nix @@ -35,9 +35,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd libsoup_3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ow/owncloud-client/package.nix b/third_party/nixpkgs/pkgs/by-name/ow/owncloud-client/package.nix index 31f2b52b00..0de43753d1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ow/owncloud-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ow/owncloud-client/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { qt6Packages.qtkeychain libre-graph-api-cpp-qt-client kdsingleapplication - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libinotify-kqueue sparkleshare ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix index 793abf7f01..012961c99b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix @@ -64,6 +64,6 @@ buildDotnetModule rec { mainProgram = "PabloDraw"; maintainers = with maintainers; [ aleksana kip93 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Eto.Platform.Mac64 not found in nugetSource + broken = stdenv.hostPlatform.isDarwin; # Eto.Platform.Mac64 not found in nugetSource }; } diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix index d308a93254..228c4aa638 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paperlib/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paperlib/package.nix index c03f0434b3..d39e35be94 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paperlib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paperlib/package.nix @@ -39,7 +39,7 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname diff --git a/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix index bfa2c5d6da..db943d8ea9 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix @@ -28,7 +28,7 @@ , gi-docgen , libgxps , withLibsecret ? true -, supportNautilus ? (!stdenv.isDarwin) +, supportNautilus ? (!stdenv.hostPlatform.isDarwin) , libadwaita , exempi , cargo @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { libsecret ] ++ lib.optionals supportNautilus [ nautilus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/Incubator/papers/-/issues/176 --prefix PATH : "$out/bin" ) - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "$out/lib" "$out/bin/papers" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix index 166e016761..5feab9c3c8 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "parallel-hashmap"; - version = "1.3.12"; + version = "1.4.0"; src = fetchFromGitHub { owner = "greg7mdp"; repo = "parallel-hashmap"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0="; + hash = "sha256-19rWcnMtWgqYlLylUjgI/p3aAM0Ois3CKoMuMmLQHmM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paru/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paru/package.nix index b8c457f8b5..d961826d12 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paru/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paru/package.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { ]; # https://aur.archlinux.org/packages/paru#comment-961914 - buildFeatures = lib.optionals stdenv.isAarch64 [ "generate" ]; + buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [ "generate" ]; postBuild = '' sh ./scripts/mkmo locale/ diff --git a/third_party/nixpkgs/pkgs/by-name/pa/passes/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/passes/package.nix index a20a1fe80b..74d34f682b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/passes/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/passes/package.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Crashes + broken = stdenv.hostPlatform.isDarwin; # Crashes }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/pe/peertube-viewer/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/peertube-viewer/package.nix index 5d3583c2f7..3981fb69f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/peertube-viewer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/peertube-viewer/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitLab, rustPlatform, - youtube-dl, }: rustPlatform.buildRustPackage rec { diff --git a/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix index 5e1704cdeb..28052ee751 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pegtl"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "taocpp"; repo = "PEGTL"; rev = finalAttrs.version; - hash = "sha256-IV5YNGE4EWVrmg2Sia/rcU8jCuiBynQGJM6n3DCWTQU="; + hash = "sha256-nPWSO2wPl/qenUQgvQDQu7Oy1dKa/PnNFSclmkaoM8A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix index 2ea48a54a7..498a14c96d 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { lapack ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optionals withParmetis [ metis parmetis ]; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config/install.py \ --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool ''; diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix index 72eb5c153a..2b89773af8 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake docutils ]; buildInputs = [ cjson libev openssl ] - ++ lib.optionals stdenv.isLinux [ systemd ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; meta = with lib; { description = "High-performance connection pool for PostgreSQL"; diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix index 0df2ab9c04..1fda00a750 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { readline sqlite zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pam ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ph/photini/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/photini/package.nix index 4ee4451bfa..4afc67386d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/photini/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/photini/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "photini"; - version = "2024.5.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "Photini"; rev = "refs/tags/${version}"; - hash = "sha256-iTaFyQpC585QPInLvFzgk65+Znvb1kTTsrzEQvy1quY="; + hash = "sha256-0jr1mNejCF0yW9LkrrsOTcE4ZPGZrMU9Pnt0eXD+3YQ="; }; build-system = with python3Packages; [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ph/photoqt/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/photoqt/package.nix index ff80e9bc15..6e66d6885e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/photoqt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/photoqt/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { qt6Packages.poppler zxing-cpp ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mpv qt6.qtwayland ]; @@ -59,12 +59,12 @@ stdenv.mkDerivation rec { (lib.cmakeBool "CHROMECAST" false) (lib.cmakeBool "FREEIMAGE" false) (lib.cmakeBool "IMAGEMAGICK" false) - (lib.cmakeBool "VIDEO_MPV" (!stdenv.isDarwin)) + (lib.cmakeBool "VIDEO_MPV" (!stdenv.hostPlatform.isDarwin)) ]; env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/photoqt.app $out/Applications makeWrapper $out/{Applications/photoqt.app/Contents/MacOS,bin}/photoqt diff --git a/third_party/nixpkgs/pkgs/by-name/pi/picocom/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/picocom/package.nix index 9e9d138055..4a549e2792 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/picocom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/picocom/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ linenoise - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; makeFlags = [ "HISTFILE=.cache/picocom_history" diff --git a/third_party/nixpkgs/pkgs/by-name/pi/picocrypt/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/picocrypt/package.nix index 92ddceef73..d77509135d 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/picocrypt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/picocrypt/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { # Depends on a vendored, patched GLFW. glfw.buildInputs or [ ] ++ glfw.propagatedBuildInputs or [ ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 xorg.libXxf86vm ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/picom-pijulius/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/picom-pijulius/package.nix index 484df18f3f..6cb67fe259 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/picom-pijulius/package.nix @@ -9,13 +9,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-09-08"; + version = "8.2-unstable-2024-09-14"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "c7f7d6ed3858ca507ed8abd057d1039fc889940a"; - hash = "sha256-LRUU516bfiN06mqLY7CWtrUmRubQ/ysPtciUNd/qGhA="; + rev = "0c46ea546d9c507e744612e80b25ef5dfa531855"; + hash = "sha256-g/RknjZh5O2/3Plk1w8QnNywWZXZaABfunBY6XyixnA="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pietrasanta-traceroute/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pietrasanta-traceroute/package.nix index 195ea1ad97..2c2b824f86 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pietrasanta-traceroute/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pietrasanta-traceroute/package.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { mainProgram = "traceroute"; maintainers = with maintainers; [ nicoo ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinocchio/package.nix similarity index 56% rename from third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix rename to third_party/nixpkgs/pkgs/by-name/pi/pinocchio/package.nix index e03ac9ee85..7284be49df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pinocchio/package.nix @@ -1,19 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, casadi -, cmake -, boost -, eigen -, example-robot-data -, casadiSupport ? true -, collisionSupport ? true -, console-bridge -, jrl-cmakemodules -, hpp-fcl -, urdfdom -, pythonSupport ? false -, python3Packages +{ + boost, + casadi, + casadiSupport ? true, + cmake, + collisionSupport ? true, + console-bridge, + doxygen, + eigen, + example-robot-data, + fetchFromGitHub, + hpp-fcl, + jrl-cmakemodules, + lib, + pkg-config, + pythonSupport ? false, + python3Packages, + stdenv, + urdfdom, }: stdenv.mkDerivation (finalAttrs: { @@ -27,8 +30,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8V+n1TwFojXKOVkGG8k9aXVadt2NBFlZKba93L+NRNU="; }; + outputs = [ + "out" + "doc" + ]; + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 - prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + prePatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) '' substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(force)" "" ''; @@ -41,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: { # allow package:// uri use in examples export ROS_PACKAGE_PATH=${example-robot-data}/share + + # silence matplotlib warning + export MPLCONFIGDIR=$(mktemp -d) ''; # CMAKE_BUILD_TYPE defaults to Release in this package, @@ -52,31 +63,35 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - ]; + nativeBuildInputs = + [ + cmake + doxygen + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; - propagatedBuildInputs = [ - console-bridge - jrl-cmakemodules - urdfdom - ] ++ lib.optionals (!pythonSupport) [ - boost - eigen - ] ++ lib.optionals (!pythonSupport && collisionSupport) [ - hpp-fcl - ] ++ lib.optionals pythonSupport [ - python3Packages.boost - python3Packages.eigenpy - ] ++ lib.optionals (pythonSupport && collisionSupport) [ - python3Packages.hpp-fcl - ] ++ lib.optionals (!pythonSupport && casadiSupport) [ - casadi - ] ++ lib.optionals (pythonSupport && casadiSupport) [ - python3Packages.casadi - ]; + propagatedBuildInputs = + [ + console-bridge + jrl-cmakemodules + urdfdom + ] + ++ lib.optionals (!pythonSupport) [ + boost + eigen + ] + ++ lib.optionals (!pythonSupport && collisionSupport) [ hpp-fcl ] + ++ lib.optionals pythonSupport [ + python3Packages.boost + python3Packages.eigenpy + ] + ++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.hpp-fcl ] + ++ lib.optionals (!pythonSupport && casadiSupport) [ casadi ] + ++ lib.optionals (pythonSupport && casadiSupport) [ python3Packages.casadi ]; checkInputs = lib.optionals (pythonSupport && casadiSupport) [ python3Packages.matplotlib ]; @@ -85,21 +100,20 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport) (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport) (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) ]; doCheck = true; - - # pythonImportsCheck, but in stdenv.mkDerivation - postInstall = lib.optionalString pythonSupport '' - PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH - python -c "import pinocchio" - ''; + pythonImportsCheck = [ "pinocchio" ]; meta = { description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; homepage = "https://github.com/stack-of-tasks/pinocchio"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nim65s wegank ]; + maintainers = with lib.maintainers; [ + nim65s + wegank + ]; platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pinokio/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinokio/package.nix index 97b9ad7514..f71f7800c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pinokio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pinokio/package.nix @@ -31,7 +31,7 @@ let }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pio/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pio/package.nix index 01aa886c30..f79c12256e 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pio/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jVOpk+Z3yEEoDexvxT9I0aVHJKVq47y8km/9ltoqrDA="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pipet/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipet/package.nix new file mode 100644 index 0000000000..6a49e7d3c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pi/pipet/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule rec { + pname = "pipet"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "bjesus"; + repo = "pipet"; + rev = version; + hash = "sha256-PqOx/aFI5gHt78th1nkSKlTGw/r1eU7Ggz5kvtjMCmI="; + }; + + vendorHash = "sha256-jNIjF5jxcpNLAjuWo7OG/Ac4l6NpQNCKzYUgdAoL+C4="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.currentSha=${src.rev}" + ]; + + doCheck = false; # Requires network + + meta = { + homepage = "https://github.com/bjesus/pipet"; + description = "Scraping and extracting data from online assets"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bjesus ]; + mainProgram = "pipet"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix index d1c35d8153..5a8f25000e 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix @@ -24,10 +24,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.shortCommit=${src.rev}" ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pixelorama/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixelorama/package.nix index 889306ddd6..22eb4f3854 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pixelorama/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pixelorama/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - hash = "sha256-rFXUy6fvGKmB+aaNgiI+NNRG0xlj1migdetnU4iVDDQ="; + hash = "sha256-IMHv5pOLxj7sqRtWmddziCiOX3T20bcMp2+ZzyhcIFg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix index 6c0ed9ebc0..85413acc64 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin ( + ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ] ); @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { # There are some CI failures with Rattler. Tests on Aarch64 has been skipped. # See https://github.com/prefix-dev/pixi/pull/241. - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' export HOME="$(mktemp -d)" @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_task_with_env" "--skip=test_pixi_only_env_activation" "--skip=cli::shell_hook::tests::test_environment_json" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=task::task_environment::tests::test_find_ambiguous_task" "--skip=task::task_environment::tests::test_find_task_dual_defined" "--skip=task::task_environment::tests::test_find_task_explicit_defined" diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pizauth/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pizauth/package.nix index 811b74b972..31435c52f0 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pizauth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pizauth/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = '' installShellCompletion --cmd pizauth \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/plantuml-c4.nix b/third_party/nixpkgs/pkgs/by-name/pl/plantuml-c4/package.nix similarity index 63% rename from third_party/nixpkgs/pkgs/tools/misc/plantuml/plantuml-c4.nix rename to third_party/nixpkgs/pkgs/by-name/pl/plantuml-c4/package.nix index 77cfa82e89..a17aedefee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/plantuml-c4.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/plantuml-c4/package.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, makeWrapper, fetchzip, runCommand, plantuml, plantuml-c4, jre }: +{ + lib, + stdenv, + fetchzip, + jre, + makeWrapper, + plantuml-c4, + plantuml, + runCommand, +}: # The C4-PlantUML docs say that it suffices to run plantuml with the # -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates @@ -12,13 +21,13 @@ let c4-lib = fetchzip { - url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.8.0.zip"; - hash = "sha256-pGtTFg7HcAFYPrjd+CAaxS4C6Cqaj94aq45v3NpiAxM="; + url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.10.0.zip"; + hash = "sha256-p9Njb7VauXVf6yOBDQrO9mS+za9NntFUCK5tig0mH3U="; }; sprites = fetchzip { - url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/fa3f885dbd45c9cd0cdf6c0e5e4fb51ec8b76582.zip"; - hash = "sha256-lt9+NNMIaZSkKNsGyHoqXUCTlKmZFGfNYYGjer6X0Xc="; + url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/refs/tags/v3.0.0.zip"; + hash = "sha256-I/cR1VPR7aKyTZF9X/4GkgcxV9+sLgNpTZugvCy0Dvs="; }; # In order to pre-fix the plantuml.jar parameter with the argument @@ -26,22 +35,24 @@ let # This way the plantuml derivation can remain unchanged. plantumlWithExtraPath = let - plantumlIncludePath = lib.concatStringsSep ":" [ c4-lib sprites ]; + plantumlIncludePath = lib.concatStringsSep ":" [ + c4-lib + sprites + ]; includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}"; - postFixedJre = - runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin + postFixedJre = runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/java \ - --add-flags ${lib.escapeShellArg includeFlag} - ''; + makeWrapper ${jre}/bin/java $out/bin/java \ + --add-flags ${lib.escapeShellArg includeFlag} + ''; in plantuml.override { jre = postFixedJre; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plantuml-c4"; - version = "2.8.0"; + version = "2.10.0"; nativeBuildInputs = [ makeWrapper ]; @@ -55,20 +66,24 @@ stdenv.mkDerivation rec { ''; passthru.tests.example-c4-diagram = - runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; } '' - sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml - plantuml sample.puml -o $out + runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; } + '' + sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml + plantuml sample.puml -o $out - sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml - plantuml sprites.puml -o $out - ''; + sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml + plantuml sprites.puml -o $out + ''; meta = with lib; { description = "PlantUML bundled with C4-Plantuml and plantuml sprites library"; mainProgram = "plantuml"; homepage = "https://github.com/plantuml-stdlib/C4-PlantUML"; license = licenses.mit; - maintainers = with maintainers; [ tfc ]; + maintainers = with maintainers; [ + tfc + anthonyroussel + ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plantuml-server/package.nix similarity index 75% rename from third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix rename to third_party/nixpkgs/pkgs/by-name/pl/plantuml-server/package.nix index 0eed91bdb9..189da083d1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/plantuml-server/package.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ + lib, + stdenv, + fetchurl, + nixosTests, +}: -let - version = "1.2024.7"; -in stdenv.mkDerivation rec { pname = "plantuml-server"; - inherit version; + version = "1.2024.7"; + src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8="; + hash = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8="; }; dontUnpack = true; - installPhase = '' + + postInstall = '' mkdir -p "$out/webapps" cp "$src" "$out/webapps/plantuml.war" ''; @@ -27,6 +31,9 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ truh ]; + maintainers = with maintainers; [ + truh + anthonyroussel + ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plantuml/package.nix similarity index 71% rename from third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix rename to third_party/nixpkgs/pkgs/by-name/pl/plantuml/package.nix index 83476bd995..cfb35e1d7c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/plantuml/package.nix @@ -1,18 +1,20 @@ -{ lib -, stdenvNoCC -, fetchurl -, makeBinaryWrapper -, jre -, graphviz +{ + lib, + stdenvNoCC, + fetchurl, + graphviz, + jre, + makeBinaryWrapper, + testers, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; - version = "1.2024.5"; + version = "1.2024.7"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-YayIedHIIpecVF7BZSvBTp66Eb7He+l+1RCir5KuL28="; + hash = "sha256-8BlAPc2BeojyTcZVboUA6+sOA5AO5eG871mSIWinm5E="; }; nativeBuildInputs = [ @@ -30,18 +32,28 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; doInstallCheck = true; + postCheckInstall = '' $out/bin/plantuml -help $out/bin/plantuml -testdot ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "plantuml --version"; + }; + meta = { description = "Draw UML diagrams using a simple and human readable text description"; homepage = "https://plantuml.com/"; # "plantuml -license" says GPLv3 or later license = lib.licenses.gpl3Plus; mainProgram = "plantuml"; - maintainers = with lib.maintainers; [ bjornfor Mogria ]; + maintainers = with lib.maintainers; [ + bjornfor + Mogria + anthonyroussel + ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/third_party/nixpkgs/pkgs/by-name/pl/platformsh/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/platformsh/package.nix index 683e34a87a..730990f103 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/platformsh/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/platformsh/package.nix @@ -8,11 +8,11 @@ }: let versions = lib.importJSON ./versions.json; - arch = if stdenvNoCC.isx86_64 then "amd64" - else if stdenvNoCC.isAarch64 then "arm64" + arch = if stdenvNoCC.hostPlatform.isx86_64 then "amd64" + else if stdenvNoCC.hostPlatform.isAarch64 then "arm64" else throw "Unsupported architecture"; - os = if stdenvNoCC.isLinux then "linux" - else if stdenvNoCC.isDarwin then "darwin" + os = if stdenvNoCC.hostPlatform.isLinux then "linux" + else if stdenvNoCC.hostPlatform.isDarwin then "darwin" else throw "Unsupported os"; versionInfo = versions."${os}-${arch}"; inherit (versionInfo) hash url; diff --git a/third_party/nixpkgs/pkgs/by-name/pl/platformsh/versions.json b/third_party/nixpkgs/pkgs/by-name/pl/platformsh/versions.json index 9fcf186237..5eda0b98d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/platformsh/versions.json +++ b/third_party/nixpkgs/pkgs/by-name/pl/platformsh/versions.json @@ -1,19 +1,19 @@ { - "version": "5.0.19", + "version": "5.0.20", "darwin-amd64": { - "hash": "sha256-PGld4gvUnB5I++vPQjEFWp7XRowi4fRfLL6wSzdyaAY=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_darwin_all.tar.gz" + "hash": "sha256-KFkJDzfs5+CsxuHc5y/wEygzAGQDMyAYXOvlNqzSvUQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-PGld4gvUnB5I++vPQjEFWp7XRowi4fRfLL6wSzdyaAY=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_darwin_all.tar.gz" + "hash": "sha256-KFkJDzfs5+CsxuHc5y/wEygzAGQDMyAYXOvlNqzSvUQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-UtyN/0UolohIVtrxGcKieHZfoRDJhjRApq+Mm44LjSo=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_linux_amd64.tar.gz" + "hash": "sha256-oPcy1yvAMTalr+FBynK0cq5Dgc1se/Tf1FZiwCqawIs=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-upMEN/c3hxuFlocelC1hX/Nia02Jeg3+VWPsA48kjhs=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_linux_arm64.tar.gz" + "hash": "sha256-U2cM3b3MYHSOpgX6VO1mo90ClYDYy2g4QpiB6vkX6Uc=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_linux_arm64.tar.gz" } } diff --git a/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix index 1db958dcf6..10463b6c96 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-d6HfIEROudINn2Jbnc3EEDZCD833FFFeUk6mvlu0ErA="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pm/pmbootstrap/package.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmbootstrap/package.nix index a1c3717c21..cee9a0b13b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pm/pmbootstrap/package.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { pmb_test = "${src}/test"; # Tests depend on sudo - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; build-system = [ python3Packages.setuptools diff --git a/third_party/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix index 230b1d65bd..47afc221df 100644 --- a/third_party/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pmtiles"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; rev = "v${version}"; - hash = "sha256-scicNAl1Lu8oD/g/63CXLeys+yorpH6Unhk5p4V78eY="; + hash = "sha256-r3gp0f771Cfy4JNekilnct+FKu4nOb+8y+B1A+anJ5Y="; }; - vendorHash = "sha256-8HShM4YznUAc6rJyDbdL5vv0dOk+d4IRKQpmEhWiNjo="; + vendorHash = "sha256-5oKcq1eTrcjQKWySDOsEFFbKkld9g494D5Tg9Bej8JQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix index 8841cc3c13..7f4f84948f 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/podman-tui/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { CGO_ENABLED = 0; tags = [ "containers_image_openpgp" "remote" ] - ++ lib.optional stdenv.isDarwin "darwin"; + ++ lib.optional stdenv.hostPlatform.isDarwin "darwin"; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/po/poke/package.nix b/third_party/nixpkgs/pkgs/by-name/po/poke/package.nix index 6bd5786089..0f392f3cbe 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/poke/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/poke/package.nix @@ -6,7 +6,7 @@ , texinfo , boehmgc , readline -, nbdSupport ? !stdenv.isDarwin, libnbd +, nbdSupport ? !stdenv.hostPlatform.isDarwin, libnbd , textStylingSupport ? true, gettext , dejagnu @@ -86,6 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/po/pokemmo-installer/package.nix b/third_party/nixpkgs/pkgs/by-name/po/pokemmo-installer/package.nix new file mode 100644 index 0000000000..a4adf5a8eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/pokemmo-installer/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitLab, + makeWrapper, + coreutils, + findutils, + gnugrep, + jre, + openssl, + util-linux, + wget, + which, + zenity, + libGL, + libpulseaudio, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pokemmo-installer"; + version = "1.4.8"; + + src = fetchFromGitLab { + owner = "coringao"; + repo = "pokemmo-installer"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-uSbnXBpkeGM9X6DU7AikT7hG/emu67PXuGdm6xfB8To="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + + # BINDIR defaults to $(PREFIX)/games + "BINDIR=${placeholder "out"}/bin" + ]; + + postFixup = '' + wrapProgram "$out/bin/pokemmo-installer" \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + findutils + gnugrep + jre + openssl + util-linux + wget + which + zenity + ] + } \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + libpulseaudio + ] + } + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Installer and Launcher for the PokeMMO emulator"; + homepage = "https://pokemmo.eu"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.linux; + mainProgram = "pokemmo-installer"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/po/polenum/package.nix b/third_party/nixpkgs/pkgs/by-name/po/polenum/package.nix new file mode 100644 index 0000000000..728b47ed4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/polenum/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "polenum"; + version = "1.6.1-unstable-2024-07-30"; + format = "other"; + + src = fetchFromGitHub { + owner = "Wh1t3Fox"; + repo = "polenum"; + rev = "6f95ce0f9936d8c20820e199a4bb1ea68d2f061f"; + hash = "sha256-aCX7dByfkUSFHjhRAjrFhbbeIgYNGixnB5pHE/lftng="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + ]; + + installPhase = '' + runHook preInstall + + install -vD $pname.py $out/bin/$pname + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to get the password policy from a windows machine"; + homepage = "https://github.com/Wh1t3Fox/polenum"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ exploitoverload ]; + mainProgram = "polenum"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix b/third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix index c8faf2b492..12872711f5 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix @@ -17,7 +17,7 @@ openal, udev, - textToSpeechSupport ? stdenv.isLinux, + textToSpeechSupport ? stdenv.hostPlatform.isLinux, flite, }: diff --git a/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix b/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix index a7e4b02fbc..d5b8cea948 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/portfolio/package.nix @@ -33,13 +33,13 @@ let webkitgtk ]; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.70.4"; + version = "0.71.1"; src = fetchurl { - url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-4L2hoWUFAmxyUCbQFWoIQlIhbdyncN0fGFmahPMk0FU="; + url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; + hash = "sha256-bZZTsL2jf4m6Gvc9cXDbAsiPoluljnb1AKshMM4325Q="; }; nativeBuildInputs = [ @@ -68,12 +68,12 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { url = "https://github.com/buchen/portfolio.git"; }; - meta = with lib; { + meta = { description = "Simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.epl10; - maintainers = with maintainers; [ + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.epl10; + maintainers = with lib.maintainers; [ kilianar oyren shawn8901 @@ -81,4 +81,4 @@ stdenvNoCC.mkDerivation rec { mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix index eb92f27d55..7cac519f03 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.4.4"; + version = "3.5.0"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-YAIndKTqne4I+wuCrVtfkjdp1rsFF+xyBnl5WcuDyz4="; + hash = "sha256-a9LnLKtJ33YHtlnhWmKBeW5dOjjwa7PmaZjYh0+Nx9g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pr/presenterm/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/presenterm/package.nix index d2915f4f8a..1ee721828e 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/presenterm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/presenterm/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib - buildFeatures = lib.optionals (!stdenv.isDarwin) [ "sixel" ]; + buildFeatures = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "sixel" ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/previewqt/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/previewqt/package.nix index 82508c4df5..4014fa9105 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/previewqt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/previewqt/package.nix @@ -1,64 +1,98 @@ { lib, - vips, - resvg, - mpv, - libraw, - imagemagick, - libdevil, - stdenv, - fetchFromGitLab, cmake, - libarchive, - qt6Packages, - extra-cmake-modules, exiv2, + extra-cmake-modules, + fetchFromGitLab, + imagemagick, + libarchive, + libdevil, + libraw, + mpv, + pkg-config, + qt6Packages, + resvg, + stdenv, + vips, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "previewqt"; version = "3.0"; src = fetchFromGitLab { + name = "previewqt-sources-${finalAttrs.version}"; owner = "lspies"; repo = "previewqt"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-cDtqgezKGgSdhw8x1mM4cZ0H3SfUPEyWP6rRD+kRwXc="; }; - # can't find qtquick3d - strictDeps = false; - nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - exiv2 - imagemagick - qt6Packages.poppler - qt6Packages.qtmultimedia - qt6Packages.qtquick3d - qt6Packages.qtsvg - qt6Packages.qttools - qt6Packages.qtwebengine - libarchive - libdevil - libraw - mpv - resvg - vips - ]; + buildInputs = + [ + exiv2 + extra-cmake-modules + imagemagick + libarchive + libdevil + libraw + mpv + resvg + vips + ] + ++ [ + qt6Packages.poppler + qt6Packages.qtmultimedia + qt6Packages.qtquick3d + qt6Packages.qtsvg + qt6Packages.qttools + qt6Packages.qtwebengine + ]; + + strictDeps = true; meta = { + homepage = "https://previewqt.org/"; description = "Qt-based file previewer"; - homepage = "https://photoqt.org/previewqt"; - changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${version}/CHANGELOG"; + longDescription = '' + PhotoQt is an image viewer that provides a simple and uncluttered + interface. Yet, hidden beneath the surface awaits a large array of + features. Here are some of its main features (not an exhaustive + list). Suggestions for new features are always welcome. + + - Support of ImageMagick/GraphicsMagick, Libraw, FreeImage, DevIL, + libvips, Poppler, libarchive, and video files. + - Touchscreen support + - Support for Motion Photos and Apple Live Photos + - Support for (partial) photo spheres and 360 degree panoramas using + equirectangular projection + - Explore images on an interactive map according to their embedded GPS + location + - Chromecast support + - Basic image manipulations + - Convert images between formats + - Keyboard and mouse shortcuts + - Upload images directly to imgur.com + - Set image as wallpaper directly from inside PhotoQt + - Slideshow feature + - Display Exif information (including tagging of faces) + - Detect and display bar codes and QR codes in images + - Thumbnail Cache + - System Tray Usage + - Command Line Options + - Several translations available (help wanted) + - and much more... + ''; + changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; mainProgram = "previewqt"; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 2a08500693..e5fb12a80c 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -17,7 +17,7 @@ zlib, msaClientID ? null, - gamemodeSupport ? stdenv.isLinux, + gamemodeSupport ? stdenv.hostPlatform.isLinux, }: let @@ -30,7 +30,7 @@ let in assert lib.assertMsg ( - gamemodeSupport -> stdenv.isLinux + gamemodeSupport -> stdenv.hostPlatform.isLinux ) "gamemodeSupport is only available on Linux."; stdenv.mkDerivation (finalAttrs: { @@ -66,10 +66,10 @@ stdenv.mkDerivation (finalAttrs: { tomlplusplus zlib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optional gamemodeSupport gamemode; - hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ]; + hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ]; cmakeFlags = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [ (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # we wrap our binary manually (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps") # disable built-in updater diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix index b58622271b..ab9b7144b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix @@ -31,23 +31,23 @@ additionalLibs ? [ ], additionalPrograms ? [ ], - controllerSupport ? stdenv.isLinux, - gamemodeSupport ? stdenv.isLinux, + controllerSupport ? stdenv.hostPlatform.isLinux, + gamemodeSupport ? stdenv.hostPlatform.isLinux, jdks ? [ jdk21 jdk17 jdk8 ], msaClientID ? null, - textToSpeechSupport ? stdenv.isLinux, + textToSpeechSupport ? stdenv.hostPlatform.isLinux, }: assert lib.assertMsg ( - controllerSupport -> stdenv.isLinux + controllerSupport -> stdenv.hostPlatform.isLinux ) "controllerSupport only has an effect on Linux."; assert lib.assertMsg ( - textToSpeechSupport -> stdenv.isLinux + textToSpeechSupport -> stdenv.hostPlatform.isLinux ) "textToSpeechSupport only has an effect on Linux."; let @@ -67,7 +67,7 @@ symlinkJoin { kdePackages.qtsvg ] ++ lib.optional ( - lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux + lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.hostPlatform.isLinux ) kdePackages.qtwayland; postBuild = '' @@ -114,7 +114,7 @@ symlinkJoin { in [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" "--prefix PATH : ${lib.makeBinPath runtimePrograms}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/probe-rs-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/probe-rs-tools/package.nix index 64b014517c..b072922e73 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -34,9 +34,9 @@ rustPlatform.buildRustPackage rec { # https://github.com/probe-rs/probe-rs/pull/2492 gitMinimal pkg-config - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; checkFlags = [ # require a physical probe diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix index 7c8718e81b..45df05913b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "elasticsearch_exporter"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "elasticsearch_exporter"; rev = "v${version}"; - hash = "sha256-a70huy6J0Ob9LkLuCSVZqJChTo/4cPufbkq1v/QcKE4="; + hash = "sha256-8WPDBlp6ftBmY/lu0wuuvs3A9KAzEM/A6RqSvYYLm7w="; }; - vendorHash = "sha256-5uQfeDRi7EMcUCkXdbNlSe1IUpv6e5ueXtZ4C5SWAmw="; + vendorHash = "sha256-jbPFxwrXWwxPamMnbBxFvGBrt38YG7N5fTweAYULEYQ="; meta = with lib; { description = "Elasticsearch stats exporter for Prometheus"; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 7ddf75a893..5f1e9c50cc 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation IOKit ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation IOKit ]); excludedPackages = [ "docs/node-mixin" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix index 7335673116..dcd22825f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yPXf6f4dwCaT0nKDWiZ+FIvOyWB/WqiwKi1b/rBtNIQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix index 5f3a592e0f..debf368cdf 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix @@ -17,7 +17,7 @@ buildBazelPackage rec { removeRulesCC = false; removeLocalConfigCC = false; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; fetchAttrs.hash = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ="; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-bridge-gui/package.nix index 2b15e67908..3cb289b614 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-bridge-gui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-bridge-gui/package.nix @@ -62,17 +62,14 @@ stdenv.mkDerivation (finalAttrs: { sed -i "/add_subdirectory(bridge-gui-tester)/d" CMakeLists.txt ''; - preConfigure = '' - cmakeFlagsArray+=( - "-DCMAKE_BUILD_TYPE=Release" - "-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge" - "-DBRIDGE_VENDOR=Proton AG" - "-DBRIDGE_REVISION=${finalAttrs.src.rev}" - "-DBRIDGE_TAG=${finalAttrs.version}" - "-DBRIDGE_BUILD_ENV=Nix" - "-DBRIDGE_APP_VERSION=${finalAttrs.version}" - ) - ''; + cmakeFlags = [ + "-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge" + "-DBRIDGE_VENDOR=Proton AG" + "-DBRIDGE_REVISION=${finalAttrs.src.rev}" + "-DBRIDGE_TAG=${finalAttrs.version}" + "-DBRIDGE_BUILD_ENV=Nix" + "-DBRIDGE_APP_VERSION=${finalAttrs.version}" + ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix index 2d93767704..81866b4fd3 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip" else "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb"; @@ -38,14 +38,16 @@ stdenv.mkDerivation rec { .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; - sourceRoot = lib.optionalString stdenv.isDarwin "."; + sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "."; dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optional stdenv.isLinux dpkg ++ lib.optional stdenv.isDarwin unzip; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isLinux dpkg ++ lib.optional stdenv.hostPlatform.isDarwin unzip; installPhase = let @@ -65,12 +67,12 @@ stdenv.mkDerivation rec { '' runHook preInstall - ${if stdenv.isDarwin then darwin else linux} + ${if stdenv.hostPlatform.isDarwin then darwin else linux} runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proxsuite-nlp/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxsuite-nlp/package.nix index 234cc93feb..194ff2fe96 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -19,32 +19,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxsuite-nlp"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "proxsuite-nlp"; rev = "v${finalAttrs.version}"; - hash = "sha256-aMTEjAu1ltjorx5vhz7klB0cGgdm+7STAPhi+NA6mnI="; + hash = "sha256-Dy8+pPTv/B6vVdpGndVOV16WSLiENJfaIrn1+FYwcI0="; }; outputs = [ - "doc" "out" + "doc" ]; patches = [ # Fix use of system jrl-cmakemodules # This patch was merged upstream and can be removed on next release (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/106/commits/c653ab67860fdf7b53b1a919f0b8a7746eba016b.patch"; - hash = "sha256-Kw2obJGOWms/Lr4cVkLFpaLTickCq5WQyDVbwi8Bd58="; - }) - # Fix use of system EigenRand - # This patch was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/106/commits/25370417755f003708b5b2b81e253797e8d96928.patch"; - hash = "sha256-PKijVmttt5JakF3X/GiVWptncxHJUbs/aikgwgB5NME="; + url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/109/commits/9bf741ce6010052a773071472891f42adc6cbbea.patch"; + hash = "sha256-sluMVrTw7EXLFa0dqkoZTkpGjKe7zODqIqbJxCdfSwY="; }) ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proxsuite/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxsuite/package.nix index dcaf8bc6f7..6aba0e20c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/proxsuite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/proxsuite/package.nix @@ -3,10 +3,12 @@ stdenv, fetchFromGitHub, fetchpatch, - cereal, + cereal_1_3_2, cmake, doxygen, eigen, + fontconfig, + graphviz, jrl-cmakemodules, simde, matio, @@ -15,47 +17,24 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "proxsuite"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "simple-robotics"; repo = "proxsuite"; rev = "v${finalAttrs.version}"; - hash = "sha256-3kzFYADk3sCMU827KowilPlmOqgv69DJ3mOb7623Qdg="; + hash = "sha256-iKc55WDHArmmIM//Wir6FHrNV84HnEDcBUlwnsbtMME="; }; patches = [ - # Allow use of system jrl-cmakemodules - # This was merged upstream, and can be removed on next release + # Fix use of system cereal + # This was merged upstream and can be removed on next release (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/334/commits/2bcadd4993a9940c545136faa71bf1e97a972735.patch"; - hash = "sha256-BPtwogSwSXcEd5FM4eTTCq6LpGWvQ1SOCFmv/GVhl18="; - }) - # Allow use of system cereal - # This was merged upstream, and can be removed on next release - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/334/commits/878337c6284c9fd73b19f1f80d5fa802def8cdc6.patch"; - hash = "sha256-+HWYHLGtygjlvjM+FSD9WFDIwO+qPLlzci+7q42bo0I="; - }) - # Allow use of system pybind11 - # upstream will move to nanobind for next release, so this can be dismissed - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/337/commits/bbed9bdfb214da7c6c6909582971bd8b877f87c2.patch"; - hash = "sha256-pYikPZinjmk7gsagiaIcQspmGFYwlhdiKdZPnqo7pcQ="; + url = "https://github.com/Simple-Robotics/proxsuite/pull/352/commits/8305864f13ca7dff7210f89004a56652b71f8891.patch"; + hash = "sha256-XMS/zHFVrEp1P6aDlGrLbrcmuKq42+GdZRH9ObewNCY="; }) ]; - postPatch = '' - # discard failing tests for now - substituteInPlace test/CMakeLists.txt \ - --replace-fail "proxsuite_test(dense_maros_meszaros src/dense_maros_meszaros.cpp)" "" \ - --replace-fail "proxsuite_test(sparse_maros_meszaros src/sparse_maros_meszaros.cpp)" "" - - # fix CMake syntax - substituteInPlace bindings/python/CMakeLists.txt \ - --replace-fail "SYSTEM PRIVATE" "PRIVATE" - ''; - outputs = [ "doc" "out" @@ -76,9 +55,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake doxygen - ]; + graphviz + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; propagatedBuildInputs = [ - cereal + cereal_1_3_2 eigen jrl-cmakemodules simde @@ -90,12 +70,20 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.scipy ]; + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + doCheck = true; + pythonImportsCheck = [ "proxsuite" ]; meta = { description = "The Advanced Proximal Optimization Toolbox"; homepage = "https://github.com/Simple-Robotics/proxsuite"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prr/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prr/package.nix index 46576e1a18..ba07cd6fe0 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prr/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-vCZjgmBYO+I6MZLCOMp50bWEeHwLbZsxSz5gRmBykvI="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pt/pterm/package.nix b/third_party/nixpkgs/pkgs/by-name/pt/pterm/package.nix index c0d96e44f1..463a05ac06 100644 --- a/third_party/nixpkgs/pkgs/by-name/pt/pterm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pt/pterm/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sarcasticadmin ]; mainProgram = "pterm"; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch b/third_party/nixpkgs/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch deleted file mode 100644 index 2270ad3c8a..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/resources/pulsar.sh 2023-03-16 04:11:14.000000000 +0100 -+++ b/resources/pulsar.sh 2023-03-24 14:37:13.468813964 +0100 -@@ -123,7 +123,7 @@ - elif [ $OS == 'Linux' ]; then - SCRIPT=$(readlink -f "$0") - -- PULSAR_PATH="/opt/Pulsar/pulsar" -+ # PULSAR_PATH is set-up via `wrapProgram` in the postFixup phase - - #Set tmpdir only if tmpdir is unset - : ${TMPDIR:=/tmp} diff --git a/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix index 1f7123e468..83b1d4416a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pu/pulsar/package.nix @@ -7,6 +7,7 @@ , alsa-lib , at-spi2-atk , cairo +, coreutils , cups , dbus , expat @@ -34,13 +35,13 @@ let pname = "pulsar"; - version = "1.120.0"; + version = "1.121.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-35/ZMi6YsXs27icV3kXuKl3Kl8IHLLYbV0aO49qMJ2Q="; + x86_64-linux.hash = "sha256-xouxKl4GTNZkT5wn8qbG2W2PbVAbsK9povmIL/Mikk4="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-N1CAWeBHePd2KnnePEJQnvIKfIxal1RQ5UB8pxpVJCk="; + aarch64-linux.hash = "sha256-qRBX8jO5xDXkZ/6TWkgNa1NS3l+z8K/JyJDAa/3me5Q="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ @@ -86,10 +87,6 @@ stdenv.mkDerivation { inherit hash; }; - patches = [ - ./001-patch-wrapper.patch - ]; - nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems @@ -187,10 +184,11 @@ stdenv.mkDerivation { asar p $asarBundle $opt/resources/app.asar rm -rf $asarBundle - # We have patched the original wrapper, but now it needs the "PULSAR_PATH" env var + # Pulsar uses `PULSAR_PATH` to know where it is intalled mkdir -p $out/bin wrapProgram $opt/resources/pulsar.sh \ - --prefix "PULSAR_PATH" : "$opt/pulsar" + --suffix "PATH" : "${lib.makeBinPath [ coreutils ]}" \ + --set "PULSAR_PATH" "$opt" ln -s $opt/resources/pulsar.sh $out/bin/pulsar ln -s $opt/resources/app/ppm/bin/apm $out/bin/ppm @@ -230,7 +228,7 @@ stdenv.mkDerivation { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bryango ]; + maintainers = with lib.maintainers; [ bryango pbsds ]; knownVulnerabilities = [ # electron 12.2.3, efforts are in place to bump it "CVE-2023-5217" diff --git a/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix index bad009b07a..5c612e7bfa 100644 --- a/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix @@ -12,7 +12,7 @@ let binPath = lib.makeBinPath ([ python3.pkgs.pwntools # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3.pkgs.ropper # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30 python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 ]); @@ -64,6 +64,6 @@ stdenv.mkDerivation { platforms = platforms.all; maintainers = with maintainers; [ mic92 patryk4815 msanft ]; # not supported on aarch64-darwin see: https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/ - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix index f4d601ca96..1b83c51649 100644 --- a/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix @@ -1,19 +1,19 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , clang , libpcap }: -buildGoModule rec { +buildGo123Module rec { pname = "pwru"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "cilium"; repo = "pwru"; rev = "v${version}"; - hash = "sha256-BjiFuM06YDlPyB578p2hweBay+4z0bOn7fUoxSvrDY8="; + hash = "sha256-HK8t+IaeFLuyqUTuVSShbO426uaFyZcr+jZyz0wo4jw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock index e8e4f697e5..57f775bb89 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock @@ -10,18 +10,18 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "autocfg" @@ -49,17 +49,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.12" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "shlex", ] @@ -134,7 +134,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.54-nightly.5" +version = "0.1.57-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc6282121d9e2871553e0731cfb88119cbfe76ce8aab08ac2be01f5644e3bee" +checksum = "98756af66882a065224c97f2fdc5194488743202edd74dd237b16702f826d1de" dependencies = [ "erg_common", "erg_compiler", @@ -159,21 +159,22 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.42-nightly.5" +version = "0.6.45-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0dfc622cc65f230a05a284a21f62c8f4a3c964c51c97881cc4e01202ef2a3c0" +checksum = "219046e2b30f4e0b74089d95acfb49c4b5591ccc2d4d0a7e60c3616d0ed59fcb" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", "parking_lot", "thread_local", + "w-boson", ] [[package]] name = "erg_compiler" -version = "0.6.42-nightly.5" +version = "0.6.45-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42247c4ab1eb33ed3e2e9e74f4773565eba4491f76bfbda4b965015938704ca1" +checksum = "5e58d1703e885cbf39337d087eb864f93aee1b8d327a222a6b7dd3cc5a26e6e4" dependencies = [ "erg_common", "erg_parser", @@ -181,9 +182,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.42-nightly.5" +version = "0.6.45-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c921c178517c2071e45418e8c5b35e0c3a19021e4459283fd8f6997b89ba216" +checksum = "3103c4b8049db34a0ef3598c9603d3113d072f258d44d33715d3ba8d98ae2328" dependencies = [ "erg_common", "erg_proc_macros", @@ -192,9 +193,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.42-nightly.5" +version = "0.6.45-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1381ca7a7a0781834cb1d617cd8361cca23f880cb9c515d249905d585832734" +checksum = "afe652e09673d3abbfc272472d9f6f89fdace58238bcaf21f6f6abd397bd8583" dependencies = [ "quote", "syn 1.0.109", @@ -231,9 +232,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "hashbrown" @@ -263,7 +264,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -289,9 +290,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[package]] name = "libc" -version = "0.2.156" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libm" @@ -330,9 +331,9 @@ dependencies = [ [[package]] name = "malachite" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6ea071913d15f7e0566bc4768aae3918906ea77f0abbb387ca7c0dc9303f90" +checksum = "5616515d632967cd329b6f6db96be9a03ea0b3a49cdbc45b0016803dad8a77b7" dependencies = [ "malachite-base", "malachite-nz", @@ -341,9 +342,9 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c817c713ff9f16e06cfdc23baa3fecf1b71eaaac714816a98a560f4e350aa6" +checksum = "46059721011b0458b7bd6d9179be5d0b60294281c23320c207adceaecc54d13b" dependencies = [ "hashbrown", "itertools", @@ -366,9 +367,9 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603729facf62429736ac17a9fc9fe1bf7e0eb8bde3da3b18cc2b6153150464d5" +checksum = "1503b27e825cabd1c3d0ff1e95a39fb2ec9eab6fd3da6cfa41aec7091d273e78" dependencies = [ "itertools", "libm", @@ -377,9 +378,9 @@ dependencies = [ [[package]] name = "malachite-q" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73844ccbf0e9baaf34d4a6d187f0d6a925ce8e74ef37a67d238e7d65529b38c" +checksum = "a475503a70a3679dbe3b9b230a23622516742528ba614a7b2490f180ea9cb514" dependencies = [ "itertools", "malachite-base", @@ -403,11 +404,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -454,9 +455,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -560,7 +561,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.61" +version = "0.0.62" dependencies = [ "erg_common", "erg_compiler", @@ -570,7 +571,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.61" +version = "0.0.62" dependencies = [ "els", "erg_common", @@ -580,7 +581,7 @@ dependencies = [ [[package]] name = "pylyzer_core" -version = "0.0.61" +version = "0.0.62" dependencies = [ "erg_common", "erg_compiler", @@ -591,7 +592,7 @@ dependencies = [ [[package]] name = "pylyzer_wasm" -version = "0.0.61" +version = "0.0.62" dependencies = [ "erg_common", "erg_compiler", @@ -601,9 +602,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -640,9 +641,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -661,9 +662,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -741,29 +742,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -779,7 +780,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -819,9 +820,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -922,15 +923,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -943,15 +944,15 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "unicode_names2" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677" +checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd" dependencies = [ "phf", "unicode_names2_generator", @@ -959,9 +960,9 @@ dependencies = [ [[package]] name = "unicode_names2_generator" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0" +checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e" dependencies = [ "getopts", "log", @@ -987,6 +988,15 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "w-boson" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df84793b18c52e3ee62d71ba13278004205c84641c1646f367fb583ef5f3510a" +dependencies = [ + "windows", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1015,7 +1025,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -1037,7 +1047,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1048,6 +1058,70 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core", + "windows-targets", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -1130,5 +1204,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix index 0aa0865c97..057ef5b91f 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.61"; + version = "0.0.62"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-t0BzNNofjeBlNqf6iqaWrTzVpzEACyyrZ3YKDYz713U="; + hash = "sha256-aoYdtW+cZZY2pHzfzAGjNbjF031Qtg76mZ/wQPqMJsw="; }; cargoLock = { @@ -36,9 +36,11 @@ rustPlatform.buildRustPackage rec { git python3 makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ (writeScriptBin "diskutil" "") ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (writeScriptBin "diskutil" "") ]; - buildInputs = [ python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + python3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; preBuild = '' export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix index 47797fa0ce..c358234d67 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.380"; + version = "1.1.381"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-Z73g4Fjj23rRTa2yIA3bjcZd2VHgXfDuHM6D77tHnZI="; + hash = "sha256-JMLQRTv0p38rZGnoxOjVF/qzscZCegFy92PCumEWETk="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-YlhoMvqS7pOBmRBT4mrKPggBpT1DV9xn4OdlPCR9vv8="; + npmDepsHash = "sha256-UvsBNSCKznaxtuKyQ4NOQehvhhXd9omhwRygKsr9mQo="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-Bs9GHjjSKqiu6EmeAVgyEj6QylDxK7majrlIMZgLGqU="; + npmDepsHash = "sha256-N3O8KWYeYhmbSyHTJwqFUf2wqqrsmN7Wt1jS5wI6SCE="; postPatch = '' chmod +w ../../ diff --git a/third_party/nixpkgs/pkgs/by-name/py/pytr/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pytr/package.nix index 64de02060d..4e6d13cd71 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pytr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pytr/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; rev = "refs/tags/v${version}"; - hash = "sha256-ejXedAfbZJzfCSkW9X1yH+I03+kjIs/xiSkyJk7FEO0="; + hash = "sha256-9FKG4QgRBU+DaaYJIDMDqqxFMCAguv5iRUUrQr6RMz8="; }; build-system = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyxel/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyxel/package.nix index 23a7836164..1103dbba46 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pyxel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pyxel/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ SDL2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.IOKit ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix index 5105e6c30a..736a6e09c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qd/qdiskinfo/package.nix @@ -29,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { smartmontools ]; + cmakeBuildType = "MinSizeRel"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE:STRING=MinSizeRel" "-DQT_VERSION_MAJOR=6" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qg/qgrep/package.nix b/third_party/nixpkgs/pkgs/by-name/qg/qgrep/package.nix index 57c3d20db2..f485aa0d91 100644 --- a/third_party/nixpkgs/pkgs/by-name/qg/qgrep/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qg/qgrep/package.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.CoreFoundation ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=unused-command-line-argument" "-Wno-error=unqualified-std-cast-call" ]); diff --git a/third_party/nixpkgs/pkgs/by-name/qg/qgv/package.nix b/third_party/nixpkgs/pkgs/by-name/qg/qgv/package.nix new file mode 100644 index 0000000000..d9ab3c7fc4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/qg/qgv/package.nix @@ -0,0 +1,44 @@ +{ + cmake, + fetchFromGitHub, + graphviz, + jrl-cmakemodules, + lib, + libsForQt5, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qgv"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "gepetto"; + repo = "qgv"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NUMCVqXw7euwxm4vISU8qYFfvV5HbAJsj/IjyxEjCPw="; + }; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qttools + ]; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + graphviz + jrl-cmakemodules + ]; + + meta = { + description = "Interactive Qt graphViz display"; + homepage = "https://github.com/gepetto/qgv"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix index bc79fb038f..1743b5e511 100644 --- a/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - hash = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA="; + hash = "sha256-2Msc8VTEzpK5eQHxJxNekj6YSqFRX/DN206hvYshiOg="; }; - cargoHash = "sha256-lR/LusIgdA+G7YeSLHjxdcC96tOSqSyalVamS42ORs0="; + cargoHash = "sha256-wBEimPiht7VN3lQfPlflrG2L47bfNnipK/JmurKqHrg="; nativeBuildInputs = [ asciidoctor diff --git a/third_party/nixpkgs/pkgs/by-name/qs/qsv/package.nix b/third_party/nixpkgs/pkgs/by-name/qs/qsv/package.nix index ba0280c19b..c59ad323f8 100644 --- a/third_party/nixpkgs/pkgs/by-name/qs/qsv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qs/qsv/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage { sqlite zstd ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit diff --git a/third_party/nixpkgs/pkgs/by-name/qt/qtalarm/package.nix b/third_party/nixpkgs/pkgs/by-name/qt/qtalarm/package.nix index f66c1040e5..457e6d1659 100644 --- a/third_party/nixpkgs/pkgs/by-name/qt/qtalarm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qt/qtalarm/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall '' + ( - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv qtalarm.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix index 407d19d50b..fb4fb88eb2 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.14.2"; + version = "3.14.4"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-LYh+vWOMghjdwBXqgbdQd945+OX2lKbRTFJ1GIzOyH0="; + hash = "sha256-N0NLP8VvUvr/oi3U1McD+jyV8UXGXCwuITRbwudw1Q0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix index 35ffc1694f..cfd3838c9c 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix @@ -48,7 +48,7 @@ let xrandr zsync ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa-demos usbutils xdg-user-dirs diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix index 35a71244ca..6e434e9d9a 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_STATIC_QJS_EXE" stdenv.hostPlatform.isStatic) ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "-Wno-error=stringop-overflow" ]); diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quickjs/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickjs/package.nix index 447f486a09..1366fd03cd 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quickjs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quickjs/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hash = "sha256-PEv4+JW/pUvrSGyNEhgRJ3Hs/FrDvhA2hR70FWghLgM="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace "CONFIG_LTO=y" "" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/r0/r0vm/package.nix b/third_party/nixpkgs/pkgs/by-name/r0/r0vm/package.nix index 36789e4192..e47a41260b 100644 --- a/third_party/nixpkgs/pkgs/by-name/r0/r0vm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/r0/r0vm/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl.dev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raffi/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/raffi/package.nix index d32478ba70..eab58d3c5d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/raffi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/raffi/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "raffi"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "chmouel"; repo = "raffi"; rev = "v${version}"; - hash = "sha256-i4PM82vGb9Z2pwW006114/h9crokVLUpLxNjr7tgAU8="; + hash = "sha256-25dH6LprqcZq9Px5nFNrGHk/2Tn23TZMLVZVic0unU8="; }; - cargoHash = "sha256-DS56H2XjEgdXC9TKLjwyfLpFHB9dUThhr8pNFEJuAZE="; + cargoHash = "sha256-bkNjlX8WH8+q4I+VfYZeraf2vyHtDFZQCbXzsdehCZQ="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix index a6024ace31..0c41c5a553 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ra/railway/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/railway/package.nix index df8b8e7224..ce17913cd0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/railway/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/railway/package.nix @@ -12,22 +12,22 @@ let in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-W9p987yn04Ije6JXFndHXB4rENGBTIiRmCh6fDhXJ4I="; + hash = "sha256-w52PzDRApKuRgJLYxY8ikqNOo6rC0kLCKWh8tgFzcIY="; }; - cargoHash = "sha256-/Lot/Cxg/BUp4MFp6VkJHR7jy7mUe7qwJDhPS8kOeUk="; + cargoHash = "sha256-6VjloZ8s5LqyYPz1uMwdkwvHIhXjmifjd46PIx5d8xQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/ra/rainfrog/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rainfrog/package.nix new file mode 100644 index 0000000000..5babac7991 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/rainfrog/package.nix @@ -0,0 +1,44 @@ +{ + lib, + darwin, + fetchFromGitHub, + nix-update-script, + rustPlatform, + stdenv, +}: +let + version = "0.2.5"; +in +rustPlatform.buildRustPackage { + inherit version; + pname = "rainfrog"; + + src = fetchFromGitHub { + owner = "achristmascarl"; + repo = "rainfrog"; + rev = "refs/tags/v${version}"; + hash = "sha256-+jjVowyyjM344LRDl+xFPxQ7qfjIMOMVzFiDgUHBMKw="; + }; + + cargoHash = "sha256-0Wtsquus63fwaP7YUi/QelCJGU2cH1RWAYQWY9YbfMw="; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreGraphics + SystemConfiguration + ] + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/achristmascarl/rainfrog/releases/tag/v${version}"; + description = "A database management TUI for postgres"; + homepage = "https://github.com/achristmascarl/rainfrog"; + license = lib.licenses.mit; + mainProgram = "rainfrog"; + maintainers = with lib.maintainers; [ patka ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ra/rana/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rana/package.nix new file mode 100644 index 0000000000..2fa2df8272 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/rana/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "rana"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "grunch"; + repo = "rana"; + rev = "refs/tags/v${version}"; + hash = "sha256-NgbWRuwD+nfNbB6WRbDjUPJneysb85z5eqXmU31U6Mo="; + }; + + cargoHash = "sha256-FMJisCR1bomswFHjIIu/24ywvQn1pv/7QHiEmaBV4a8="; + + meta = { + description = "Nostr public key mining tool"; + homepage = "https://github.com/grunch/rana"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jigglycrumb ]; + mainProgram = "rana"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ra/rasm/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rasm/package.nix index e31e4c0354..787de21b44 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/rasm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/rasm/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-DX+i9G+HK0Iek6qmsYQFbieHUtRazKkcyv+gYQ748X0="; + hash = "sha256-X3GEQJdfw4znqVyUIi2teUkQZpOV5X1EpF5Zob9g8PI="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 8f46010cce..5d4580e46f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { for i in rpi-eeprom-update rpi-eeprom-config; do wrapProgram $out/bin/$i \ --set FIRMWARE_ROOT "$out/lib/firmware/raspberrypi/bootloader" \ - ${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \ + ${lib.optionalString stdenvNoCC.hostPlatform.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \ --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped findutils @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { kmod pciutils (placeholder "out") - ] ++ lib.optionals stdenvNoCC.isAarch64 [ + ] ++ lib.optionals stdenvNoCC.hostPlatform.isAarch64 [ libraspberrypi ])}" done diff --git a/third_party/nixpkgs/pkgs/by-name/ra/rathole/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rathole/package.nix index 38d163daf8..19754ba11c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/rathole/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/rathole/package.nix @@ -24,9 +24,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix index 50cf9bef9e..e8834ac131 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix @@ -37,14 +37,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library # and linking it with cctools ld64. - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")' # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern. substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"' diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raze/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/raze/package.nix index 231f15bde4..5ba50c533e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/raze/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/raze/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeBool "DYN_GTK" false) (lib.cmakeBool "DYN_OPENAL" false) ]; diff --git a/third_party/nixpkgs/pkgs/by-name/rc/rcp/package.nix b/third_party/nixpkgs/pkgs/by-name/rc/rcp/package.nix index bafdf95b07..bc4be17301 100644 --- a/third_party/nixpkgs/pkgs/by-name/rc/rcp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rc/rcp/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-INLXVruiaK5yv5old0NOWFcg9y13M6Dm7bBMmcPFY1I="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); @@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "rcp"; maintainers = with maintainers; [ wykurz ]; # = note: Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/rc/rcu/package.nix b/third_party/nixpkgs/pkgs/by-name/rc/rcu/package.nix index 5f9bb9bb27..17d6d1c1e5 100644 --- a/third_party/nixpkgs/pkgs/by-name/rc/rcu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rc/rcu/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "2024.001p"; + version = "2024.001q"; format = "other"; src = let src-tarball = requireFile { name = "rcu-d${version}-source.tar.gz"; - hash = "sha256-FtdPcv2JA/fJeD2jG/kadPhhDSbfH2QLjjvLdUZJpZQ="; + hash = "sha256-Ywk28gJBMSSQL6jEcHE8h253KOsXIGwVOag6PBWs8kg="; url = "http://www.davisr.me/projects/rcu/"; }; in runCommand "${src-tarball.name}-unpacked" {} '' diff --git a/third_party/nixpkgs/pkgs/by-name/re/realm/package.nix b/third_party/nixpkgs/pkgs/by-name/re/realm/package.nix index e76189e1ac..34914df298 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/realm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/realm/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EvXafTujqTdQwfK4NXgT7lGKGnrpyP9ouplD6DmJUKU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/realvnc-vnc-viewer/package.nix b/third_party/nixpkgs/pkgs/by-name/re/realvnc-vnc-viewer/package.nix index 6e1dc6762b..d6a916df0a 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/realvnc-vnc-viewer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/realvnc-vnc-viewer/package.nix @@ -20,5 +20,5 @@ let mainProgram = "vncviewer"; }; in -if stdenv.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } else callPackage ./linux.nix { inherit pname version meta; } diff --git a/third_party/nixpkgs/pkgs/by-name/re/redict/package.nix b/third_party/nixpkgs/pkgs/by-name/re/redict/package.nix index 54820d6eb0..a916cfcd3b 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/redict/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/redict/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSystemd systemd ++ lib.optionals tlsSupport [ openssl ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace "-flto" "" ''; @@ -49,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/by-name/re/redlib/package.nix b/third_party/nixpkgs/pkgs/by-name/re/redlib/package.nix index 3497bc9ba4..51c80078e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/redlib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/redlib/package.nix @@ -1,42 +1,50 @@ -{ lib -, stdenv -, cacert -, nixosTests -, rustPlatform -, fetchFromGitHub -, darwin +{ + lib, + stdenv, + cacert, + nixosTests, + rustPlatform, + fetchFromGitHub, + darwin, }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.35.1"; + version = "0.35.1-unstable-2024-09-22"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; - rev = "refs/tags/v${version}"; - hash = "sha256-W1v7iOE60/6UyZSHQW+L+wHCoKnKUNb3kpm4LVLPZ6c="; + rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560"; + hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs="; }; - cargoHash = "sha256-3NQWiu/nTtHrivYL1pgxqQxEuIW0xfjxwK0ZEa2y1Kk="; + cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; checkFlags = [ # All these test try to connect to Reddit. + # utils.rs "--skip=test_fetching_subreddit_quarantined" "--skip=test_fetching_nsfw_subreddit" "--skip=test_fetching_ws" + # client.rs "--skip=test_obfuscated_share_link" "--skip=test_share_link_strip_json" - "--skip=test_localization_popular" + + # subreddit.rs "--skip=test_fetching_subreddit" + "--skip=test_gated_and_quarantined" + + # user.rs "--skip=test_fetching_user" # These try to connect to the oauth client + # oauth.rs "--skip=test_oauth_client" "--skip=test_oauth_client_refresh" "--skip=test_oauth_token_exists" diff --git a/third_party/nixpkgs/pkgs/by-name/re/refind/package.nix b/third_party/nixpkgs/pkgs/by-name/re/refind/package.nix index 9c4cda573e..2958d3be85 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/refind/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/refind/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "EFICRT0=${gnu-efi}/lib" "HOSTARCH=${hostarch}" "ARCH=${hostarch}" - ] ++ lib.optional stdenv.isAarch64 [ + ] ++ lib.optional stdenv.hostPlatform.isAarch64 [ # aarch64 is special for GNU-EFI, see BUILDING.txt "GNUEFI_ARM64_TARGET_SUPPORT=y" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/refinery-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/re/refinery-cli/package.nix index c70e69bee9..59a5dd255b 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/refinery-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/refinery-cli/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { description = "Run migrations for the Refinery ORM for Rust via the CLI"; diff --git a/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix b/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix index da5b97c8ef..d176accf9d 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix @@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ dannixon ]; mainProgram = "release-plz"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix b/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix index 78ae694b16..2f63041699 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix @@ -38,7 +38,7 @@ tcl.mkTclDerivation rec { --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\"" ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # On Darwin setenv and unsetenv are defined in stdlib.h from libSystem "-DHAVE_SETENV" "-DHAVE_UNSETENV" diff --git a/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix index eb0ca0e261..0ec4f7765b 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-09-05"; + version = "0-unstable-2024-09-20"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "3444d8aa86bb4ad3907c7d6886feafd65b8c2ff8"; - hash = "sha256-aHSuu9dYmY4ZKs6bzJostzeO1hFgkt/VBAbs2Ntj6dU="; + rev = "b54beb5568509ed8dce6a43efa02a600e271a32f"; + hash = "sha256-behdFayLes2Hr12KZ472jzTnELHMWRp3D5h6ZxLtqic="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix index 8dbf447958..edea55abb8 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renovate/package.nix @@ -7,7 +7,6 @@ overrideSDK, pnpm_9, python3, - renovate, testers, xcbuild, nixosTests, @@ -21,13 +20,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "38.73.5"; + version = "38.93.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-+kracgelM8VOIgEtDfaXWokNZgiwl+s/k1yx6RxQk0c="; + hash = "sha256-4NvFS4WWdV3Csuv28/wq6EvB+in5bo1N4Fn602bi4rE="; }; postPatch = '' @@ -44,7 +43,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-J61fOjANS7WKd3HLaqJZE1m2jFrMTknW6SGdy/yVIKg="; + hash = "sha256-cjk7PS4DUAgmg+mLUaWJFTjQv2GcPdr1VchNRjJgqsk="; }; env.COREPACK_ENABLE_STRICT = 0; @@ -91,7 +90,7 @@ stdenv'.mkDerivation (finalAttrs: { passthru = { tests = { - version = testers.testVersion { package = renovate; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; vm-test = nixosTests.renovate; }; updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix index d31ad9ced8..5cc7a09705 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - python3, + python311, pkg-config, SDL2, libpng, @@ -22,8 +22,8 @@ let # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.2.1"; - vc_version = "24030407"; + base_version = "8.3.1"; + vc_version = "24090601"; version = "${base_version}.${vc_version}"; in stdenv.mkDerivation { @@ -34,7 +34,7 @@ stdenv.mkDerivation { owner = "renpy"; repo = "renpy"; rev = version; - hash = "sha256-07Hj8mJGR0+Pn1DQ+sK5YQ3x3CTMsZ5h5yEoz44b2TM="; + hash = "sha256-k8mcDzaFngRF3Xl9cinUFU0T9sjxNIVrECUguARJVZ4="; }; nativeBuildInputs = [ @@ -42,8 +42,8 @@ stdenv.mkDerivation { makeWrapper # Ren'Py currently does not compile on Cython 3.x. # See https://github.com/renpy/renpy/issues/5359 - python3.pkgs.cython_0 - python3.pkgs.setuptools + python311.pkgs.cython_0 + python311.pkgs.setuptools ]; buildInputs = @@ -59,7 +59,7 @@ stdenv.mkDerivation { zlib harfbuzz ] - ++ (with python3.pkgs; [ + ++ (with python311.pkgs; [ python pygame-sdl2 tkinter @@ -100,13 +100,13 @@ stdenv.mkDerivation { EOF ''; - buildPhase = with python3.pkgs; '' + buildPhase = with python311.pkgs; '' runHook preBuild ${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES runHook postBuild ''; - installPhase = with python3.pkgs; '' + installPhase = with python311.pkgs; '' runHook preInstall ${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} @@ -120,7 +120,7 @@ stdenv.mkDerivation { runHook postInstall ''; - env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = with python311.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; meta = { description = "Visual Novel Engine"; diff --git a/third_party/nixpkgs/pkgs/by-name/re/rerun/package.nix b/third_party/nixpkgs/pkgs/by-name/re/rerun/package.nix index 84324b4bb0..41d4f78288 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/rerun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/rerun/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreGraphics @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.Security ] - ++ lib.optionals stdenv.isLinux [ (lib.getLib wayland) ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]; addDlopenRunpaths = map (p: "${lib.getLib p}/lib") ( lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/third_party/nixpkgs/pkgs/by-name/re/resticprofile/package.nix b/third_party/nixpkgs/pkgs/by-name/re/resticprofile/package.nix index 57d1f1c95d..fb814cdf39 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/resticprofile/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/resticprofile/package.nix @@ -1,6 +1,6 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, installShellFiles, restic, @@ -9,15 +9,15 @@ resticprofile, }: -buildGoModule rec { +buildGo123Module rec { pname = "resticprofile"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "creativeprojects"; repo = "resticprofile"; rev = "refs/tags/v${version}"; - hash = "sha256-HHFeWsEO1KUzL5Y6Iwy7MylA//JYzY3h1EwKrUHfXpY="; + hash = "sha256-Ab+XesAw/GkNEGwAp1ERUlfDlI9Kxmd0UnS52v+nWIs="; }; postPatch = '' @@ -32,7 +32,7 @@ buildGoModule rec { ''; - vendorHash = "sha256-t2R5uNsliSn+rIvRM0vT6lQJY62DhhozXnONiCJ9CMc="; + vendorHash = "sha256-LLFdVB4n07Sq/QH1C7rutdpzfhkJvM9lvRg5exyYixM="; ldflags = [ "-X main.commit=${src.rev}" diff --git a/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix b/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix index a22ce582b9..15e2c15a5e 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ qt6.qtbase ] ++ - lib.optionals (stdenv.isLinux) [ + lib.optionals (stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/revolt-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/re/revolt-desktop/package.nix index 7d8f0842a7..f941225770 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/revolt-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/revolt-desktop/package.nix @@ -31,7 +31,7 @@ let inherit (prev) pname version; in - if stdenvNoCC.isLinux then + if stdenvNoCC.hostPlatform.isLinux then { src = fetchurl { url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage"; @@ -64,7 +64,7 @@ ''; } else - assert stdenvNoCC.isDarwin; + assert stdenvNoCC.hostPlatform.isDarwin; { src = fetchzip { url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-${version}-mac.zip"; diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix index 8bbc781bb4..99ebaff5a1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + cmakeBuildType = "MinSizeRel"; + # https://github.com/blueprint-freespeech/ricochet-refresh/blob/main/BUILDING.md cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "MinSizeRel") (lib.cmakeBool "RICOCHET_REFRESH_INSTALL_DESKTOP" true) (lib.cmakeBool "USE_SUBMODULE_FMT" true) ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix index 9706b388db..8c9f239dc1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix @@ -89,14 +89,14 @@ buildNpmPackage rec { zip makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" + stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; npmBuildFlags = platformInfo.buildCmd; @@ -122,7 +122,7 @@ buildNpmPackage rec { install -Dm644 ThirdPartyNotices.txt -t $out/share/doc/ride - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm644 $src/D.png $out/share/icons/hicolor/64x64/apps/ride.png install -Dm644 $src/D.svg $out/share/icons/hicolor/scalable/apps/ride.svg @@ -134,7 +134,7 @@ buildNpmPackage rec { --inherit-argv0 ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r Ride-*.app $out/Applications makeWrapper $out/Applications/Ride-*.app/Contents/MacOS/Ride-* $out/bin/ride diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ringfairy/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ringfairy/package.nix index 1b4295d1f6..67563b5831 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/ringfairy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/ringfairy/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { buildInputs = [openssl] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ripunzip/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ripunzip/package.nix index 41d0594ebd..b8dfd3ff9c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/ripunzip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/ripunzip/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QyVhEHm1W4kb5b4dngBui3lT7vKBGDS5ZObMWua96KM="; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); nativeBuildInputs = [ pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix index 5cf424a43c..f352446e7a 100644 --- a/third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { do # The proprietary, statically linked binaries to perform boot_merge are # x86_64 only. Though we use box64 to emulate if building on aarch64-linux - ${lib.optionalString stdenv.isAarch64 "${qemu}/bin/qemu-x86_64"} ./tools/boot_merger "$i" || true + ${lib.optionalString stdenv.hostPlatform.isAarch64 "${qemu}/bin/qemu-x86_64"} ./tools/boot_merger "$i" || true done ''; diff --git a/third_party/nixpkgs/pkgs/by-name/rl/rl_json/package.nix b/third_party/nixpkgs/pkgs/by-name/rl/rl_json/package.nix index 81076dd076..ac6e7950f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/rl/rl_json/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rl/rl_json/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fgaz ]; platforms = tcl.meta.platforms; # From version 0.15.1: 'endian.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix index 4dd9ac30d6..50c6e4306f 100644 --- a/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { "-DUSE_ANGRYLION=${lib.boolToString withAngrylionRdpPlus}" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" ] ++ lib.optional withWayland "--set RMG_WAYLAND 1"; diff --git a/third_party/nixpkgs/pkgs/by-name/rn/rnote/package.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnote/package.nix index 792c9faa04..e2c569131e 100644 --- a/third_party/nixpkgs/pkgs/by-name/rn/rnote/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rn/rnote/package.nix @@ -75,9 +75,9 @@ stdenv.mkDerivation rec { libadwaita libxml2 poppler - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dotlambda gepbird yrd ]; platforms = platforms.unix; # compiler error since 2023-11-17 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ro/robodoc/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/robodoc/package.nix index bc64a8315f..4665548117 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/robodoc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/robodoc/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; }; - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Docs/makefile.am \ --replace 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS =' ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 4ddd35d6a7..93c4fab10a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-09-08"; + version = "0-unstable-2024-09-19"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "2af1d06f183302037a10f62641b90ee644a65eaf"; - hash = "sha256-L+Rj10SonsmoT7D1bi4VPMK//rdUEY7yhKX7eejo9+Q="; + rev = "7a3a1f7725d07cbd7d969bba2649f31d330d1e40"; + hash = "sha256-6P3dNNcPGPux/Epr0vIrEEl7To399UzJfb4Uq8MT5p4="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/rootbar/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rootbar/package.nix index a528cd4a94..1901a33f11 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/rootbar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/rootbar/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix index 5660350587..67910a77f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix @@ -1,26 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, testers, rosa, nix-update-script }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }: buildGoModule rec { pname = "rosa"; - version = "1.2.43"; + version = "1.2.45"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-1/go7mL2uRzzV/iiTXsgZHGNW8EIONwEnb4jcMiKkv4="; + hash = "sha256-Yjsk2A5itmTtOYM5UxSzQXNrBV9m1C8eXM0QUDjX2cI="; }; vendorHash = null; - patches = [ - # https://github.com/openshift/rosa/pull/2326/ - # TODO: remove on next version bump - (fetchpatch { - url = "https://github.com/openshift/rosa/commit/9ed236880f91f0e9514ba0a6f3be93ee115d1689.patch"; - hash = "sha256-KNGqJRFyfzcDs336Lj/KwR1yd5M7zfehu7IO0z/KUtg="; - }) - ]; - ldflags = [ "-s" "-w" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/deps.nix b/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/deps.nix index 01497b5e73..1fb2f6ef9b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/deps.nix @@ -7,16 +7,6 @@ (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.1.1.7464"; hash = "sha256-71/e9zuQIfqRXOiWxZkUFW/tMAj63nE8tg/sR7bGzuM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.1.1.7464/icsharpcode.decompiler.8.1.1.7464.nupkg"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.108/messagepack.annotations.2.5.108.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.32"; hash = "sha256-1mQTxwruzhm20YdlZefrYuy7xrBs17pH4Vo0K3Tl7Fc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/6.0.32/microsoft.aspnetcore.app.ref.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.7"; hash = "sha256-4jkbKvnRim+1K1KMDzHzzjZk9ALU2lYJVY1Fzr8Cmqs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/8.0.7/microsoft.aspnetcore.app.ref.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.32"; hash = "sha256-cIe0F+7rgwYSmh0VuFuQsUI9iEW5hn2KCD2H8Cs/k2g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/6.0.32/microsoft.aspnetcore.app.runtime.linux-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.7"; hash = "sha256-YiBHc3PC2qms/39IvJkaLfe/Eug9W97bz78XKKkqax8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.7/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.32"; hash = "sha256-TkYv7h9NBr3I+FIaXeLU4MawJtgT2RWhs35ewGRDKx8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/6.0.32/microsoft.aspnetcore.app.runtime.linux-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.7"; hash = "sha256-s6pb37BjE7TMBO2lQexUoJ+m+uhPB3unTR/BGYG+mVI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/8.0.7/microsoft.aspnetcore.app.runtime.linux-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.32"; hash = "sha256-RaC37ZQcJn7ykXJrtV7ibxh0GcalRyPKncxlqOLou+I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/6.0.32/microsoft.aspnetcore.app.runtime.osx-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.7"; hash = "sha256-zMBpSXV8dlGI/3ZB9Lx4qQnAHFNCwsjuEAuQzxHWDJU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.7/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.32"; hash = "sha256-vh/e46xM/HbhbBvL5eP5/DCHwCP2Bg7WoMS28nBXWV0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/6.0.32/microsoft.aspnetcore.app.runtime.osx-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.7"; hash = "sha256-TWXhiLxVkTem4aoBfWpVEhbWvfECfqJQqFP4X8BMhCY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.7/microsoft.aspnetcore.app.runtime.osx-x64.8.0.7.nupkg"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24366.2"; hash = "sha256-SUZfSiONzmTwDQsaTd7VTkE6IrzSu80giAPwrjvuY7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24366.2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24366.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.10.4"; hash = "sha256-yaElGdmgcELCXR5fIe5/ingMx2qS/PM3tZGTPNHHjXo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.10.4/microsoft.build.17.10.4.nupkg"; }) @@ -62,24 +52,6 @@ (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.4"; hash = "sha256-xLPrrL8iS3gNMIa/C/Wv0fBfHIehUHeQ4Y+F+gbqkhk="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.net.stringtools/17.3.4/microsoft.net.stringtools.17.3.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.7.2"; hash = "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.32"; hash = "sha256-yDOkSHEGuGG6u+rB5u+IC3rc2tQwvbjdqmgHcl7Gkn4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/6.0.32/microsoft.netcore.app.host.linux-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.7"; hash = "sha256-ffTw2G+T5Jk7v57tx3C2DWOXbD0lCu4IJf7v61hNnu8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/8.0.7/microsoft.netcore.app.host.linux-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.32"; hash = "sha256-2aDGkn0QqXXHUUSAwtQQbjKl5I6S0fcQWPciqPnOiM4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/6.0.32/microsoft.netcore.app.host.linux-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.7"; hash = "sha256-Hi/PhR7YDn7kKLcOGymy90BX+a9jOTmheLetKlOuhW0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/8.0.7/microsoft.netcore.app.host.linux-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.32"; hash = "sha256-n6hks4j88TRelq1O6SCeUH5GmxoSm5BWXGwnpnYJibI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/6.0.32/microsoft.netcore.app.host.osx-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.7"; hash = "sha256-cNQHG7xlOgB6o3u0h2+n6uA4M8abci2YbYXwYaXnnbs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/8.0.7/microsoft.netcore.app.host.osx-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.32"; hash = "sha256-nBBq4RYAgimBYOn/bN6JTFvJFYaqYXMHae2pmCzRaS8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/6.0.32/microsoft.netcore.app.host.osx-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.7"; hash = "sha256-jlJIQtWuE/CqRuwCam4ucYq1OROQzicouDeM3brpNTI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/8.0.7/microsoft.netcore.app.host.osx-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.32"; hash = "sha256-Fm3RUZNcro434rIu3c7unGviGeGBjXj2dGnr2mmrM2g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/6.0.32/microsoft.netcore.app.ref.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.7"; hash = "sha256-q35Ye0w5YqX12JOMXeAXp7ce4nvZQlv0K4GN6hSCz5g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/8.0.7/microsoft.netcore.app.ref.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.32"; hash = "sha256-kdj8ia/2du2oKGg4MJdO2XytpT3gQ9UOiHVCyfiX2V8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/6.0.32/microsoft.netcore.app.runtime.linux-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.7"; hash = "sha256-cQfBGSoZfnuBu+G5dWWxdxy8MzChoIpxWDvkkN98Z8M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/8.0.7/microsoft.netcore.app.runtime.linux-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.32"; hash = "sha256-/Hti30Ba12NDJQcG8pFTg6REVUDIrxZ/hRtEZNDlgxE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/6.0.32/microsoft.netcore.app.runtime.linux-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.7"; hash = "sha256-c3ekBpJZOS/2JD5KkktVQRVesPxTJmzpm05ROVR0mxo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/8.0.7/microsoft.netcore.app.runtime.linux-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.32"; hash = "sha256-A8MFGOMXFROH1QGUE7xzq5b5EskDyIQCQt7SLfGdSbU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/6.0.32/microsoft.netcore.app.runtime.osx-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.7"; hash = "sha256-RNzRuZH5j1socRsKmzxRLDdQZ/V9FRrT7jdbxtbOSI8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/8.0.7/microsoft.netcore.app.runtime.osx-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.32"; hash = "sha256-y5YB62WlMrK10bR/+nNpI8luVRlD9W9ZG3GsX7AXzUM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/6.0.32/microsoft.netcore.app.runtime.osx-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.7"; hash = "sha256-SN4fTW9O3m2uHQf0B15UXT5Cdxf23SJ03rQ4ye6FR4Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/8.0.7/microsoft.netcore.app.runtime.osx-x64.8.0.7.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/package.nix index 5fb77607ed..df3eb2e307 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/package.nix @@ -1,9 +1,26 @@ -{ lib, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, stdenvNoCC, testers, roslyn-ls, jq }: +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + stdenvNoCC, + testers, + roslyn-ls, + jq, +}: let pname = "roslyn-ls"; - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 sdk_9_0 ]; + dotnet-sdk = + with dotnetCorePackages; + combinePackages [ + sdk_6_0 + sdk_7_0 + sdk_8_0 + sdk_9_0 + ]; # need sdk on runtime as well dotnet-runtime = dotnetCorePackages.sdk_9_0; + rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; project = "Microsoft.CodeAnalysis.LanguageServer"; in @@ -32,11 +49,6 @@ buildDotnetModule rec { # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version. jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp mv global.json.tmp global.json - - substituteInPlace $dotnetProjectFiles \ - --replace-fail \ - '>win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64' \ - '>linux-x64;linux-arm64;osx-x64;osx-arm64' ''; dotnetFlags = [ @@ -45,35 +57,33 @@ buildDotnetModule rec { # see this comment: https://github.com/NixOS/nixpkgs/pull/318497#issuecomment-2256096471 # we can remove below line after https://github.com/dotnet/roslyn/issues/73439 is fixed "-p:UsingToolMicrosoftNetCompilers=false" + "-p:TargetRid=${rid}" ]; # two problems solved here: # 1. --no-build removed -> BuildHost project within roslyn is running Build target during publish # 2. missing crossgen2 7.* in local nuget directory when PublishReadyToRun=true # the latter should be fixable here but unsure how - installPhase = - let - rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; - in - '' - runHook preInstall + installPhase = '' + runHook preInstall - env dotnet publish $dotnetProjectFiles \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:InformationalVersion=$version \ - -p:UseAppHost=true \ - -p:PublishTrimmed=false \ - -p:PublishReadyToRun=false \ - --configuration Release \ - --no-self-contained \ - --output "$out/lib/$pname" \ - --runtime ${rid} \ - ''${dotnetInstallFlags[@]} \ - ''${dotnetFlags[@]} + env dotnet publish $dotnetProjectFiles \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:InformationalVersion=$version \ + -p:UseAppHost=true \ + -p:PublishTrimmed=false \ + -p:PublishReadyToRun=false \ + --configuration Release \ + --no-self-contained \ + --output "$out/lib/$pname" \ + --no-restore \ + --runtime ${rid} \ + ''${dotnetInstallFlags[@]} \ + ''${dotnetFlags[@]} - runHook postInstall - ''; + runHook postInstall + ''; passthru = { tests.version = testers.testVersion { package = roslyn-ls; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/routinator/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/routinator/package.nix index e7199164dd..14adef5211 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/routinator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/routinator/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1JxAbQPCQqDVry3wGIdY4q18rzCXlJ7Dnc8LIvhkW1g="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); meta = with lib; { description = "RPKI Validator written in Rust"; diff --git a/third_party/nixpkgs/pkgs/by-name/rp/rpi-imager/package.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpi-imager/package.nix index 05a893cd05..39a07b53d3 100644 --- a/third_party/nixpkgs/pkgs/by-name/rp/rpi-imager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rp/rpi-imager/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { qt5.qttools xz ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; @@ -81,6 +81,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = platforms.all; # does not build on darwin - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix index d02fe26920..bdd27f02a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/rr/rrdtool/package.nix b/third_party/nixpkgs/pkgs/by-name/rr/rrdtool/package.nix index 733b981e42..1a66700b17 100644 --- a/third_party/nixpkgs/pkgs/by-name/rr/rrdtool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rr/rrdtool/package.nix @@ -28,7 +28,7 @@ perl.pkgs.toPerlModule ( }; # Fix darwin build - patches = lib.optional stdenv.isDarwin (fetchpatch { + patches = lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://github.com/oetiker/rrdtool-1.x/pull/1262.patch"; hash = "sha256-aP0rmDlILn6VC8Tg7HpRXbxL9+KD/PRTbXnbQ7HgPEg="; }); @@ -47,7 +47,7 @@ perl.pkgs.toPerlModule ( cairo groff ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl darwin.apple_sdk.frameworks.ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/by-name/rs/rs/package.nix b/third_party/nixpkgs/pkgs/by-name/rs/rs/package.nix index 5edd417375..ab5e4fcb4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/rs/rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rs/rs/package.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isx86_64 && stdenv.isDarwin; # missing strtonum() + broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; # missing strtonum() }; } diff --git a/third_party/nixpkgs/pkgs/by-name/rs/rsgain/package.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsgain/package.nix index 284c5c1dbe..0e2fb485df 100644 --- a/third_party/nixpkgs/pkgs/by-name/rs/rsgain/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rs/rsgain/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { hash = "sha256-kTvIMsRI99U2ovkN5pC4OUS/bJWpRYSuRcvObvQRnbQ="; }; - cmakeFlags = ["-DCMAKE_BUILD_TYPE='Release'"]; - nativeBuildInputs = [pkg-config cmake]; buildInputs = [libebur128 taglib ffmpeg inih fmt zlib]; diff --git a/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix index 72aa065f25..469d3531e5 100644 --- a/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rs/rsshub/package.nix @@ -4,34 +4,29 @@ makeBinaryWrapper, nodejs, pnpm, + replaceVars, stdenv, - substitute, }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2024-07-08"; + version = "0-unstable-2024-09-16"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "6a29ca395191e745f991b9a0643a2fa9a66c8730"; - hash = "sha256-K7qNPF1vdqhNEjWcysnj20Qaltu3rnhi1bVnIEOTiuk="; + rev = "6de50fb35dbdb93be43f315a8c2651e90c5195a9"; + hash = "sha256-fxkK1prrKfAmB5yqiOKdLPeJp/hO07KJNHLnYSQGPNE="; }; patches = [ - (substitute { - src = ./0001-fix-git-hash.patch; - substitutions = [ - "--subst-var-by" - "GIT_HASH" - finalAttrs.src.rev - ]; + (replaceVars ./0001-fix-git-hash.patch { + "GIT_HASH" = finalAttrs.src.rev; }) ]; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-1Djef4QRLiEKr6ERtL0/IQSYp9dMq3cOCHPW4QnfaZU="; + hash = "sha256-+tlBJGJTkxjsXS0zj6rsn2j4FIQNh70gj8pVdOa3mlU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/rt/rtl_fm_streamer/package.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtl_fm_streamer/package.nix index 3e3fcde3b5..beb4568650 100644 --- a/third_party/nixpkgs/pkgs/by-name/rt/rtl_fm_streamer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rt/rtl_fm_streamer/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "INSTALL_UDEV_RULES" stdenv.isLinux) + (lib.cmakeBool "INSTALL_UDEV_RULES" stdenv.hostPlatform.isLinux) ]; meta = { @@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/AlbrechtL/rtl_fm_streamer"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ doronbehar ]; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix index e764b2300d..344dce7755 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.56"; + version = "0.0.57"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-L5bfGW5R9kDCK8zcFh+a/zquJefwKxOB0JdYDTyPFuQ="; + hash = "sha256-w9NNdsDD+YLrCw8DHDhVx62MdwLhcN8QSmb/2rqlb5g="; }; postPatch = '' @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { ]; # fails in linux sandbox - doCheck = stdenv.isDarwin; + doCheck = stdenv.hostPlatform.isDarwin; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock index 02d1a20d7c..ba39c92020 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock @@ -161,6 +161,21 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "assert_fs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + [[package]] name = "autocfg" version = "1.2.0" @@ -240,6 +255,9 @@ name = "camino" version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] [[package]] name = "cast" @@ -722,6 +740,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.10.7" @@ -773,6 +797,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + [[package]] name = "drop_bomb" version = "0.1.5" @@ -968,6 +998,17 @@ dependencies = [ "regex-syntax 0.8.3", ] +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + [[package]] name = "half" version = "2.4.1" @@ -1864,6 +1905,33 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "pretty_assertions" version = "1.4.0" @@ -2015,9 +2083,7 @@ dependencies = [ "countme", "hashbrown", "insta", - "once_cell", "ordermap", - "path-slash", "ruff_db", "ruff_index", "ruff_python_ast", @@ -2026,6 +2092,7 @@ dependencies = [ "ruff_python_stdlib", "ruff_source_file", "ruff_text_size", + "ruff_vendored", "rustc-hash 2.0.0", "salsa", "smallvec", @@ -2034,8 +2101,6 @@ dependencies = [ "test-case", "thiserror", "tracing", - "walkdir", - "zip", ] [[package]] @@ -2091,6 +2156,7 @@ dependencies = [ "ruff_db", "ruff_python_ast", "ruff_text_size", + "ruff_vendored", "rustc-hash 2.0.0", "salsa", "tempfile", @@ -2187,10 +2253,11 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.5" +version = "0.6.7" dependencies = [ "anyhow", "argfile", + "assert_fs", "bincode", "bitflags 2.6.0", "cachedir", @@ -2200,7 +2267,9 @@ dependencies = [ "clearscreen", "colored", "filetime", + "globwalk", "ignore", + "indoc", "insta", "insta-cmd", "is-macro", @@ -2212,7 +2281,9 @@ dependencies = [ "rayon", "regex", "ruff_cache", + "ruff_db", "ruff_diagnostics", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_notebook", @@ -2295,6 +2366,7 @@ dependencies = [ "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "serde", "tempfile", "thiserror", "tracing", @@ -2370,6 +2442,26 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "ruff_graph" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "once_cell", + "red_knot_python_semantic", + "ruff_cache", + "ruff_db", + "ruff_linter", + "ruff_macros", + "ruff_python_ast", + "ruff_python_parser", + "salsa", + "schemars", + "serde", + "zip", +] + [[package]] name = "ruff_index" version = "0.0.0" @@ -2380,7 +2472,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.5" +version = "0.6.7" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2698,9 +2790,20 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "ruff_vendored" +version = "0.0.0" +dependencies = [ + "once_cell", + "path-slash", + "ruff_db", + "walkdir", + "zip", +] + [[package]] name = "ruff_wasm" -version = "0.6.5" +version = "0.6.7" dependencies = [ "console_error_panic_hook", "console_log", @@ -2743,6 +2846,7 @@ dependencies = [ "regex", "ruff_cache", "ruff_formatter", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_python_ast", @@ -3197,6 +3301,12 @@ dependencies = [ "phf_codegen", ] +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + [[package]] name = "test-case" version = "3.3.1" diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix index 79c70c88f6..67099b3ecd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-1V95S0FWHzCxztgip+rbCjji4O71D+QdcSZ/hbABeKg="; + hash = "sha256-1udxvl98RveGJmnG8kwlecWD9V+BPadA/YE8jbt9jNo="; }; cargoLock = { @@ -31,18 +31,11 @@ rustPlatform.buildRustPackage rec { }; }; - # Revert the change made in https://github.com/astral-sh/ruff/pull/13299 - # It was causing linking issues: https://github.com/NixOS/nixpkgs/pull/341674#issuecomment-2351172084 - postPatch = '' - substituteInPlace crates/ruff_benchmark/Cargo.toml \ - --replace-fail '"unprefixed_malloc_on_supported_platforms"' ' ' - ''; - nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ @@ -60,7 +53,7 @@ rustPlatform.buildRustPackage rec { # Failing on darwin for an unclear reason. # According to the maintainers, those tests are from an experimental crate that isn't actually # used by ruff currently and can thus be safely skipped. - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=changed_file" "--skip=changed_metadata" "--skip=changed_versions_file" diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rush-parallel/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rush-parallel/package.nix new file mode 100644 index 0000000000..930eab157e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ru/rush-parallel/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "rush-parallel"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "shenwei356"; + repo = "rush"; + rev = "v${version}"; + hash = "sha256-u3KGjZ5C8jDuAKE/dy4zR+EEFb35aJtj2YkwIb+kad4="; + }; + + vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "A cross-platform command-line tool for executing jobs in parallel"; + homepage = "https://github.com/shenwei356/rush"; + changelog = "https://github.com/shenwei356/rush/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kranzes ]; + mainProgram = "rush-parallel"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index cb2a54f8a6..406c1525a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -224,7 +224,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" +source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" dependencies = [ "clipboard-win", "core-graphics 0.23.2", @@ -860,6 +860,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -3037,7 +3043,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" +source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" dependencies = [ "bindgen 0.59.2", "cc", @@ -3959,11 +3965,23 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", "memoffset 0.9.1", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", + "libc", +] + [[package]] name = "nom" version = "7.1.3" @@ -5179,7 +5197,7 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" +source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", @@ -5454,7 +5472,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.0" +version = "1.3.1" dependencies = [ "android-wakelock", "android_logger", @@ -5486,6 +5504,7 @@ dependencies = [ "flutter_rust_bridge", "fon", "fruitbasket", + "gtk", "hbb_common", "hex", "hound", @@ -5500,6 +5519,7 @@ dependencies = [ "libpulse-simple-binding", "mac_address", "magnum-opus", + "nix 0.29.0", "num_cpus", "objc", "objc_id", @@ -5531,6 +5551,7 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "termios", "totp-rs", "tray-icon", "url", @@ -5551,7 +5572,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.0" +version = "1.3.1" dependencies = [ "brotli", "dirs 5.0.1", diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix index aa403cc04b..2dd1b134ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -1,32 +1,35 @@ -{ lib -, clangStdenv -, cargo -, copyDesktopItems -, fetchFromGitHub -, flutter316 -, ffmpeg -, gst_all_1 -, fuse3 -, libXtst -, libaom -, libopus -, libpulseaudio -, libva -, libvdpau -, libvpx -, libxkbcommon -, libyuv -, pam -, makeDesktopItem -, rustPlatform -, rustc -, rustfmt -, xdotool -}: let +{ + lib, + clangStdenv, + cargo, + copyDesktopItems, + fetchFromGitHub, + flutter319, + ffmpeg, + gst_all_1, + fuse3, + libXtst, + libaom, + libopus, + libpulseaudio, + libva, + libvdpau, + libvpx, + libxkbcommon, + libyuv, + pam, + makeDesktopItem, + rustPlatform, + libayatana-appindicator, + rustc, + rustfmt, + xdotool, +}: +let flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.0/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.1/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -36,20 +39,24 @@ }; cargoHash = "sha256-dDyiptG9TKes+fXx2atwx697SWH7Rltx6xVubtTn7FM="; - cargoBuildFlags = [ "--package" "flutter_rust_bridge_codegen" ]; + cargoBuildFlags = [ + "--package" + "flutter_rust_bridge_codegen" + ]; doCheck = false; }; sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary; -in flutter316.buildFlutterApplication rec { +in +flutter319.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; + hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; }; strictDeps = true; @@ -57,7 +64,7 @@ in flutter316.buildFlutterApplication rec { # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.0/flutter/pubspec.lock | yq > pubspec.lock.json + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.1/flutter/pubspec.lock | yq > pubspec.lock.json pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; @@ -76,34 +83,34 @@ in flutter316.buildFlutterApplication rec { # and fixing the resulting errors by removing the other registry deps. lockFile = ./Cargo.lock; outputHashes = { - "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; - "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; - "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; - "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; - "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; - "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; - "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; - "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; - "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; - "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; - "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; - "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; - "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; - "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; - "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; - "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; - "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; - "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; - "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; - "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; - "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; - "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; - "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; - "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; + "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; + "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; + "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; + "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; + "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; + "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; + "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; + "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; + "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; + "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; + "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; + "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; + "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; + "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; + "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; + "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; + "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; + "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; + "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; + "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; + "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; + "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; + "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; + "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; + "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; + "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; + "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; }; }; dontCargoBuild = true; @@ -147,11 +154,17 @@ in flutter316.buildFlutterApplication rec { prePatch = '' chmod -R +w .. ''; - patchFlags = [ "-p1" "-d" ".." ]; + patchFlags = [ + "-p1" + "-d" + ".." + ]; patches = [ ./make-build-reproducible.patch ]; postPatch = '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1" substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" "" # The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version cp ${./Cargo.lock} ../Cargo.lock @@ -159,7 +172,7 @@ in flutter316.buildFlutterApplication rec { ''; preBuild = '' - # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84¶ + # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 sed -i 's/static=//g' /build/cargo-vendor-dir/hwcodec-*/build.rs # Build the Flutter/Rust bridge bindings @@ -187,7 +200,6 @@ in flutter316.buildFlutterApplication rec { mkdir -p $out/share/polkit-1/actions $out/share/icons/hicolor/{256x256,scalable}/apps cp ../res/128x128@2x.png $out/share/icons/hicolor/256x256/apps/rustdesk.png cp ../res/scalable.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg - cp ../res/com.rustdesk.RustDesk.policy $out/share/polkit-1/actions/ ''; desktopItems = [ @@ -201,7 +213,11 @@ in flutter316.buildFlutterApplication rec { terminal = false; type = "Application"; startupNotify = true; - categories = [ "Network" "RemoteAccess" "GTK" ]; + categories = [ + "Network" + "RemoteAccess" + "GTK" + ]; keywords = [ "internet" ]; actions.new-window = { name = "Open a New Window"; diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index a077b29673..a0a7ad0d80 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -473,6 +473,26 @@ "source": "git", "version": "0.0.1+1" }, + "extended_text": { + "dependency": "direct main", + "description": { + "name": "extended_text", + "sha256": "7f382de3af12992e34bd72ddd36becf90c4720900af126cb9859f0189af71ffe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.0" + }, + "extended_text_library": { + "dependency": "transitive", + "description": { + "name": "extended_text_library", + "sha256": "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.0" + }, "external_path": { "dependency": "direct main", "description": { @@ -633,8 +653,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "38951317afe79d953ab25733667bd96e172a80d3", - "resolved-ref": "38951317afe79d953ab25733667bd96e172a80d3", + "ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", + "resolved-ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", "url": "https://github.com/rustdesk-org/flutter_gpu_texture_renderer" }, "source": "git", @@ -2013,7 +2033,7 @@ } }, "sdks": { - "dart": ">=3.2.0 <4.0.0", - "flutter": ">=3.16.0" + "dart": ">=3.3.0 <4.0.0", + "flutter": ">=3.19.0" } } diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix index 5b838d39cf..b038c6c383 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix @@ -106,7 +106,7 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildFeatures = lib.optionals stdenv.isLinux [ "linux-pkg-config" ]; + buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "linux-pkg-config" ]; # Checks require an active X server doCheck = false; @@ -136,7 +136,7 @@ rustPlatform.buildRustPackage rec { zlib zstd ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -149,7 +149,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ] ) - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xdotool ]; @@ -161,7 +161,7 @@ rustPlatform.buildRustPackage rec { # .so needs to be next to the executable mv $out/bin/rustdesk $out/lib/rustdesk - ${lib.optionalString stdenv.isLinux "ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk"} + ${lib.optionalString stdenv.hostPlatform.isLinux "ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk"} makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \ --chdir "$out/share" @@ -171,7 +171,7 @@ rustPlatform.buildRustPackage rec { install -Dm0644 $src/res/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --add-rpath "${libayatana-appindicator}/lib" "$out/lib/rustdesk/rustdesk" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rusti-cal/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rusti-cal/package.nix index 97b5e10731..f03783cbc5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rusti-cal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rusti-cal/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5eS+OMaNAVNyDMKFNfb0J0rLsikw2LCXhWk7MS9UV2k="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix index 2578991fc8..14f1c30ace 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustlings/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustlings/package.nix index b66d2ced7e..2d05eee496 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustlings/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustlings/package.nix @@ -36,7 +36,9 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; [ CoreServices ] + ); postFixup = '' wrapProgram $out/bin/rustlings --suffix PATH : ${ diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustls-ffi/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustls-ffi/package.nix index 015a3b9a72..e5317b40b7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustls-ffi/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gDQ9AFrJuV7SrzKCAHQBkKj6clXuPLO0DHhnvcBqRLs="; }; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ cargo rustPlatform.cargoSetupHook cargo-c validatePkgConfig ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustmission/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustmission/package.nix index 8e8a21d859..241a0b71dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustmission/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustmission/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock index e1a1be7c98..1d828aa7ae 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ry/rye/Cargo.lock @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.39.0" +version = "0.40.0" dependencies = [ "age", "anyhow", diff --git a/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix b/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix index 3719ae8988..7a6f0c18d2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ry/rye/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-qDXD5vNoIppe1EWKxr1tssgAelEKoMdZ/y7Dq979PwI="; + hash = "sha256-EfmHCjDwpnxkKCxX1clFp1HxzlnJYkWscLMPonhOXOA="; }; cargoLock = { @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk; [ frameworks.CoreServices @@ -85,11 +85,13 @@ rustPlatform.buildRustPackage rec { "--skip=test_config_show_path" "--skip=test_dotenv" "--skip=test_empty_sync" + "--skip=test_exclude_hashes" "--skip=test_fetch" "--skip=test_init_default" "--skip=test_init_lib" "--skip=test_init_script" "--skip=test_lint_and_format" + "--skip=test_list_never_overwrite" "--skip=test_list_not_rye_managed" "--skip=test_publish_outside_project" "--skip=test_version" diff --git a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix index 46385a0c82..11d2281a2e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix @@ -19,13 +19,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1385"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1398"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "ca59c3f4998e2d1beb3b0d0214611e3332238557"; - hash = "sha256-pLE8UUH4BzYyR3pqyUwQ112vBOump0wKyZaKwE131yY="; + rev = "319507f2a12a6751f3ab833e498a3efd3119f806"; + hash = "sha256-3DM/kahNhl8EhSIRuqH0trYoR51OrGxSE+GuOKxKr2c="; }; enableParallelBuilding = false; diff --git a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/updater.sh b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/updater.sh index 74b2916400..bf6a41aa3e 100755 --- a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/updater.sh +++ b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/updater.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts nix-prefetch-git jq +# shellcheck shell=bash set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -68,9 +69,10 @@ cd ../../../.. if [[ "${1-default}" != "--deps-only" ]]; then SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" - update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" + SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA") + update-source-version ryujinx "$NEW_VERSION" "$SRI" --rev="$COMMIT" fi echo "building Nuget lockfile" -$(nix-build -A ryujinx.fetch-deps --no-out-link) +eval "$(nix-build -A ryujinx.fetch-deps --no-out-link)" diff --git a/third_party/nixpkgs/pkgs/by-name/s3/s3proxy/package.nix b/third_party/nixpkgs/pkgs/by-name/s3/s3proxy/package.nix index 72f18af79c..d24f3728da 100644 --- a/third_party/nixpkgs/pkgs/by-name/s3/s3proxy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/s3/s3proxy/package.nix @@ -21,7 +21,7 @@ maven.buildMavenPackage { hash = "sha256-GhZPvo8wlXInHwg8rSmpwMMkZVw5SMpnZyKqFUYLbrE="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/s3/s3scanner/package.nix b/third_party/nixpkgs/pkgs/by-name/s3/s3scanner/package.nix index b28c021240..dde1360b2b 100644 --- a/third_party/nixpkgs/pkgs/by-name/s3/s3scanner/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/s3/s3scanner/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "s3scanner"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "sa7mon"; repo = "s3scanner"; rev = "v${version}"; - hash = "sha256-yQymMtXQam/PMNZMBeKWtDtdrFikjvE/Nh5K61NUaYI="; + hash = "sha256-RS/+m/snJIm8OxCgvh/Bn1u9ghvRgS8tYvy1v1DV02I="; }; ldflags = [ "-s -w" ]; - vendorHash = "sha256-Y7eIvZIUtp+sOENiaG/eliZEl41qTHN2k3vJCXsjlIw="; + vendorHash = "sha256-Ik5B01QnbhFQISAY3Bdb1g85Din+Ifcg1vbGZcbb1OY="; # Requires networking doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/saga/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/saga/package.nix index 43af7ef6b6..ae4670a002 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/saga/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/saga/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa unixODBC poppler @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.isDarwin)) + (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin)) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/sa/salmon/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/salmon/package.nix index 09a2fec4c2..bfc12deedd 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/salmon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/salmon/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { tbb_2021_11 xz zlib - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sanjuuni/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sanjuuni/package.nix index 2317149414..f8577d3b8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/sanjuuni/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/sanjuuni/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}"; maintainers = [ maintainers.tomodachi94 ]; license = licenses.gpl2Plus; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sanjuuni"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix index 0aab71d6c3..5fa852a6d1 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.20"; + version = "1.0.21"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-9F/YU3APIVNCzHbAl0zL5+wqUP/VnzeYhj6SppwkbvI="; + hash = "sha256-zoTZ0JwkV6zaKHw1PegzE6NiGGVptBZgCgD8O9ZHHGc="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sarif-fmt/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarif-fmt/package.nix index 37e59c4a33..6e3a236ed4 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/sarif-fmt/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin # error[E0463]: can't find crate for profiler_builtins - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # these tests use nix so...no go diff --git a/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix index 7ffc14ec81..587df043f0 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-jimq+Dx3RoJmnUDcfCkgE6Hk7OvPH/fs1v/Nri8Xtz8="; + hash = "sha256-oMFS5eNNzCpaineCLn0hh3bXGw3SNdj+Pdvk3pevIZg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sb/sby/package.nix b/third_party/nixpkgs/pkgs/by-name/sb/sby/package.nix index d623f732d2..0390df3e05 100644 --- a/third_party/nixpkgs/pkgs/by-name/sb/sby/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sb/sby/package.nix @@ -10,7 +10,6 @@ z3, aiger, btor2tools, - python3Packages, nix-update-script, }: diff --git a/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix index 95908de6e1..081cee9a23 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/schemamap/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk; [ frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scrcpy/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scrcpy/package.nix index 06779e7c76..0deceb3f8c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/scrcpy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/scrcpy/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # runtime dep on `adb` to push the server wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/scrcpy-console.desktop \ --replace "/bin/bash" "${runtimeShell}" ''; diff --git a/third_party/nixpkgs/pkgs/by-name/sc/screen-pipe/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/screen-pipe/package.nix index b851c49a58..141eca8d82 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/screen-pipe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/screen-pipe/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_12_3.frameworks; [ CoreAudio @@ -65,12 +65,12 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ] ) - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xorg.libxcb ]; - buildFeatures = lib.optional stdenv.isDarwin "metal"; + buildFeatures = lib.optional stdenv.hostPlatform.isDarwin "metal"; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix index 9cc2cd511e..b93266bbdc 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scs/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scs/package.nix index 49911355e2..1ba3eb5912 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/scs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/scs/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace "gcc" "cc" ''; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ blas diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL1/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL1/package.nix index 7abff886d5..bd793b5885 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL1/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL1/package.nix @@ -16,11 +16,11 @@ , pkg-config , stdenv # Boolean flags -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid , libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL , openglSupport ? libGLSupported -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio -, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio +, x11Support ? !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isAndroid }: # NOTE: When editing this expression see if the same change applies to @@ -30,13 +30,13 @@ let inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; extraPropagatedBuildInputs = [ ] ++ lib.optionals x11Support [ libXext libICE libXrandr ] - ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL ] + ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux) [ libGL ] # libGLU doesn’t work with Android's SDL - ++ lib.optionals (openglSupport && stdenv.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ] - ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] + ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ] + ++ lib.optionals (openglSupport && stdenv.hostPlatform.isDarwin) [ OpenGL GLUT ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; in stdenv.mkDerivation (finalAttrs: { pname = "SDL"; @@ -51,14 +51,14 @@ stdenv.mkDerivation (finalAttrs: { outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isLinux libcap; + ++ lib.optional stdenv.hostPlatform.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; buildInputs = [ ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW && alsaSupport) [ audiofile ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; configureFlags = [ "--disable-oss" @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) # # Please try revert the change that introduced this comment when updating SDL. - ] ++ lib.optional stdenv.isDarwin "--disable-x11-shared" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-x11-shared" ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" ++ lib.optional stdenv.hostPlatform.isMusl "CFLAGS=-DICONV_INBUF_NONCONST"; diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_Pango/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_Pango/package.nix index 9fbee142d6..755c0a1af4 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_Pango/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_Pango/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 freetype pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_gfx/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_gfx/package.nix index d74d859fef..b5a68c23e4 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_gfx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_gfx/package.nix @@ -7,7 +7,7 @@ testers, # Boolean flags enableMmx ? stdenv.hostPlatform.isx86, - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_image/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_image/package.nix index 2af81bd18c..19028ab115 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_image/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_image/package.nix @@ -14,7 +14,7 @@ zlib, # Boolean flags ## Darwin headless will hang when trying to run the SDL test program - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp zlib - ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; configureFlags = [ # Disable dynamically loaded dependencies @@ -52,9 +52,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "tif-shared") (lib.enableFeature false "webp-shared") (lib.enableFeature enableSdltest "sdltest") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Don't use native macOS frameworks - # Caution: do not set this as (!stdenv.isDarwin) since it would be true + # Caution: do not set this as (!stdenv.hostPlatform.isDarwin) since it would be true # outside Darwin - and ImageIO does not exist outisde Darwin (lib.enableFeature false "imageio") ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix index 976dc2f5fa..bd2894f558 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -15,8 +15,8 @@ stdenv, timidity, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), - enableSmpegtest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), + enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: let @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AudioUnit CoreServices diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix index 0214e2cd5b..0325e6aa4c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix @@ -6,7 +6,7 @@ pkg-config, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_sound/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_sound/package.nix index d67db20695..46517c42cb 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_sound/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_sound/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; buildInputs = [ SDL2 flac libmikmod libvorbis timidity ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox CoreAudio ]; meta = with lib; { description = "SDL2 sound library"; diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_ttf/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_ttf/package.nix index 140c104bcb..dcc5fee21f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_ttf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_ttf/package.nix @@ -10,7 +10,7 @@ stdenv, testers, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { @@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: { freetype harfbuzz ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_Pango/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_Pango/package.nix index 8c4160d986..78e5d40d0a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_Pango/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_Pango/package.nix @@ -8,7 +8,7 @@ pkg-config, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_compat/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_compat/package.nix index a2ac5f6d28..ac7d8ff68b 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_compat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_compat/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; propagatedBuildInputs = [ SDL2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_gfx/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_gfx/package.nix index 558e1943a1..5677d62b7b 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_gfx/package.nix @@ -4,7 +4,7 @@ fetchurl, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix index ce6824b09d..fdd0b5f373 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_image/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "png-shared") (lib.enableFeature false "tif-shared") (lib.enableFeature false "webp-shared") - (lib.enableFeature (!stdenv.isDarwin) "sdltest") + (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest") ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_mixer/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_mixer/package.nix index 470bd5559d..84af162a73 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_mixer/package.nix @@ -12,8 +12,8 @@ stdenv, # Boolean flags enableNativeMidi ? false, - enableSdltest ? (!stdenv.isDarwin), - enableSmpegtest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), + enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_net/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_net/package.nix index 4d45ff624e..369f956fdf 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_net/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_net/package.nix @@ -5,7 +5,7 @@ pkg-config, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin) + enableSdltest ? (!stdenv.hostPlatform.isDarwin) }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_sound/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_sound/package.nix index b5e93b3efd..e2fd8000c5 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_sound/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_sound/package.nix @@ -7,7 +7,7 @@ libvorbis, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin) + enableSdltest ? (!stdenv.hostPlatform.isDarwin) }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL_ttf/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL_ttf/package.nix index a44aeaa7f0..bd40d331b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL_ttf/package.nix @@ -6,7 +6,7 @@ freetype, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix index 47b6e2c16c..4877804ef8 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1CPUOAfBfUeZt5S8t5SM3oyrNwXKHplhHG5idVy4YrE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix index e355dd99f3..ea5d670af8 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U2/GUpWtpTX+RCBojh3N6DsWB0gjFkH1mGA+AS+fH+o="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ SystemConfiguration ] diff --git a/third_party/nixpkgs/pkgs/by-name/se/sequoia-sq/package.nix b/third_party/nixpkgs/pkgs/by-name/se/sequoia-sq/package.nix index 4183e23528..450113dda7 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/sequoia-sq/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/sequoia-sq/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sq"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; rev = "v${version}"; - hash = "sha256-D22ECJvbGbnyvusWXfU5F1aLF/ETuMyhAStT5HPWR2U="; + hash = "sha256-Zzk7cQs5zD+houNjK8s3tP9kZ2/eAUV/OE3/GrNAXk8="; }; - cargoHash = "sha256-jFpqZKyRCMkMtOezsYJy3Fy1WXUPyn709wZxuwKlSYI="; + cargoHash = "sha256-Ou+YKfEOmMTZVg9unqoOibMQYsdNAYTq4ZoOANLRk2Y="; nativeBuildInputs = [ pkg-config @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite nettle - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); checkFlags = [ # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/297 diff --git a/third_party/nixpkgs/pkgs/by-name/se/sequoia-wot/package.nix b/third_party/nixpkgs/pkgs/by-name/se/sequoia-wot/package.nix index d95066972c..09ae4d8bd9 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/sequoia-wot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/sequoia-wot/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration # See comment near sequoia-openpgp/crypto- buildFeatures ] ++ lib.optionals (!stdenv.targetPlatform.isWindows) [ diff --git a/third_party/nixpkgs/pkgs/by-name/se/serie/package.nix b/third_party/nixpkgs/pkgs/by-name/se/serie/package.nix index 516756d12c..e59723c24e 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/serie/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/serie/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-HxIyWlFKDRod5nSENZguNYz/vn+E9Ux0K3dMhX7I/zQ="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreGraphics diff --git a/third_party/nixpkgs/pkgs/by-name/se/servo/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/se/servo/Cargo.lock new file mode 100644 index 0000000000..754f6fdf97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/servo/Cargo.lock @@ -0,0 +1,8766 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accountable-refcell" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e2bba6f21fcf0ae382750eb6d9387c42807761fa7329d3a05fcd1334e8c3f2" +dependencies = [ + "backtrace", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.6.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" + +[[package]] +name = "android_logger" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826" +dependencies = [ + "android_log-sys", + "env_filter", + "log", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "app_units" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a46058e45b48cf55b729e4ae34007fa904ea70cfcf2a0fa21dacf1441e521c" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "arboard" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +dependencies = [ + "clipboard-win", + "core-graphics", + "image", + "log", + "objc", + "objc-foundation", + "objc_id", + "parking_lot", + "thiserror", + "windows-sys 0.48.0", + "x11rb", +] + +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "tokio", + "tokio-rustls", + "tungstenite", + "webpki-roots", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomic_refcell" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "background_hang_monitor" +version = "0.0.1" +dependencies = [ + "background_hang_monitor_api", + "backtrace", + "base", + "crossbeam-channel", + "ipc-channel", + "libc", + "log", + "mach2", + "nix", + "serde_json", + "unwind-sys", +] + +[[package]] +name = "background_hang_monitor_api" +version = "0.0.1" +dependencies = [ + "base", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "parking_lot", + "serde", + "size_of_test", + "webrender_api", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base" +version = "0.0.1" +dependencies = [ + "crossbeam-channel", + "ipc-channel", + "libc", + "mach2", + "malloc_size_of", + "malloc_size_of_derive", + "parking_lot", + "serde", + "size_of_test", + "time 0.3.36", + "webrender_api", + "windows-sys 0.59.0", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.10.5", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "bluetooth" +version = "0.0.1" +dependencies = [ + "bitflags 2.6.0", + "bluetooth_traits", + "blurdroid", + "blurmac", + "blurmock", + "blurz", + "embedder_traits", + "ipc-channel", + "log", + "servo_config", + "servo_rand", + "uuid", +] + +[[package]] +name = "bluetooth_traits" +version = "0.0.1" +dependencies = [ + "embedder_traits", + "ipc-channel", + "regex", + "serde", +] + +[[package]] +name = "blurdroid" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b23557dd27704797128f9db2816416bef20dad62d4a9768714eeb65f07d296" + +[[package]] +name = "blurmac" +version = "0.1.0" +dependencies = [ + "log", + "objc", +] + +[[package]] +name = "blurmock" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c150fd617830fd121919bbd500a784507e8af1bae744efcf587591c65c375d4" +dependencies = [ + "hex", +] + +[[package]] +name = "blurz" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6dae8337ff67fe8ead29a28a0115605753e6a5205d4b6017e9f42f198c3c50a" +dependencies = [ + "dbus", + "hex", +] + +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "build-parallel" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb" +dependencies = [ + "crossbeam-utils", + "jobserver", + "num_cpus", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-slice-cast" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "calendrical_calculations" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec493b209a1b81fa32312d7ceca1b547d341c7b5f16a3edbf32b1d8b455bbdf" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "canvas" +version = "0.0.1" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "byteorder", + "canvas_traits", + "crossbeam-channel", + "cssparser", + "euclid", + "fnv", + "font-kit", + "fonts", + "half", + "ipc-channel", + "log", + "lyon_geom", + "net_traits", + "num-traits", + "parking_lot", + "pathfinder_geometry", + "pixels", + "range", + "raqote", + "servo_arc", + "sparkle", + "style", + "style_traits", + "surfman", + "unicode-script", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", + "webxr-api", +] + +[[package]] +name = "canvas_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "euclid", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "pixels", + "serde", + "serde_bytes", + "servo_config", + "sparkle", + "style", + "webrender_api", + "webxr-api", +] + +[[package]] +name = "cc" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clang-sys" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a483f3cbf7cec2e153d424d0e92329d816becc6421389bd494375c6065921b9b" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "compiletest_rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0f4b0a27f9efcea6a012305682f0f7c5691df7097b9eaf6abb50b75c89a8af" +dependencies = [ + "diff", + "filetime", + "getopts", + "lazy_static", + "libc", + "log", + "miow", + "regex", + "rustfix", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "tester", + "winapi", +] + +[[package]] +name = "compositing" +version = "0.0.1" +dependencies = [ + "base", + "canvas", + "compositing_traits", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "gleam", + "image", + "ipc-channel", + "keyboard-types", + "libc", + "log", + "net", + "net_traits", + "pixels", + "profile_traits", + "script_traits", + "servo-media", + "servo_config", + "servo_geometry", + "servo_url", + "style_traits", + "surfman", + "time 0.1.45", + "tracing", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", +] + +[[package]] +name = "compositing_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fonts_traits", + "ipc-channel", + "keyboard-types", + "log", + "pixels", + "script_traits", + "servo_url", + "style_traits", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "constellation" +version = "0.0.1" +dependencies = [ + "background_hang_monitor", + "background_hang_monitor_api", + "backtrace", + "base", + "bluetooth_traits", + "canvas_traits", + "compositing_traits", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "euclid", + "fonts", + "fonts_traits", + "gaol", + "http", + "ipc-channel", + "keyboard-types", + "log", + "media", + "net", + "net_traits", + "parking_lot", + "profile_traits", + "script_layout_interface", + "script_traits", + "serde", + "servo_config", + "servo_rand", + "servo_url", + "style_traits", + "tracing", + "webgpu", + "webrender", + "webrender_api", + "webrender_traits", + "webxr-api", +] + +[[package]] +name = "content-security-policy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7225464dae1993d0045c023d0975f44d63337f35f85faddb998ff9abdfcd0f" +dependencies = [ + "base64", + "bitflags 2.6.0", + "once_cell", + "percent-encoding", + "regex", + "serde", + "sha2", + "url", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "time 0.3.36", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "time 0.3.36", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crown" +version = "0.0.1" +dependencies = [ + "compiletest_rs", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf 0.11.2", + "serde", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "dbus" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[package]] +name = "deny_public_fields" +version = "0.0.1" +dependencies = [ + "syn", + "synstructure", +] + +[[package]] +name = "deny_public_fields_tests" +version = "0.0.1" +dependencies = [ + "deny_public_fields", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_common" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "devtools" +version = "0.0.1" +dependencies = [ + "base", + "chrono", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "headers", + "http", + "ipc-channel", + "log", + "serde", + "serde_json", + "servo_config", + "servo_rand", + "servo_url", + "uuid", +] + +[[package]] +name = "devtools_traits" +version = "0.0.1" +dependencies = [ + "base", + "bitflags 2.6.0", + "http", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "servo_url", + "time 0.1.45", + "uuid", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "diplomat" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3137c640d2bac491dbfca7f9945c948f888dd8c95bdf7ee6b164fbdfa5d3efc2" +dependencies = [ + "diplomat_core", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "diplomat-runtime" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f9efe348e178ba77b6035bc6629138486f8b461654e7ac7ad8afaa61bd4d98" +dependencies = [ + "log", +] + +[[package]] +name = "diplomat_core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7aca1d8f9e7b73ad61785beedc9556ad79f84b15c15abaa7041377e42284c1" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "serde", + "smallvec", + "strck_ident", + "syn", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] +name = "dom" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "dom_struct" +version = "0.0.1" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "domobject_derive" +version = "0.0.1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dwrote" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", +] + +[[package]] +name = "ecolor" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" +dependencies = [ + "bytemuck", + "emath", +] + +[[package]] +name = "egui" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" +dependencies = [ + "ahash", + "emath", + "epaint", + "log", + "nohash-hasher", +] + +[[package]] +name = "egui-winit" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4e066af341bf92559f60dbdf2020b2a03c963415349af5f3f8d79ff7a4926" +dependencies = [ + "ahash", + "arboard", + "egui", + "log", + "raw-window-handle", + "smithay-clipboard", + "web-time", + "winit", +] + +[[package]] +name = "egui_glow" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2bdc8b38cfa17cc712c4ae079e30c71c00cd4c2763c9e16dc7860a02769103" +dependencies = [ + "ahash", + "bytemuck", + "egui", + "egui-winit", + "glow 0.13.1", + "log", + "memoffset", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "emath" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "embedder_traits" +version = "0.0.1" +dependencies = [ + "base", + "cfg-if", + "crossbeam-channel", + "ipc-channel", + "keyboard-types", + "log", + "num-derive", + "num-traits", + "serde", + "servo_url", + "webrender_api", + "webxr-api", +] + +[[package]] +name = "encoding_c" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af727805f3b0d79956bde5b35732669fb5c5d45a94893798e7b7e70cfbf9cc1" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "encoding_c_mem" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a80a16821fe8c7cab96e0c67b57cd7090e021e9615e6ce6ab0cf866c44ed1f0" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "epaint" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "log", + "nohash-hasher", + "parking_lot", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "etagere" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" +dependencies = [ + "euclid", + "serde", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.7.4", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox 0.1.3", + "windows-sys 0.59.0", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0febbeb1118a9ecdee6e4520ead6b54882e843dd0592ad233247dbee84c53db8" +dependencies = [ + "displaydoc", + "ryu", + "smallvec", + "writeable", +] + +[[package]] +name = "fixedbitset" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "float-ord" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-kit" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "dirs", + "dwrote", + "float-ord", + "freetype-sys", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "walkdir", + "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fonts" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "crossbeam-channel", + "cssparser", + "dwrote", + "euclid", + "fnv", + "fonts_traits", + "fontsan", + "freetype-sys", + "harfbuzz-sys", + "ipc-channel", + "itertools 0.13.0", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "net_traits", + "parking_lot", + "range", + "serde", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "smallvec", + "style", + "surfman", + "truetype", + "unicode-bidi", + "unicode-properties", + "unicode-script", + "url", + "webrender_api", + "webrender_traits", + "xi-unicode", + "xml-rs", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fonts_traits" +version = "0.0.1" +dependencies = [ + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "range", + "serde", + "webrender_api", +] + +[[package]] +name = "fontsan" +version = "0.5.2" +source = "git+https://github.com/servo/fontsan#8fbc406506cfd1f8ab60e625d1e926a0e72e1d8a" +dependencies = [ + "cc", + "glob", + "libc", + "miniz-sys", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freetype" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a440748e063798e4893ceb877151e84acef9bea9a8c6800645cf3f1b3a7806e" +dependencies = [ + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gaol" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061957ca7a966a39a79ebca393a9a6c7babda10bf9dd6f11d00041558d929c22" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gilrs" +version = "0.10.6" +source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +dependencies = [ + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", +] + +[[package]] +name = "gilrs-core" +version = "0.5.12" +source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +dependencies = [ + "core-foundation", + "inotify", + "io-kit-sys", + "js-sys", + "libc", + "libudev-sys", + "log", + "nix", + "uuid", + "vec_map", + "wasm-bindgen", + "web-sys", + "windows 0.48.0", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys 0.52.0", +] + +[[package]] +name = "git2" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +dependencies = [ + "bitflags 2.6.0", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "gleam" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0173481f2bb6e809bf4985de2e86c83876d84d2805830e3301cd37355e897f0f" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glib" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glow" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glslopt" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913662ae8335df058d56e00f11340b20fa82e03e0276587797ef325ab01e50d4" +dependencies = [ + "cc", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gobject-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +dependencies = [ + "log", + "presser", + "thiserror", + "windows 0.58.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gstreamer" +version = "0.22.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0b90646bb67fccf80d228f5333f2a0745526818ccefbf5a97326c76d30e4d" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools 0.13.0", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-app" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1363313eb1931d66ac0b82c9b477fdd066af9dc118ea844966f85b6d99f261fd" +dependencies = [ + "futures-core", + "futures-sink", + "glib", + "gstreamer", + "gstreamer-app-sys", + "gstreamer-base", + "libc", +] + +[[package]] +name = "gstreamer-app-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed667453517b47754b9f9d28c096074e5d565f1cc48c6fa2483b1ea10d7688d3" +dependencies = [ + "glib-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-audio" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cae69bbfce34108009117803fb808b1ef4d88d476c9e3e2f5f536aab1f6ae75" +dependencies = [ + "cfg-if", + "glib", + "gstreamer", + "gstreamer-audio-sys", + "gstreamer-base", + "libc", + "once_cell", + "smallvec", +] + +[[package]] +name = "gstreamer-audio-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11267dce74a92bad96fbd58c37c43e330113dc460a0771283f7d6c390b827b7" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-base" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39d55668b23fc69f1843daa42b43d289c00fe38e9586c5453b134783d2dd75a3" +dependencies = [ + "atomic_refcell", + "cfg-if", + "glib", + "gstreamer", + "gstreamer-base-sys", + "libc", +] + +[[package]] +name = "gstreamer-base-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5448abb00c197e3ad306710293bf757303cbeab4036b5ccad21c7642b8bf00c9" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2776369ce07de81b1e6f52786caec898db5be5d4678a8104e8fcbffdae68332d" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-gl-sys", + "gstreamer-video", + "libc", + "once_cell", +] + +[[package]] +name = "gstreamer-gl-egl" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be51a7ceaeabf411ba01a2de5af163ea2b8d79f157d0d924b4682fd217182c15" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl-sys", + "libc", +] + +[[package]] +name = "gstreamer-gl-egl-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bc9d114f161ec27822c203f28e43c88b6523f31cbde29b4cb8d8378a3825a4" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "050a2cf158354bd5633079baf73d12767a5c90efc6377b4f9507aca082734286" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl-x11" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4867cfe9333b04ee14672001e914ea995707a8b02d7b12c1b6f3e9f4a5c4f0d" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-x11-sys", + "libc", +] + +[[package]] +name = "gstreamer-gl-x11-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c628a2a3d216df2f85d37923f65a4e0fdafe4652f7cd06c9432f8c8ce8199aa9" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-player" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2811897ea4e664f508cb6eda94b42944e12a33915d10830270b4626862c44a9" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-player-sys", + "gstreamer-video", + "libc", +] + +[[package]] +name = "gstreamer-player-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786cfe2543b8a985bbc16fb8d0595a12aeac6edb92453b30eb36631f7e34a696" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-sdp" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3358eda88536ae1540b933d70ba8efaa6e5c9e5260322021b0b47a797b2075" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp-sys", +] + +[[package]] +name = "gstreamer-sdp-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d0bc7f3e5cfdca6c9c5b9e9e15f47975c951a83e32b6e4b53b0c6dc5850487" +dependencies = [ + "glib-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-video" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25acba301f86b02584a642de0f224317be2bd0ceec3acda49a0ef111cbced98c" +dependencies = [ + "cfg-if", + "futures-channel", + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-video-sys", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gstreamer-video-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ec210495f94cabaa45d08003081b550095c2d4ab12d5320f64856a91f3f01c" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-webrtc" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd1a55fc34cd2ba2be1dc694a49cf3be71c67cbcd28e80213123eebeb9b2b9f" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp", + "gstreamer-webrtc-sys", + "libc", +] + +[[package]] +name = "gstreamer-webrtc-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49c3bdbed1d328b7823f05a079b1319eea7b452c4b6a3e6776a1788827dad96c" +dependencies = [ + "glib-sys", + "gstreamer-sdp-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "harfbuzz-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb86e2fef3ba40cebffb8fa2cba811f06aa5c5fd296a4e469473e5398d166594" +dependencies = [ + "cc", + "core-graphics", + "core-text", + "foreign-types 0.5.0", + "freetype-sys", + "pkg-config", + "winapi", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hilog" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5646a745e293209c82e88f05b40bb596479cd84738408410ea16d5242e7ad0" +dependencies = [ + "env_filter", + "hilog-sys", + "log", +] + +[[package]] +name = "hilog-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de0e35e8534a70b5af5ccc943ffa3e2dcfe481b2b983c9fd514d7421a46b69e" +dependencies = [ + "log", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "html5ever" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ff6858c1f7e2a470c5403091866fa95b36fe0dbac5d771f932c15e5ff1ee501" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls", + "tokio", + "tokio-rustls", + "webpki-roots", +] + +[[package]] +name = "hyper_serde" +version = "0.13.2" +dependencies = [ + "cookie 0.18.1", + "headers", + "http", + "hyper", + "mime", + "serde", + "serde_bytes", + "serde_test", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "icu_calendar" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7265b2137f9a36f7634a308d91f984574bbdba8cfd95ceffe1c345552275a8ff" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e009b7f0151ee6fb28c40b1283594397e0b7183820793e9ace3dcd13db126d0" + +[[package]] +name = "icu_capi" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f73a82a8307633c08ca119631cd90b006e448009da2d4466f7d76ca8fedf3b1" +dependencies = [ + "diplomat", + "diplomat-runtime", + "fixed_decimal", + "icu_calendar", + "icu_casemap", + "icu_collator", + "icu_collections", + "icu_datetime", + "icu_decimal", + "icu_experimental", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_plurals", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_segmenter", + "icu_timezone", + "log", + "simple_logger", + "tinystr", + "unicode-bidi", + "writeable", +] + +[[package]] +name = "icu_casemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff0c8ae9f8d31b12e27fc385ff9ab1f3cd9b17417c665c49e4ec958c37da75f" +dependencies = [ + "displaydoc", + "icu_casemap_data", + "icu_collections", + "icu_locid", + "icu_properties", + "icu_provider", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_casemap_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d57966d5ab748f74513be4046867f9a20e801e2775d41f91d04a0f560b61f08" + +[[package]] +name = "icu_collator" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d370371887d31d56f361c3eaa15743e54f13bc677059c9191c77e099ed6966b2" +dependencies = [ + "displaydoc", + "icu_collator_data", + "icu_collections", + "icu_locid_transform", + "icu_normalizer", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_collator_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3f88741364b7d6269cce6827a3e6a8a2cf408a78f766c9224ab479d5e4ae5" + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_datetime" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d115efb85e08df3fd77e77f52e7e087545a783fffba8be80bfa2102f306b1780" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "smallvec", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_datetime_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ba7e7f7a01269b9afb0a39eff4f8676f693b55f509b3120e43a0350a9f88bea" + +[[package]] +name = "icu_decimal" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8fd98f86ec0448d85e1edf8884e4e318bb2e121bd733ec929a05c0a5e8b0eb" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid_transform", + "icu_provider", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d424c994071c6f5644f999925fc868c85fec82295326e75ad5017bc94b41523" + +[[package]] +name = "icu_experimental" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844ad7b682a165c758065d694bc4d74ac67f176da1c499a04d85d492c0f193b7" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_collections", + "icu_decimal", + "icu_experimental_data", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_pattern", + "icu_plurals", + "icu_properties", + "icu_provider", + "litemap", + "num-bigint", + "num-rational", + "num-traits", + "smallvec", + "tinystr", + "writeable", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_experimental_data" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c178b9a34083fca5bd70d61f647575335e9c197d0f30c38e8ccd187babc69d0" + +[[package]] +name = "icu_list" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfeda1d7775b6548edd4e8b7562304a559a91ed56ab56e18961a053f367c365" +dependencies = [ + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1825170d2c6679cb20dbd96a589d034e49f698aed9a2ef4fafc9a0101ed298f" + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_pattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7f36aafd098d6717de34e668a8120822275c1fba22b936e757b7de8a2fd7e4" +dependencies = [ + "displaydoc", + "either", + "writeable", + "yoke", + "zerofrom", +] + +[[package]] +name = "icu_plurals" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a70e7c025dbd5c501b0a5c188cd11666a424f0dadcd4f0a95b7dafde3b114" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "zerovec", +] + +[[package]] +name = "icu_plurals_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3e8f775b215d45838814a090a2227247a7431d74e9156407d9c37f6ef0f208" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "unicode-bidi", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "log", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" +dependencies = [ + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "icu_segmenter" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" +dependencies = [ + "core_maths", + "displaydoc", + "icu_collections", + "icu_locid", + "icu_provider", + "icu_segmenter_data", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_segmenter_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" + +[[package]] +name = "icu_timezone" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa91ba6a585939a020c787235daa8aee856d9bceebd6355e283c0c310bc6de96" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c588878c508a3e2ace333b3c50296053e6483c6a7541251b546cc59dcd6ced8e" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imsz" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a49eaebc8750bcba241df1e1e47ebb51b81eb35c65e8f11ffa0aebac353f7f" + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "io-kit-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" +dependencies = [ + "core-foundation-sys", + "mach2", +] + +[[package]] +name = "io-surface" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef" +dependencies = [ + "cgl", + "core-foundation", + "leaky-cow", + "libc", +] + +[[package]] +name = "ipc-channel" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46231d1db8ea8f874012b1b87efb9e968f763c577220372a9c7caadce1448da" +dependencies = [ + "bincode", + "crossbeam-channel", + "fnv", + "lazy_static", + "libc", + "mio", + "rand", + "serde", + "tempfile", + "uuid", + "windows 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jstraceable_derive" +version = "0.0.1" +dependencies = [ + "proc-macro2", + "syn", + "synstructure", +] + +[[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.6.0", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "layout_2013" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "canvas_traits", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "html5ever", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "net_traits", + "parking_lot", + "pixels", + "profile_traits", + "range", + "rayon", + "script_layout_interface", + "script_traits", + "serde", + "serde_json", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_geometry", + "servo_url", + "size_of_test", + "smallvec", + "style", + "style_traits", + "unicode-bidi", + "unicode-script", + "webrender_api", + "webrender_traits", + "xi-unicode", +] + +[[package]] +name = "layout_2020" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "canvas_traits", + "data-url", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "html5ever", + "icu_segmenter", + "ipc-channel", + "itertools 0.13.0", + "log", + "net_traits", + "parking_lot", + "pixels", + "quickcheck", + "range", + "rayon", + "script_layout_interface", + "script_traits", + "serde", + "serde_json", + "servo_arc", + "servo_config", + "servo_geometry", + "servo_url", + "style", + "style_traits", + "unicode-bidi", + "unicode-script", + "url", + "webrender_api", + "webrender_traits", + "xi-unicode", +] + +[[package]] +name = "layout_thread_2013" +version = "0.0.1" +dependencies = [ + "app_units", + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "ipc-channel", + "layout_2013", + "log", + "malloc_size_of", + "metrics", + "net_traits", + "parking_lot", + "profile_traits", + "rayon", + "script", + "script_layout_interface", + "script_traits", + "serde_json", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "style", + "style_traits", + "time 0.3.36", + "url", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "layout_thread_2020" +version = "0.0.1" +dependencies = [ + "app_units", + "base", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "ipc-channel", + "layout_2020", + "log", + "malloc_size_of", + "metrics", + "net_traits", + "parking_lot", + "profile_traits", + "script", + "script_layout_interface", + "script_traits", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "style", + "style_traits", + "url", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leak" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73" + +[[package]] +name = "leaky-cow" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc" +dependencies = [ + "leak", +] + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libflate" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd" +dependencies = [ + "adler32", + "crc32fast", + "rle-decode-fast", + "take_mut", +] + +[[package]] +name = "libgit2-sys" +version = "0.17.0+1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.1", +] + +[[package]] +name = "libservo" +version = "0.0.1" +dependencies = [ + "background_hang_monitor", + "base", + "bluetooth", + "bluetooth_traits", + "canvas", + "canvas_traits", + "cfg-if", + "compositing", + "compositing_traits", + "constellation", + "crossbeam-channel", + "devtools", + "devtools_traits", + "embedder_traits", + "env_logger 0.10.2", + "euclid", + "fonts", + "fonts_traits", + "gaol", + "gleam", + "gstreamer", + "ipc-channel", + "keyboard-types", + "layout_thread_2013", + "layout_thread_2020", + "log", + "media", + "mozangle", + "net", + "net_traits", + "profile", + "profile_traits", + "script", + "script_layout_interface", + "script_traits", + "servo-media", + "servo-media-dummy", + "servo-media-gstreamer", + "servo_config", + "servo_geometry", + "servo_url", + "sparkle", + "style", + "style_traits", + "surfman", + "tracing", + "webdriver_server", + "webgpu", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", + "webxr-api", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "libz-sys" +version = "1.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_size_of" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "accountable-refcell", + "app_units", + "content-security-policy", + "crossbeam-channel", + "cssparser", + "dom", + "euclid", + "http", + "indexmap", + "keyboard-types", + "selectors", + "serde", + "serde_bytes", + "servo_arc", + "smallbitvec", + "smallvec", + "string_cache", + "thin-vec", + "time 0.1.45", + "tokio", + "url", + "uuid", + "void", + "webrender_api", + "xml5ever", +] + +[[package]] +name = "malloc_size_of_derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" +dependencies = [ + "proc-macro2", + "syn", + "synstructure", +] + +[[package]] +name = "malloc_size_of_tests" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "servo_arc", +] + +[[package]] +name = "markup5ever" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d581ff8be69d08a2efa23a959d81aa22b739073f749f067348bd4f4ba4b69195" +dependencies = [ + "log", + "phf 0.11.2", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "media" +version = "0.0.1" +dependencies = [ + "euclid", + "fnv", + "ipc-channel", + "log", + "serde", + "servo-media", + "servo_config", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types 0.3.2", + "log", + "objc", +] + +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "metrics" +version = "0.0.1" +dependencies = [ + "base", + "fonts_traits", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "profile_traits", + "script_traits", + "servo_config", + "servo_url", +] + +[[package]] +name = "metrics_tests" +version = "0.0.1" +dependencies = [ + "base", + "fonts_traits", + "ipc-channel", + "metrics", + "profile_traits", + "servo_url", + "time 0.1.45", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz-sys" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "miow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "mozangle" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14af7d1a65278923835af94ac23d4c3662478001ac6e78075fe1210a7067e4b" +dependencies = [ + "bindgen", + "cc", + "gl_generator", + "lazy_static", + "libz-sys", + "walkdir", +] + +[[package]] +name = "mozjs" +version = "0.14.1" +source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" +dependencies = [ + "bindgen", + "cc", + "lazy_static", + "libc", + "log", + "mozjs_sys", +] + +[[package]] +name = "mozjs_sys" +version = "0.128.0-9" +source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" +dependencies = [ + "bindgen", + "cc", + "encoding_c", + "encoding_c_mem", + "flate2", + "icu_capi", + "libc", + "libz-sys", + "tar", + "walkdir", +] + +[[package]] +name = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "naga" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "napi-derive-backend-ohos" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b18d697bedddd2d4c9f8f76b49fe65bd81ed1c55a7eec21ba40c176c236ddc" +dependencies = [ + "convert_case", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn", +] + +[[package]] +name = "napi-derive-ohos" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8462d74a2d6c7a671bd610f99f9ba34c739aadd2da4d8dd9f109a7e666cc2ad2" +dependencies = [ + "cfg-if", + "convert_case", + "napi-derive-backend-ohos", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "napi-ohos" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad5a3bbb2ae61f345b8c11776f2e79fc2bb71d1901af9a5f81f03c9238a05d86" +dependencies = [ + "bitflags 2.6.0", + "ctor", + "napi-sys-ohos", + "once_cell", +] + +[[package]] +name = "napi-sys-ohos" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f101404db01422d034db5afa63eefff6d9c8f66c0894278bc456b4c30954e166" +dependencies = [ + "libloading", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "net" +version = "0.0.1" +dependencies = [ + "async-recursion", + "async-tungstenite", + "base", + "base64", + "brotli", + "bytes", + "chrono", + "content-security-policy", + "cookie 0.18.1", + "crossbeam-channel", + "data-url", + "devtools_traits", + "embedder_traits", + "flate2", + "futures 0.3.30", + "generic-array", + "headers", + "http", + "hyper", + "hyper-rustls", + "hyper_serde", + "imsz", + "ipc-channel", + "libflate", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "mime", + "mime_guess", + "net_traits", + "percent-encoding", + "pixels", + "profile_traits", + "rayon", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "servo_allocator", + "servo_arc", + "servo_config", + "servo_url", + "sha2", + "time 0.1.45", + "tokio", + "tokio-rustls", + "tokio-stream", + "tokio-test", + "tungstenite", + "url", + "uuid", + "webpki-roots", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "net_traits" +version = "0.0.1" +dependencies = [ + "base", + "content-security-policy", + "cookie 0.18.1", + "embedder_traits", + "headers", + "http", + "hyper", + "hyper_serde", + "image", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "mime", + "num-traits", + "percent-encoding", + "pixels", + "rustls", + "serde", + "servo_arc", + "servo_rand", + "servo_url", + "url", + "uuid", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "ohos-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "491c77f0fe6b4336266f9da68b8dffb15d3bbe19c32ac0145b861851af3c8e41" + +[[package]] +name = "ohos-vsync" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5871e38034a33e8d43c711a40d39e24fd3500f43b61b9269b8586f608a70aec3" +dependencies = [ + "ohos-sys", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openxr" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d6934d2508f94fd4cbda6c2a326f111f60ce59fd9136df6d478564397dd40" +dependencies = [ + "libc", + "libloading", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f10e7e38c47f2175fc39363713b656db899fa0b4a14341029702cbdfa6f44d05" +dependencies = [ + "libc", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordermap" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.1", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "peek-poke" +version = "0.3.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "euclid", + "peek-poke-derive", +] + +[[package]] +name = "peek-poke-derive" +version = "0.3.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", + "unicode-xid", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" +dependencies = [ + "fixedbitset 0.1.9", + "ordermap", +] + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset 0.4.2", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pixels" +version = "0.0.1" +dependencies = [ + "euclid", + "image", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "webrender_api", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plane-split" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f7d82649829ecdef8e258790b0587acf0a8403f0ce963473d8e918acc1643" +dependencies = [ + "euclid", + "log", + "smallvec", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.4", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profile" +version = "0.0.1" +dependencies = [ + "base", + "ipc-channel", + "libc", + "profile_traits", + "regex", + "serde", + "serde_json", + "servo_config", + "task_info", + "tikv-jemalloc-sys", + "time 0.3.36", +] + +[[package]] +name = "profile_tests" +version = "0.0.1" +dependencies = [ + "ipc-channel", + "profile", + "profile_traits", + "servo_config", + "time 0.3.36", +] + +[[package]] +name = "profile_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "ipc-channel", + "log", + "serde", + "servo_config", + "signpost", + "time 0.3.36", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck", + "itertools 0.10.5", + "log", + "multimap", + "once_cell", + "petgraph 0.6.5", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "protobuf-src" +version = "2.1.0+27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7edafa3bcc668fa93efafcbdf58d7821bbda0f4b458ac7fae3d57ec0fec8167" +dependencies = [ + "cmake", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +dependencies = [ + "memchr", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger 0.8.4", + "log", + "rand", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_isaac" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4373cd91b4f55722c553fb0f286edbb81ef3ff6eec7b99d1898a4110a0b28" +dependencies = [ + "rand_core", +] + +[[package]] +name = "range" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "malloc_size_of_derive", + "num-traits", + "serde", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raqote" +version = "0.8.5" +source = "git+https://github.com/jrmuizel/raqote?rev=64716c8#64716c8d68436451ca151bb0c70ba300fd964f42" +dependencies = [ + "euclid", + "font-kit", + "lyon_geom", + "pathfinder_geometry", + "png", + "sw-composite", + "typed-arena", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox 0.1.3", + "thiserror", +] + +[[package]] +name = "ref_filter_map" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5ceb840e4009da4841ed22a15eb49f64fdd00a2138945c5beacf506b2fb5ed" + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.6.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f5b7fc8060f4f8373f9381a630304b42e1183535d9beb1d3f596b236c9106a" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.38.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "script" +version = "0.0.1" +dependencies = [ + "accountable-refcell", + "app_units", + "arrayvec", + "atomic_refcell", + "background_hang_monitor_api", + "backtrace", + "base", + "base64", + "bincode", + "bitflags 2.6.0", + "bluetooth_traits", + "canvas_traits", + "chrono", + "content-security-policy", + "cookie 0.18.1", + "crossbeam-channel", + "cssparser", + "data-url", + "deny_public_fields", + "devtools_traits", + "dom", + "dom_struct", + "domobject_derive", + "embedder_traits", + "encoding_rs", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "headers", + "html5ever", + "http", + "hyper_serde", + "image", + "indexmap", + "ipc-channel", + "itertools 0.13.0", + "jstraceable_derive", + "keyboard-types", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "media", + "metrics", + "mime", + "mime_guess", + "mozangle", + "mozjs", + "net_traits", + "num-traits", + "num_cpus", + "parking_lot", + "percent-encoding", + "phf 0.10.1", + "phf_codegen", + "phf_shared 0.11.2", + "pixels", + "profile_traits", + "range", + "ref_filter_map", + "regex", + "script_layout_interface", + "script_traits", + "selectors", + "serde", + "serde_json", + "servo-media", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_geometry", + "servo_rand", + "servo_url", + "smallvec", + "sparkle", + "style", + "style_traits", + "swapper", + "tempfile", + "tendril", + "time 0.1.45", + "time 0.3.36", + "unicode-bidi", + "unicode-segmentation", + "url", + "utf-8", + "uuid", + "webdriver", + "webgpu", + "webrender_api", + "webrender_traits", + "webxr-api", + "xml5ever", +] + +[[package]] +name = "script_layout_interface" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "canvas_traits", + "crossbeam-channel", + "euclid", + "fonts", + "fonts_traits", + "html5ever", + "ipc-channel", + "libc", + "malloc_size_of", + "malloc_size_of_derive", + "metrics", + "net_traits", + "pixels", + "profile_traits", + "range", + "script_traits", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "servo_url", + "style", + "style_traits", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "script_tests" +version = "0.0.1" +dependencies = [ + "euclid", + "keyboard-types", + "script", + "servo_url", +] + +[[package]] +name = "script_traits" +version = "0.0.1" +dependencies = [ + "background_hang_monitor_api", + "base", + "bitflags 2.6.0", + "bluetooth_traits", + "canvas_traits", + "cookie 0.18.1", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "euclid", + "fonts_traits", + "http", + "hyper_serde", + "ipc-channel", + "keyboard-types", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "media", + "net_traits", + "pixels", + "profile_traits", + "serde", + "servo_atoms", + "servo_url", + "smallvec", + "style_traits", + "uuid", + "webdriver", + "webgpu", + "webrender_api", + "webrender_traits", + "webxr-api", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sctk-adwaita" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" +dependencies = [ + "ab_glyph", + "log", + "memmap2", + "smithay-client-toolkit", + "tiny-skia", +] + +[[package]] +name = "selectors" +version = "0.24.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "bitflags 2.6.0", + "cssparser", + "derive_more", + "fxhash", + "log", + "new_debug_unreachable", + "phf 0.11.2", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "size_of_test", + "smallvec", + "to_shmem", + "to_shmem_derive", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_test" +version = "1.0.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "servo-display-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1060be2a0bbc35e712ec35ae98119b8def1071a5f2edbe392fd4c899bc2a5f4" +dependencies = [ + "foreign-types 0.3.2", + "objc", + "objc-foundation", + "thiserror", + "time-point", +] + +[[package]] +name = "servo-media" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "once_cell", + "servo-media-audio", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", +] + +[[package]] +name = "servo-media-audio" +version = "0.2.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "byte-slice-cast", + "euclid", + "log", + "num-complex", + "num-traits", + "petgraph 0.4.13", + "serde", + "serde_derive", + "servo-media-derive", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "smallvec", + "speexdsp-resampler", +] + +[[package]] +name = "servo-media-derive" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo-media-dummy" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "ipc-channel", + "servo-media", + "servo-media-audio", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", +] + +[[package]] +name = "servo-media-gstreamer" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "byte-slice-cast", + "glib", + "glib-sys", + "gstreamer", + "gstreamer-app", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-player", + "gstreamer-sdp", + "gstreamer-sys", + "gstreamer-video", + "gstreamer-webrtc", + "ipc-channel", + "lazy_static", + "log", + "mime", + "once_cell", + "servo-media", + "servo-media-audio", + "servo-media-gstreamer-render", + "servo-media-gstreamer-render-android", + "servo-media-gstreamer-render-unix", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", + "url", +] + +[[package]] +name = "servo-media-gstreamer-render" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "gstreamer", + "gstreamer-video", + "servo-media-player", +] + +[[package]] +name = "servo-media-gstreamer-render-android" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl", + "gstreamer-video", + "servo-media-gstreamer-render", + "servo-media-player", +] + +[[package]] +name = "servo-media-gstreamer-render-unix" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl", + "gstreamer-gl-x11", + "gstreamer-video", + "servo-media-gstreamer-render", + "servo-media-player", +] + +[[package]] +name = "servo-media-player" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "ipc-channel", + "serde", + "serde_derive", + "servo-media-streams", + "servo-media-traits", +] + +[[package]] +name = "servo-media-streams" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "lazy_static", + "uuid", +] + +[[package]] +name = "servo-media-traits" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" + +[[package]] +name = "servo-media-webrtc" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "lazy_static", + "log", + "servo-media-streams", + "uuid", +] + +[[package]] +name = "servo_allocator" +version = "0.0.1" +dependencies = [ + "libc", + "tikv-jemalloc-sys", + "tikv-jemallocator", + "windows-sys 0.59.0", +] + +[[package]] +name = "servo_arc" +version = "0.2.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "serde", + "stable_deref_trait", +] + +[[package]] +name = "servo_atoms" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "string_cache", + "string_cache_codegen", +] + +[[package]] +name = "servo_config" +version = "0.0.1" +dependencies = [ + "dirs", + "embedder_traits", + "euclid", + "getopts", + "log", + "num_cpus", + "serde", + "serde_json", + "servo_config_plugins", + "servo_geometry", + "servo_url", + "style_config", + "url", +] + +[[package]] +name = "servo_config_plugins" +version = "0.0.1" +dependencies = [ + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo_geometry" +version = "0.0.1" +dependencies = [ + "app_units", + "euclid", + "malloc_size_of", + "malloc_size_of_derive", + "webrender_api", +] + +[[package]] +name = "servo_rand" +version = "0.0.1" +dependencies = [ + "log", + "rand", + "rand_core", + "rand_isaac", + "uuid", +] + +[[package]] +name = "servo_url" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "servo_arc", + "servo_rand", + "to_shmem", + "url", + "uuid", +] + +[[package]] +name = "servoshell" +version = "0.0.1" +dependencies = [ + "android_logger", + "arboard", + "backtrace", + "cc", + "cfg-if", + "egui", + "egui-winit", + "egui_glow", + "env_filter", + "euclid", + "getopts", + "gilrs", + "gl_generator", + "gleam", + "glow 0.13.1", + "headers", + "hilog", + "http", + "image", + "ipc-channel", + "jni", + "keyboard-types", + "libc", + "libloading", + "libservo", + "log", + "mime_guess", + "napi-derive-ohos", + "napi-ohos", + "net", + "net_traits", + "nix", + "ohos-sys", + "ohos-vsync", + "raw-window-handle", + "serde_json", + "servo-media", + "servo_allocator", + "shellwords", + "sig", + "surfman", + "tinyfiledialogs", + "tokio", + "tracing", + "tracing-perfetto", + "tracing-subscriber", + "url", + "vergen", + "webxr", + "windows-sys 0.59.0", + "winit", + "winres", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellwords" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e515aa4699a88148ed5ef96413ceef0048ce95b43fbc955a33bde0a70fcae6" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "sig" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6567e29578f9bfade6a5d94a32b9a4256348358d2a3f448cab0021f9a02614a2" +dependencies = [ + "libc", +] + +[[package]] +name = "signpost" +version = "0.1.0" +source = "git+https://github.com/pcwalton/signpost.git#7ed712507f343c38646b9d1fefd049166f9c9a18" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simple_logger" +version = "4.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e7e46c8c90251d47d08b28b8a419ffb4aede0f87c2eea95e17d1d5bacbf3ef1" +dependencies = [ + "colored", + "log", + "time 0.3.36", + "windows-sys 0.48.0", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "size_of_test" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallbitvec" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3fc564a4b53fd1e8589628efafe57602d91bde78be18186b5f61e8faea470" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.6.0", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +dependencies = [ + "libc", + "smithay-client-toolkit", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "sparkle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fc6c6346da9177de9894230716709c223c62adbf910a5c1e6096b2ee2e58e0" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "speexdsp-resampler" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72d540d5c565dbe1f891d7e21ceb21d2649508306782f1066989fccb0b363d3" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "static_prefs" +version = "0.1.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" + +[[package]] +name = "strck" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" + +[[package]] +name = "strck_ident" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" +dependencies = [ + "strck", + "unicode-ident", +] + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "style" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "app_units", + "arrayvec", + "atomic_refcell", + "bitflags 2.6.0", + "byteorder", + "cssparser", + "derive_more", + "dom", + "encoding_rs", + "euclid", + "fxhash", + "icu_segmenter", + "indexmap", + "itertools 0.10.5", + "itoa", + "lazy_static", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "markup5ever", + "matches", + "mime", + "new_debug_unreachable", + "num-derive", + "num-integer", + "num-traits", + "num_cpus", + "parking_lot", + "precomputed-hash", + "rayon", + "rayon-core", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "smallbitvec", + "smallvec", + "static_assertions", + "static_prefs", + "string_cache", + "style_config", + "style_derive", + "style_traits", + "thin-vec", + "time 0.1.45", + "to_shmem", + "to_shmem_derive", + "uluru", + "unicode-bidi", + "url", + "void", + "walkdir", +] + +[[package]] +name = "style_config" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "style_derive" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "derive_common", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "style_tests" +version = "0.0.1" +dependencies = [ + "app_units", + "cssparser", + "euclid", + "html5ever", + "rayon", + "selectors", + "serde_json", + "servo_arc", + "servo_atoms", + "style", + "style_traits", + "url", +] + +[[package]] +name = "style_traits" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "cssparser", + "euclid", + "lazy_static", + "malloc_size_of", + "malloc_size_of_derive", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "size_of_test", + "thin-vec", + "to_shmem", + "to_shmem_derive", + "url", + "webrender_api", +] + +[[package]] +name = "surfman" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb5f2d85c044920e1f2aaf5ad3795ae3b935025297271f2eadb021931571b4c3" +dependencies = [ + "bitflags 2.6.0", + "cfg_aliases 0.2.1", + "cgl", + "cocoa", + "core-foundation", + "core-graphics", + "euclid", + "fnv", + "gl_generator", + "io-surface", + "lazy_static", + "libc", + "log", + "mach2", + "metal 0.24.0", + "objc", + "raw-window-handle", + "servo-display-link", + "sparkle", + "wayland-sys 0.30.1", + "winapi", + "wio", + "x11", +] + +[[package]] +name = "svg_fmt" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" + +[[package]] +name = "sw-composite" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac8fb7895b4afa060ad731a32860db8755da3449a47e796d5ecf758db2671d4" + +[[package]] +name = "swapper" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.9", + "version-compare", +] + +[[package]] +name = "take_mut" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "task_info" +version = "0.0.1" +dependencies = [ + "cc", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "encoding_rs", + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "tester" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f" +dependencies = [ + "cfg-if", + "getopts", + "libc", + "num_cpus", + "term", +] + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread-id" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "time-point" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06535c958d6abe68dc4b4ef9e6845f758fc42fe463d0093d0aca40254f03fb14" + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinyfiledialogs" +version = "3.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848eb50d6d21430349d82418c2244f611b1ad3e1c52c675320338b3102d06554" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "to_shmem" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "cssparser", + "servo_arc", + "smallbitvec", + "smallvec", + "string_cache", + "thin-vec", +] + +[[package]] +name = "to_shmem_derive" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "derive_common", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-perfetto" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd21777b526dfcb57f11f65aa8a2024d83e1db52841993229b6e282e511978b7" +dependencies = [ + "anyhow", + "bytes", + "chrono", + "prost", + "prost-build", + "protobuf-src", + "rand", + "thread-id", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracy-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce607aae8ab0ab3abf3a2723a9ab6f09bb8639ed83fdd888d857b8e556c868d8" + +[[package]] +name = "truetype" +version = "0.47.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fb887b8a8ee8832e5810114ad4ef84d89f0aae569d198baee7fb7f7363a4ca4" +dependencies = [ + "typeface", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typeface" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fdbc53aae2bf36c48f1bc36d73a62b84091b6535b08e4e15bca876ce5e8050" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uluru" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-properties" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "unwind-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a81ba64bc45243d442e9bb2a362f303df152b5078c56ce4a0dc7d813c8df91" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "url" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cfg-if", + "git2", + "rustversion", + "time 0.3.36", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "warp" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "headers", + "http", + "hyper", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-util", + "tower-service", + "tracing", +] + +[[package]] +name = "wasi" +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 = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wayland-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.5", +] + +[[package]] +name = "wayland-client" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.6.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webdriver" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc8773336cf1ad6ffadae7d73fea436e5c4d6345a467292902876cb0f7b72107" +dependencies = [ + "base64", + "bytes", + "cookie 0.16.2", + "http", + "log", + "serde", + "serde_derive", + "serde_json", + "time 0.3.36", + "tokio", + "tokio-stream", + "unicode-segmentation", + "url", + "warp", +] + +[[package]] +name = "webdriver_server" +version = "0.0.1" +dependencies = [ + "base", + "base64", + "compositing_traits", + "cookie 0.18.1", + "crossbeam-channel", + "euclid", + "http", + "image", + "ipc-channel", + "keyboard-types", + "log", + "net_traits", + "pixels", + "script_traits", + "serde", + "serde_json", + "servo_config", + "servo_url", + "style_traits", + "uuid", + "webdriver", +] + +[[package]] +name = "webgpu" +version = "0.0.1" +dependencies = [ + "arrayvec", + "base", + "euclid", + "ipc-channel", + "log", + "malloc_size_of", + "serde", + "servo_config", + "smallvec", + "webrender", + "webrender_api", + "webrender_traits", + "wgpu-core", + "wgpu-types", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webrender" +version = "0.65.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "bincode", + "bitflags 2.6.0", + "build-parallel", + "byteorder", + "derive_more", + "etagere", + "euclid", + "fxhash", + "gleam", + "glslopt", + "lazy_static", + "log", + "malloc_size_of_derive", + "num-traits", + "peek-poke", + "plane-split", + "rayon", + "ron", + "serde", + "smallvec", + "svg_fmt", + "time 0.1.45", + "topological-sort", + "tracy-rs", + "webrender_api", + "webrender_build", + "wr_glyph_rasterizer", + "wr_malloc_size_of", +] + +[[package]] +name = "webrender_api" +version = "0.65.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "byteorder", + "crossbeam-channel", + "euclid", + "malloc_size_of_derive", + "peek-poke", + "serde", + "serde_bytes", + "serde_derive", + "time 0.1.45", + "wr_malloc_size_of", +] + +[[package]] +name = "webrender_build" +version = "0.0.2" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "bitflags 2.6.0", + "lazy_static", +] + +[[package]] +name = "webrender_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "ipc-channel", + "libc", + "log", + "serde", + "surfman", + "webrender_api", +] + +[[package]] +name = "webxr" +version = "0.0.1" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" +dependencies = [ + "crossbeam-channel", + "euclid", + "log", + "openxr", + "serde", + "sparkle", + "surfman", + "webxr-api", + "winapi", + "wio", +] + +[[package]] +name = "webxr-api" +version = "0.0.1" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" +dependencies = [ + "euclid", + "ipc-channel", + "log", + "serde", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu-core" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "profiling", + "ron", + "rustc-hash", + "serde", + "smallvec", + "thiserror", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.6.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "glow 0.14.0", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal 0.29.0", + "naga", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "windows 0.58.0", + "windows-core 0.58.0", +] + +[[package]] +name = "wgpu-types" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "serde", + "web-sys", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winit" +version = "0.29.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.6.0", + "bytemuck", + "calloop", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "wr_glyph_rasterizer" +version = "0.1.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "core-foundation", + "core-graphics", + "core-text", + "dwrote", + "euclid", + "freetype", + "fxhash", + "lazy_static", + "libc", + "log", + "malloc_size_of_derive", + "objc", + "rayon", + "serde", + "smallvec", + "tracy-rs", + "webrender_api", + "wr_malloc_size_of", +] + +[[package]] +name = "wr_malloc_size_of" +version = "0.0.3" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "app_units", + "euclid", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +dependencies = [ + "either", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xcursor" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.6.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" + +[[package]] +name = "xml-rs" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" + +[[package]] +name = "xml5ever" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b906d34d867d216b2d79fb0e9470aaa7f4948ea86b44c27846efedd596076c" +dependencies = [ + "log", + "mac", + "markup5ever", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" +dependencies = [ + "dlib", + "once_cell", + "pkg-config", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/third_party/nixpkgs/pkgs/by-name/se/servo/package.nix b/third_party/nixpkgs/pkgs/by-name/se/servo/package.nix new file mode 100644 index 0000000000..fc586d5ddc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/servo/package.nix @@ -0,0 +1,155 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # build deps + cargo-deny, + cmake, + dbus, + gcc, + git, + gnumake, + libxkbcommon, + llvm, + llvmPackages, + m4, + makeWrapper, + perl, + pkg-config, + python3, + taplo, + vulkan-loader, + which, + yasm, + zlib, + + # runtime deps + darwin, + fontconfig, + freetype, + gst_all_1, + libGL, + libunwind, + udev, + wayland, + xorg, +}: + +let + customPython = python3.withPackages ( + ps: with ps; [ + dbus + packaging + pip + six + virtualenv + ] + ); + runtimePaths = lib.makeLibraryPath [ + xorg.libXcursor + xorg.libXrandr + xorg.libXi + libxkbcommon + vulkan-loader + wayland + libGL + ]; +in + +rustPlatform.buildRustPackage { + pname = "servo"; + version = "0-unstable-2024-09-09"; + + src = fetchFromGitHub { + owner = "servo"; + repo = "servo"; + rev = "938fd8c12fc2489303e12538d3e3585bd771141f"; + hash = "sha256-CrpEBFYd8Qd0rxSnT81IvtxxEuYG0jWGJeHISvxalyY="; + }; + + # need to use a `Cargo.lock` as there are git dependencies + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "derive_common-0.0.1" = "sha256-z0I2fQQlbUqaFU1EX45eYDy5IbZJ4SIget7WHzq4St0="; + "fontsan-0.5.2" = "sha256-4id66xxQ8iu0+OvJKH77WYPUE0eoVa9oUHmr6lRFPa8="; + "gilrs-0.10.6" = "sha256-RIfowFShWTPqgVWliK8Fc4cJw0YKITLvmexmTC0SwQk="; + "mozjs-0.14.1" = "sha256-RMM28Rd0r58VLfNEJzjWw3Ze6oKEi5lC1Edv03tJbfY="; + "peek-poke-0.3.0" = "sha256-WCZYX68vZrPhaAZwpx9/lUp3bVsLMwtmlJSW8wNb2ks="; + "servo-media-0.1.0" = "sha256-+J/6ZJPM9eus6YHJA6ENJD63CBiJTtKZdfORq9n6Nf8="; + "signpost-0.1.0" = "sha256-xRVXwW3Gynace9Yk5r1q7xA60yy6xhC5wLAyMJ6rPRs="; + "webxr-0.0.1" = "sha256-HZ8oWm5BaBLBXo4dS2CbWjpExry7dzeB2ddRLh7+98w="; + "naga-22.0.0" = "sha256-Xi2lWZCv4V2mUbQmwV1aw3pcvIIcyltKvv/C+LVqqDI="; + "raqote-0.8.5" = "sha256-WLsz5q08VNmYBxUhQ0hOn0K0RVFnnjaWF/MuQGkO/Rg="; + }; + }; + + # Remap absolute path between modules to include SEMVER + # set `HOME` to a temp dir for write access + # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) + preConfigure = '' + sed -i -e 's/\/style\//\/style-0.0.1\//g' ../cargo-vendor-dir/servo_atoms-0.0.1/build.rs + export HOME=$TMPDIR + unset AS + ''; + + nativeBuildInputs = [ + cargo-deny + cmake + customPython + dbus + gcc + git + gnumake + llvm + llvmPackages.libstdcxxClang + m4 + makeWrapper + perl + pkg-config + python3 + taplo + which + yasm + zlib + ]; + + buildInputs = [ + fontconfig + freetype + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + libunwind + udev + wayland + libGL + xorg.libX11 + xorg.libxcb + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]); + + # copy resources into `$out` to be used during runtime + # link runtime libraries + postFixup = '' + mkdir -p $out/resources + cp -r ./resources $out/ + + wrapProgram $out/bin/servo \ + --prefix LD_LIBRARY_PATH : ${runtimePaths} + ''; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + meta = { + description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; + homepage = "https://servo.org"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ supinie ]; + mainProgram = "servo"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sg/sgfutils/package.nix b/third_party/nixpkgs/pkgs/by-name/sg/sgfutils/package.nix index f82bc4e59a..586a3ab1e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/sg/sgfutils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sg/sgfutils/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation hash = "sha256-KWYgTxz32WK3MKouj1WAJtZmleKt5giCpzQPwfWruZQ="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' runHook preBuild make all diff --git a/third_party/nixpkgs/pkgs/by-name/sh/share-preview/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/share-preview/package.nix index 093bbaf332..4f3cda10bd 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/share-preview/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/share-preview/package.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libadwaita openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.SystemConfiguration ]; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] + lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] ); meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shotcut/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shotcut/package.nix index 811f34bf6d..09bcb4447a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/shotcut/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/shotcut/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.08.29"; + version = "24.09.13"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-iWXq9IdXfARe9h3Habe0rr0ohdxBARiwg5g7F53bhRg="; + hash = "sha256-hYpb3ZCRXd07KQVZ3xpNeEJY5HFLNDsqpPJp3b9UXtE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sh/showmethekey/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/showmethekey/package.nix index 7faf5dec43..b9842ae0a6 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/showmethekey/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/showmethekey/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; rev = "refs/tags/v${version}"; - hash = "sha256-kifUp/neqTBPRuZKqNdW6JOinzh9LKfppyvW9AgxAYo="; + hash = "sha256-uBhciNkDBXrME8YRztlUdm3oV2y8YiA9Fhib9KLVeBY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/si/sieve-editor-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/si/sieve-editor-gui/package.nix new file mode 100644 index 0000000000..ee374f8351 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/si/sieve-editor-gui/package.nix @@ -0,0 +1,70 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + electron, + nodejs_20, + nodePackages, + makeDesktopItem, + copyDesktopItems, +}: +buildNpmPackage rec { + pname = "sieve-editor-gui"; + version = "0.6.1-unstable-2024-01-06"; + nodejs = nodejs_20; + + src = fetchFromGitHub { + owner = "thsmi"; + repo = "sieve"; + rev = "5879679ed8d16a34af760ee56bfec16a1a322b4e"; + hash = "sha256-wl6dwKoGan+DrpXk2p1fD/QN/C2qT4h/g3N73gF8sOI="; + }; + + npmDepsHash = "sha256-a2I9csxFZJekG1uCOHqdRaLLi5v/BLTz4SU+uBd855A="; + + nativeBuildInputs = [ + electron + copyDesktopItems + nodePackages.gulp + ]; + + dontNpmBuild = true; + + buildPhase = '' + gulp -LLLL app:package + ''; + + installPhase = '' + runHook preInstall + mv build/ $out + runHook postInstall + ''; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + desktopItems = [ + (makeDesktopItem { + name = "sieve-editor-gui"; + exec = "sieve-editor-gui"; + desktopName = "Sieve Editor"; + icon = "sieve-editor-gui"; + categories = [ "Utility" ]; + }) + ]; + + postInstall = '' + makeWrapper ${lib.getExe electron} $out/bin/sieve-editor-gui \ + --add-flags $out/electron/resources/main_esm.js + ''; + + meta = { + description = "Activate, edit, delete and add Sieve scripts with a convenient interface"; + homepage = "https://github.com/thsmi/sieve"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ Silver-Golden ]; + platforms = lib.platforms.linux; + mainProgram = "sieve-editor-gui"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/si/signal-backup-deduplicator/package.nix b/third_party/nixpkgs/pkgs/by-name/si/signal-backup-deduplicator/package.nix index d5efff9e3f..5c098d7d46 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/signal-backup-deduplicator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/signal-backup-deduplicator/package.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { mainProgram = "signal_backup_deduplicate"; platforms = lib.platforms.all; # ld: symbol(s) not found for architecture ... - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix b/third_party/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix index baff481f6f..3b5d66508e 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "signaturepdf"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "24eme"; repo = "signaturepdf"; rev = "v${version}"; - hash = "sha256-WPcnG1iRT4l4S/CSZkj75lIiyzVLsrSyH3GUJa7Tedc="; + hash = "sha256-OFsTTF+QmjRv0LdfRTWig6LjRXq1TXWOLeyEX5Ak62o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/si/silicon/package.nix b/third_party/nixpkgs/pkgs/by-name/si/silicon/package.nix index cba16e706b..0c77d93b5a 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/silicon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/silicon/package.nix @@ -40,8 +40,8 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ expat freetype fira-code fontconfig harfbuzz ] - ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv AppKit CoreText @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { ]); nativeBuildInputs = [ cmake pkg-config rustPlatform.bindgenHook ] - ++ lib.optionals stdenv.isLinux [ python3 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; preCheck = '' export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/by-name/si/single-file-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/si/single-file-cli/package.nix index d6aa4d28a7..0af7208959 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/single-file-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/single-file-cli/package.nix @@ -19,7 +19,7 @@ buildNpmPackage { npmDepsHash = "sha256-wiBpWw9nb/pWVGIc4Vl/IxxR5ic0LzLMMr3WxRNvYdM="; nativeCheckInputs = [chromium]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; postBuild = '' patchShebangs ./single-file diff --git a/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix b/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix index 34ee961d14..d437eece8b 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (gpuBackend == "rocm") [ rocmPackages.clr rocmPackages.rocblas - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] ++ lib.optionals enablePython (with pythonPackages; [ python diff --git a/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix index 549d20e288..4d098a8736 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - buildGoModule, + buildGo123Module, substituteAll, pandoc, nodejs, @@ -11,6 +11,7 @@ makeWrapper, makeDesktopItem, copyDesktopItems, + nix-update-script, }: let @@ -34,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.0"; + version = "3.1.6"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-UIPASTSW7YGpxJJHfCq28M/U6CzyqaJiISZGtE0aDPw="; + hash = "sha256-xGxZ6xu8R/JoW4X+drEv943y1jah4ZijHB+RNN6hxig="; }; - kernel = buildGoModule { + kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-s4dW43Qy3Lrc5WPpugQpN6BDEFVxqnorXpp40SGFk7I="; + vendorHash = "sha256-I57T4/J0pL8/GISi22H1lpE1gkduNXdINvuo+F3YnAs="; patches = [ (substituteAll { @@ -89,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-QSaBNs0m13Pfrvl8uUVqRpP3m8PoOBIY5VU5Cg/G2jY="; + hash = "sha256-3PdmCbaZZjnTCSpBcvG7nP+zTGamoY/ZXjay7c8Zx5w="; }; sourceRoot = "${finalAttrs.src.name}/app"; @@ -139,6 +140,11 @@ stdenv.mkDerivation (finalAttrs: { desktopItems = [ desktopEntry ]; + passthru = { + inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD + updateScript = nix-update-script { }; + }; + meta = { description = "Privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync"; homepage = "https://b3log.org/siyuan/"; diff --git a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar/package.nix index 0b1b4e21ac..e0e2a004e6 100644 --- a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar/package.nix @@ -29,7 +29,7 @@ let } .${system} or (throw "Unsupported system: ${system}"); - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "sketchybar"; diff --git a/third_party/nixpkgs/pkgs/by-name/sk/skhd/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skhd/package.nix index d3b3b9adb9..1876a43916 100644 --- a/third_party/nixpkgs/pkgs/by-name/sk/skhd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/skhd/package.nix @@ -10,7 +10,7 @@ let inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "skhd"; diff --git a/third_party/nixpkgs/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch b/third_party/nixpkgs/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch deleted file mode 100644 index 1609e7347f..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp -index 7d6fd62..2cca01d 100644 ---- a/src/ports/SkFontMgr_fontconfig.cpp -+++ b/src/ports/SkFontMgr_fontconfig.cpp -@@ -16,6 +16,7 @@ - #include "include/core/SkString.h" - #include "include/core/SkTypeface.h" - #include "include/core/SkTypes.h" -+#include "include/ports/SkFontMgr_fontconfig.h" - #include "include/private/base/SkDebug.h" - #include "include/private/base/SkMutex.h" - #include "include/private/base/SkTArray.h" diff --git a/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix index 6c70e99bb2..2790b77101 100644 --- a/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix @@ -18,7 +18,7 @@ , vulkan-memory-allocator , xcbuild -, enableVulkan ? !stdenv.isDarwin +, enableVulkan ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation (finalAttrs: { @@ -26,22 +26,15 @@ stdenv.mkDerivation (finalAttrs: { # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md # or https://chromiumdash.appspot.com/releases # plus date of the tip of the corresponding chrome/m$version branch - version = "124-unstable-2024-05-22"; + version = "129-unstable-2024-09-18"; src = fetchgit { url = "https://skia.googlesource.com/skia.git"; # Tip of the chrome/m$version branch - rev = "a747f7ea37db6ea3871816dbaf2eb41b5776c826"; - hash = "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY="; + rev = "dda581d538cb6532cda841444e7b4ceacde01ec9"; + hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals="; }; - patches = [ - # Package ladybird uses SkFontMgr_New_FontConfig, but this version of skia - # does not export it. - # https://skia.googlesource.com/skia/+/4bf56844d4a661d7317882cc545ecd978715a11e%5E!/? - ./export-SkFontMgr_New_FontConfig.patch - ]; - postPatch = '' # System zlib detection bug workaround substituteInPlace BUILD.gn \ @@ -53,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { gn ninja python3 - ] ++ lib.optional stdenv.isDarwin xcbuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = [ expat @@ -152,6 +145,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = with lib.platforms; arm ++ aarch64 ++ x86 ++ x86_64; pkgConfigModules = [ "skia" ]; # https://github.com/NixOS/nixpkgs/pull/325871#issuecomment-2220610016 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/sk/skribilo/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skribilo/package.nix index 9602ff7d16..63083457be 100644 --- a/third_party/nixpkgs/pkgs/by-name/sk/skribilo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/skribilo/package.nix @@ -11,8 +11,8 @@ , makeWrapper , pkg-config , enableEmacs ? false, emacs -, enableLout ? stdenv.isLinux, lout -, enablePloticus ? stdenv.isLinux, ploticus +, enableLout ? stdenv.hostPlatform.isLinux, lout +, enablePloticus ? stdenv.hostPlatform.isLinux, ploticus , enableTex ? true, texliveSmall }: diff --git a/third_party/nixpkgs/pkgs/by-name/sl/slang/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/slang/package.nix index 162bc8395d..7d67d22eb3 100644 --- a/third_party/nixpkgs/pkgs/by-name/sl/slang/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sl/slang/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pcre readline zlib - ] ++ lib.optionals (stdenv.isDarwin) [ libiconv ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ libiconv ]; propagatedBuildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sl/sleek-grub-theme/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/sleek-grub-theme/package.nix index efeb01e4d8..0fe50fcd41 100644 --- a/third_party/nixpkgs/pkgs/by-name/sl/sleek-grub-theme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sl/sleek-grub-theme/package.nix @@ -2,20 +2,20 @@ , stdenv , fetchFromGitHub , withBanner ? "Grub Bootloader" # use override to specify your own banner text -, withStyle ? "white" # use override to specify one of "dark" / "orange" / "bigSur" +, withStyle ? "light" # use override to specify one of "dark" / "orange" / "bigSur" }: -assert builtins.any (s: withStyle == s) ["white" "dark" "orange" "bigSur"]; +assert builtins.any (s: withStyle == s) ["light" "dark" "orange" "bigSur"]; stdenv.mkDerivation { pname = "sleek-grub-theme"; - version = "unstable-2022-06-04"; + version = "unstable-2024-08-11"; src = fetchFromGitHub ({ owner = "sandesh236"; repo = "sleek--themes"; - rev = "981326a8e35985dc23f1b066fdbe66ff09df2371"; - hash = "sha256-yD4JuoFGTXE/aI76EtP4rEWCc5UdFGi7Ojys6Yp8Z58="; + rev = "0c47e645ccc2d72aa165e9d994f9d09f58de9f6d"; + hash = "sha256-H4s4CSR8DaH8RT9w40hkguNNcC0U8gHKS2FLt+FApeA="; }); installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix index b88f72b0d1..abdb045e7c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix @@ -24,7 +24,7 @@ let sox wavpack ] - ++ (lib.optional stdenv.isLinux monkeysAudio) + ++ (lib.optional stdenv.hostPlatform.isLinux monkeysAudio) ); libPath = lib.makeLibraryPath [ zlib @@ -117,8 +117,8 @@ perlPackages.buildPerlPackage rec { XMLSimple YAMLLibYAML ] - # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) - ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); + # ++ (lib.optional stdenv.hostPlatform.isDarwin perlPackages.MacFSEvents) + ++ (lib.optional stdenv.hostPlatform.isLinux perlPackages.LinuxInotify2); prePatch = '' # remove vendored binaries @@ -179,6 +179,6 @@ perlPackages.buildPerlPackage rec { jecaro ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sl/sloth-app/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/sloth-app/package.nix index c2959589d0..1da8d8aac5 100644 --- a/third_party/nixpkgs/pkgs/by-name/sl/sloth-app/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sl/sloth-app/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sloth-app"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "https://github.com/sveinbjornt/Sloth/releases/download/${finalAttrs.version}/sloth-${finalAttrs.version}.zip"; - hash = "sha256-8/x8I769V8kGxstDuXXUaMtGvg03n2vhrKvmaltSISo="; + hash = "sha256-LGaL7+NqoPqXZdYWq9x+yNEZFlZZmsZw+qcELC4rdjY="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix index b65e041cdc..aed0f3848c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jLBid9MDQ2eMhG0knxU1gxbi+eRFlCPYRkzWnjCnyG0="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; meta = with lib; { description = "Terminal-based HTTP/REST client"; diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix index bc81bfd0a2..fb7195bfea 100644 --- a/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { openssl libX11 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smatch/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smatch/package.nix new file mode 100644 index 0000000000..6acf056523 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sm/smatch/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + sqlite, + openssl, + buildllvmsparse ? false, + buildc2xml ? false, + libllvm, + libxml2, +}: +let + version = "1.73"; +in +stdenv.mkDerivation { + pname = "smatch"; + inherit version; + + src = fetchFromGitHub { + owner = "error27"; + repo = "smatch"; + rev = version; + sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; + }; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ + "-Wno-incompatible-function-pointer-types" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + sqlite + openssl + ] ++ lib.optionals buildllvmsparse [ libllvm ] ++ lib.optionals buildc2xml [ libxml2.dev ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + meta = { + description = "Semantic analysis tool for C"; + homepage = "https://sparse.docs.kernel.org/"; + maintainers = with lib.maintainers; [ momeemt ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smuview/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smuview/package.nix index 907e332279..a030d64999 100644 --- a/third_party/nixpkgs/pkgs/by-name/sm/smuview/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sm/smuview/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ glib @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { python3 pcre libsForQt5.qwt - ] ++ lib.optionals stdenv.isLinux [ bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; meta = with lib; { description = "Qt based source measure unit GUI for sigrok"; diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smuxi/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smuxi/package.nix index 40ae39deee..72354275e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/sm/smuxi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sm/smuxi/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "smuxi"; version = "unstable-2023-07-01"; - runtimeLoaderEnvVariableName = if stdenv.isDarwin then + runtimeLoaderEnvVariableName = if stdenv.hostPlatform.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cp -a lib/Nini.dll $out/lib/smuxi/ # install GTK+ icon theme on Darwin - ${if guiSupport && stdenv.isDarwin then " + ${if guiSupport && stdenv.hostPlatform.isDarwin then " mkdir -p $out/lib/smuxi/icons/ cp -a images/Smuxi-Symbolic $out/lib/smuxi/icons/ " else ""} diff --git a/third_party/nixpkgs/pkgs/by-name/sn/sn0int/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/sn0int/package.nix index 974f6a298d..6e9afcd4a1 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/sn0int/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/sn0int/package.nix @@ -31,9 +31,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsodium sqlite - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix index 9c6add8c19..ad2eb1c0b7 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix @@ -196,7 +196,7 @@ python.pkgs.buildPythonApplication rec { "test_snap_command_fallback" "test_validate_architectures_supported" "test_validate_architectures_unsupported" - ] ++ lib.optionals stdenv.isAarch64 [ "test_load_project" ]; + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_load_project" ]; disabledTestPaths = [ "tests/unit/commands/test_remote.py" diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snes9x/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snes9x/package.nix index 1888a2df41..31aa73db6a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snes9x/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snes9x/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { minizip zlib ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib pulseaudio libselinux @@ -137,6 +137,6 @@ stdenv.mkDerivation (finalAttrs: { sugar700 ]; platforms = lib.platforms.unix; - broken = (withGtk && stdenv.isDarwin); + broken = (withGtk && stdenv.hostPlatform.isDarwin); }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/sn/sng/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/sng/package.nix new file mode 100644 index 0000000000..544a07165d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sn/sng/package.nix @@ -0,0 +1,47 @@ +{ + lib, + asciidoctor, + fetchurl, + libpng, + netpbm, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sng"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://sourceforge/sng/sng-${finalAttrs.version}.tar.xz"; + hash = "sha256-yb37gPWhfbGquTN7rtZKjr6lwN34KRXGiHuM+4fs5h4="; + }; + + nativeBuildInputs = [ asciidoctor ]; + + buildInputs = [ libpng ]; + + outputs = [ + "out" + "man" + ]; + + makeFlags = [ + "prefix=$(out)" + "MANDIR=$(outputMan)/share/man" + "RGBTXT=${netpbm.out}/share/netpbm/misc/rgb.txt" + ]; + + strictDeps = true; + + meta = { + homepage = "https://sng.sourceforge.net/"; + description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; + license = lib.licenses.zlib; + mainProgram = "sng"; + maintainers = with lib.maintainers; [ + dezgeg + AndersonTorres + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sn/sniffglue/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/sniffglue/package.nix index 9cedce67f6..5bafa51077 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/sniffglue/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/sniffglue/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libpcap - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix index 5f2606a951..da38ec7f58 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix @@ -8,13 +8,13 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "7.0.11"; + version = "7.0.12"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-XMsLK6IKbnlYZk7tPYq++prv+28FefEbahOqmeEAAiY="; + hash = "sha256-CTOhnGDmvxcQrS7VPsMeap6aD9YajSZ/C25RcRbL65w="; }; vendorHash = "sha256-8YZD6Q1Mb5VUGL/KQnYTtXKL3aziPfAmwvVthDdyBYY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snyk/package.nix similarity index 57% rename from third_party/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix rename to third_party/nixpkgs/pkgs/by-name/sn/snyk/package.nix index afefaffdd6..4c90ad105a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snyk/package.nix @@ -1,23 +1,27 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, stdenv -, testers -, snyk +{ + lib, + buildNpmPackage, + fetchFromGitHub, + stdenv, + testers, + snyk, }: -buildNpmPackage rec { +let + version = "1.1293.1"; +in +buildNpmPackage { pname = "snyk"; - version = "1.1293.0"; + inherit version; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-zCDxq+aP7StfgXTg6G/J4o5xjcKI4ak3N3Dh8cIUK8U="; + hash = "sha256-Vgt9h0LLIC5I9NZZKKWD9b1xnNOSkxApLxSGf2C0ODk="; }; - npmDepsHash = "sha256-XPJoDhCncucFTv1B+YlMQxh3KkXleQGRvcSuYrXcL4g="; + npmDepsHash = "sha256-1YtyQg14vj85KtOXP93vLkqIMmT+8DAJdG/ql+1ooyU="; postPatch = '' substituteInPlace package.json \ @@ -26,7 +30,9 @@ buildNpmPackage rec { env.NIX_CFLAGS_COMPILE = # Fix error: no member named 'aligned_alloc' in the global namespace - lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; + lib.optionalString ( + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 + ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; npmBuildScript = "build:prod"; @@ -34,12 +40,12 @@ buildNpmPackage rec { package = snyk; }; - meta = with lib; { + meta = { description = "Scans and monitors projects for security vulnerabilities"; homepage = "https://snyk.io"; changelog = "https://github.com/snyk/cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ momeemt ]; mainProgram = "snyk"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/so/so/package.nix b/third_party/nixpkgs/pkgs/by-name/so/so/package.nix index 9c837f4ae2..12c978a9b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/so/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/so/package.nix @@ -31,7 +31,7 @@ let buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices Security diff --git a/third_party/nixpkgs/pkgs/servers/softether/default.nix b/third_party/nixpkgs/pkgs/by-name/so/softether/package.nix similarity index 83% rename from third_party/nixpkgs/pkgs/servers/softether/default.nix rename to third_party/nixpkgs/pkgs/by-name/so/softether/package.nix index 976521f061..2f7cba3428 100644 --- a/third_party/nixpkgs/pkgs/servers/softether/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/softether/package.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchurl -, openssl, readline, ncurses, zlib -, dataDir ? "/var/lib/softether" }: +{ + lib, + stdenv, + fetchurl, + openssl, + readline, + ncurses, + zlib, + dataDir ? "/var/lib/softether", +}: stdenv.mkDerivation rec { pname = "softether"; @@ -12,7 +19,12 @@ stdenv.mkDerivation rec { sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6"; }; - buildInputs = [ openssl readline ncurses zlib ]; + buildInputs = [ + openssl + readline + ncurses + zlib + ]; preConfigure = '' ./configure diff --git a/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix index e82849b968..614be9acbc 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix @@ -70,8 +70,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles protobuf pkg-config ]; buildInputs = [ openssl rustPlatform.bindgenHook ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libcxx IOKit Security @@ -96,8 +96,8 @@ rustPlatform.buildRustPackage rec { # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions - CPPFLAGS = lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - LDFLAGS = lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib"; + CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; + LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib libcxx}/lib"; # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/by-name/so/sonarr/package.nix b/third_party/nixpkgs/pkgs/by-name/so/sonarr/package.nix index f5967bbb90..915599971b 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/sonarr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/sonarr/package.nix @@ -1,4 +1,5 @@ { lib +, stdenvNoCC , fetchFromGitHub , buildDotnetModule , dotnetCorePackages @@ -24,6 +25,7 @@ let rev = "v${version}"; hash = "sha256-RDhJUf8P2STTug69EGozW0q87qDE40jf5G7n7pezWeY="; }; + rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system; in buildDotnetModule { pname = "sonarr"; @@ -100,6 +102,7 @@ buildDotnetModule { "--property:Copyright=Copyright 2014-2024 sonarr.tv (GNU General Public v3)" "--property:AssemblyVersion=${version}" "--property:AssemblyConfiguration=main" + "--property:RuntimeIdentifier=${rid}" ]; # Skip manual, integration, automation and platform-dependent tests. diff --git a/third_party/nixpkgs/pkgs/by-name/so/sonic-server/package.nix b/third_party/nixpkgs/pkgs/by-name/so/sonic-server/package.nix index 62857f464d..bc10180a54 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/sonic-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/sonic-server/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; postPatch = '' substituteInPlace src/main.rs \ diff --git a/third_party/nixpkgs/pkgs/by-name/so/sound-of-sorting/package.nix b/third_party/nixpkgs/pkgs/by-name/so/sound-of-sorting/package.nix index c6cb6e6a1c..b7b14312e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/sound-of-sorting/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/sound-of-sorting/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { wxGTK32 SDL2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix b/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix index 615fd3dc7b..9912146eb1 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage rec { hash = "sha256-UABbrNNcNaN9NgtAjCs4HUoNXMaK4QvCuWERuEnMG6I="; }; - nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ darwin.sigtool ]; + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.sigtool ]; buildInputs = with ocamlPackages; [ base64 diff --git a/third_party/nixpkgs/pkgs/by-name/so/sourcery/package.nix b/third_party/nixpkgs/pkgs/by-name/so/sourcery/package.nix index 79f469347a..6c35b80779 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/sourcery/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/sourcery/package.nix @@ -11,18 +11,20 @@ let platformInfos = { "x86_64-linux" = { platform = "manylinux1_x86_64"; - hash = "sha256-IJFuMtrddHciuHGeiCuv4hgco9E3GJveegL7dBmVmAw="; + hash = "sha256-aTANmCWyR8QVZVQGk1WbgjWjZeBSUN2ZVNg5ab9s6n0="; }; "x86_64-darwin" = { platform = "macosx_10_9_universal2"; - hash = "sha256-eTD8NnmDTMSB0dt5skPOlWbnW6AexxEkKZ9ABc+kUas="; + hash = "sha256-9ihkrgcREVbp7GDvl7w1MlpAWmpjHFusJYNqvBnQij4="; }; }; - platformInfo = platformInfos.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); + + inherit (stdenv.hostPlatform) system; + platformInfo = platformInfos.${system} or (throw "Unsupported platform ${system}"); in python3Packages.buildPythonApplication rec { pname = "sourcery"; - version = "1.19.0"; + version = "1.23.0"; format = "wheel"; src = fetchPypi { @@ -30,7 +32,7 @@ python3Packages.buildPythonApplication rec { inherit (platformInfo) platform hash; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix index cf3ca6f063..89fa1d1582 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix @@ -59,7 +59,7 @@ let passthru.updateScript = nix-update-script { }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spade/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sp/spade/Cargo.lock index 604659a01e..274d64e694 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spade/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/sp/spade/Cargo.lock @@ -26,15 +26,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.14" @@ -146,9 +137,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.4" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -156,9 +147,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -168,9 +159,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -435,9 +426,9 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -592,9 +583,9 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.49.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" dependencies = [ "windows-sys 0.48.0", ] @@ -758,11 +749,11 @@ dependencies = [ [[package]] name = "prettydiff" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" +checksum = "abec3fb083c10660b3854367697da94c674e9e82aa7511014dc958beeb7215e9" dependencies = [ - "ansi_term", + "owo-colors", "pad", ] @@ -1000,7 +991,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spade" -version = "0.9.0" +version = "0.10.0" dependencies = [ "clap", "codespan", @@ -1034,15 +1025,16 @@ dependencies = [ [[package]] name = "spade-ast" -version = "0.9.0" +version = "0.10.0" dependencies = [ + "itertools", "num", "spade-common", ] [[package]] name = "spade-ast-lowering" -version = "0.9.0" +version = "0.10.0" dependencies = [ "itertools", "local-impl", @@ -1060,14 +1052,13 @@ dependencies = [ [[package]] name = "spade-common" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", "logos", "num", "serde", - "tracing", ] [[package]] @@ -1086,30 +1077,21 @@ dependencies = [ [[package]] name = "spade-diagnostics" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", - "colored", "insta", "itertools", - "local-impl", - "logos", - "spade-ast", "spade-common", - "spade-macros", - "thiserror", - "tracing", ] [[package]] name = "spade-hir" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "codespan-reporting 0.12.0", "colored", "itertools", - "local-impl", "num", "serde", "spade-common", @@ -1122,12 +1104,9 @@ dependencies = [ [[package]] name = "spade-hir-lowering" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "codespan", - "codespan-reporting 0.12.0", "colored", - "indoc", "itertools", "local-impl", "num", @@ -1137,18 +1116,16 @@ dependencies = [ "spade-common", "spade-diagnostics", "spade-hir", - "spade-macros", "spade-mir", "spade-typeinference", "spade-types", "spade-wordlength-inference", - "thiserror", "tracing", ] [[package]] name = "spade-macros" -version = "0.9.0" +version = "0.10.0" dependencies = [ "proc-macro2", "quote", @@ -1158,7 +1135,7 @@ dependencies = [ [[package]] name = "spade-mir" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1166,7 +1143,6 @@ dependencies = [ "derive-where", "indoc", "itertools", - "logos", "nesty", "num", "pretty_assertions", @@ -1174,12 +1150,11 @@ dependencies = [ "serde", "spade-common", "spade-diagnostics", - "spade-macros", ] [[package]] name = "spade-parser" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "colored", @@ -1197,7 +1172,7 @@ dependencies = [ [[package]] name = "spade-python" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1226,7 +1201,7 @@ dependencies = [ [[package]] name = "spade-simulation-ext" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1254,7 +1229,7 @@ dependencies = [ [[package]] name = "spade-tests" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan-reporting 0.12.0", "colored", @@ -1282,14 +1257,11 @@ dependencies = [ [[package]] name = "spade-typeinference" -version = "0.9.0" +version = "0.10.0" dependencies = [ "assert_matches", - "codespan", - "codespan-reporting 0.12.0", "colored", "itertools", - "local-impl", "num", "serde", "spade-ast", @@ -1305,7 +1277,7 @@ dependencies = [ [[package]] name = "spade-types" -version = "0.9.0" +version = "0.10.0" dependencies = [ "num", "serde", @@ -1314,24 +1286,15 @@ dependencies = [ [[package]] name = "spade-wordlength-inference" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "codespan", - "codespan-reporting 0.12.0", - "colored", - "local-impl", "num", - "serde", - "spade-ast", "spade-common", "spade-diagnostics", "spade-hir", "spade-macros", - "spade-parser", "spade-typeinference", "spade-types", - "thiserror", - "tracing", ] [[package]] @@ -1509,11 +1472,11 @@ dependencies = [ [[package]] name = "tracing-tree" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675" +checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" dependencies = [ - "nu-ansi-term 0.49.0", + "nu-ansi-term 0.50.0", "tracing-core", "tracing-log", "tracing-subscriber", diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spade/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spade/package.nix index e154d7ccfd..678bcfc723 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spade/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spade/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "spade"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "spade"; rev = "v${version}"; - hash = "sha256-DVvdCt/t7aA2IAs+cL6wT129PX8s3P5gHawcLAvAAGw="; + hash = "sha256-IAb9Vj5KwyXpARD2SIgYRXhz1ihwcgCTwx3zbgoN6dE="; # only needed for vatch, which contains test data fetchSubmodules = true; }; @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec { '') ]; - buildInputs = lib.optionals stdenv.isDarwin [ python312 ]; - env.NIX_CFLAGS_LINK = lib.optionals stdenv.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12"; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ python312 ]; + env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12"; meta = with lib; { description = "Better hardware description language"; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spades/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spades/package.nix index daa748087b..2270ba3390 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spades/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spades/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { readline ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix index 65e98b92b4..9423978ed2 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { rocmPackages.clr rocmPackages.rocfft rocmPackages.hipfft - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp ; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix index eccf87258a..2e07da1cdb 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (gpuBackend == "rocm") [ rocmPackages.clr rocmPackages.rocblas - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp ; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spotifyd/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotifyd/package.nix index 2a9bd5394e..45cce27547 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spotifyd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spotifyd/package.nix @@ -6,15 +6,15 @@ rustPackages, pkg-config, openssl, - withALSA ? stdenv.isLinux, + withALSA ? stdenv.hostPlatform.isLinux, alsa-lib, - withJack ? stdenv.isLinux, + withJack ? stdenv.hostPlatform.isLinux, libjack2, - withPulseAudio ? config.pulseaudio or stdenv.isLinux, + withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio, - withPortAudio ? stdenv.isDarwin, + withPortAudio ? stdenv.hostPlatform.isDarwin, portaudio, - withMpris ? stdenv.isLinux, + withMpris ? stdenv.hostPlatform.isLinux, withKeyring ? true, dbus, nix-update-script, @@ -38,14 +38,14 @@ rustPackages.rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = - lib.optionals stdenv.isLinux [ openssl ] + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] ++ lib.optional (withALSA || withJack) alsa-lib ++ lib.optional withJack libjack2 ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio # The `dbus_keying` feature works on other platforms, but only requires # `dbus` on Linux - ++ lib.optional ((withMpris || withKeyring) && stdenv.isLinux) dbus; + ++ lib.optional ((withMpris || withKeyring) && stdenv.hostPlatform.isLinux) dbus; buildNoDefaultFeatures = true; buildFeatures = diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix index 38be57a23e..89b6a84b51 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix @@ -122,4 +122,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spral/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spral/package.nix index 720f013733..19fc5c5a5f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spral/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spral/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "subdir('ssids')" \ "" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Skipped test: lsmrt, segfault substituteInPlace tests/meson.build --replace-fail \ "['lsmrt', files('lsmr.f90')]," \ @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { blas lapack metis - ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; mesonFlags = [ (lib.mesonBool "tests" true) ]; - LDFLAGS = lib.optionals stdenv.isDarwin [ "-lomp" ]; + LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-lomp" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix index 5f25699c99..bc3612ceeb 100644 --- a/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ nlohmann_json faiss sqlite ] - ++ lib.optional stdenv.isLinux gomp - ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ++ lib.optional stdenv.hostPlatform.isLinux gomp + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; SQLITE_VSS_CMAKE_VERSION = finalAttrs.version; diff --git a/third_party/nixpkgs/pkgs/by-name/sq/sqlpkg-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlpkg-cli/package.nix index 0f58e490c4..d084e817b6 100644 --- a/third_party/nixpkgs/pkgs/by-name/sq/sqlpkg-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sq/sqlpkg-cli/package.nix @@ -41,7 +41,7 @@ buildGoModule rec { badPlatforms = [ "aarch64-linux" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: linux-arm64 "x86_64-darwin" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: darwin-amd64 - "aach64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH + "aarch64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sq/squeezelite/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/squeezelite/package.nix index 41d5f8c9d3..5a07d3da94 100644 --- a/third_party/nixpkgs/pkgs/by-name/sq/squeezelite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sq/squeezelite/package.nix @@ -9,8 +9,8 @@ libpulseaudio, libvorbis, mpg123, - audioBackend ? if stdenv.isLinux then "alsa" else "portaudio", - alsaSupport ? stdenv.isLinux, + audioBackend ? if stdenv.hostPlatform.isLinux then "alsa" else "portaudio", + alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, dsdSupport ? true, faad2Support ? true, @@ -23,7 +23,7 @@ soxr, sslSupport ? true, openssl, - portaudioSupport ? stdenv.isDarwin, + portaudioSupport ? stdenv.hostPlatform.isDarwin, portaudio, slimserver, }: @@ -59,7 +59,7 @@ stdenv.mkDerivation { ++ optional pulseSupport libpulseaudio ++ optional alsaSupport alsa-lib ++ optional portaudioSupport portaudio - ++ optionals stdenv.isDarwin ( + ++ optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ CoreVideo @@ -75,7 +75,7 @@ stdenv.mkDerivation { ++ optional opusSupport opusfile ++ optional resampleSupport soxr ++ optional sslSupport openssl - ++ optional (stdenv.isAarch32 or stdenv.isAarch64) libgpiod; + ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) libgpiod; enableParallelBuilding = true; @@ -99,9 +99,9 @@ stdenv.mkDerivation { ++ optional pulseSupport "-DPULSEAUDIO" ++ optional resampleSupport "-DRESAMPLE" ++ optional sslSupport "-DUSE_SSL" - ++ optional (stdenv.isAarch32 or stdenv.isAarch64) "-DRPI"; + ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) "-DRPI"; - env = lib.optionalAttrs stdenv.isDarwin { LDADD = "-lportaudio -lpthread"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { LDADD = "-lportaudio -lpthread"; }; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix index e677562fe3..0b192024f2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/atj/ssh-askpass-fullscreen"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Small, fullscreen SSH askpass GUI using GTK+2"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "ssh-askpass-fullscreen"; diff --git a/third_party/nixpkgs/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 47edd91a4f..4cfe2b6ec7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/third_party/nixpkgs/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage { nettle openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/ss/sshesame/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshesame/package.nix index ac9f9b2a55..8f600712be 100644 --- a/third_party/nixpkgs/pkgs/by-name/ss/sshesame/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ss/sshesame/package.nix @@ -20,7 +20,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix index 28e895fddc..70a4f00290 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-dyMkqD2Fdopv620p9bzOXxiG3vp4t0H+x5UDelbpMko="; + hash = "sha256-9s7F3pcamzwAESA/mKnCnSPpSmAX+L81fDoDpR71gzA="; }; - vendorHash = "sha256-FLMF0JTSTSkwI86i4StkY1r/W+x43TwlcLsmNYO7YnE="; + vendorHash = "sha256-QNi98VRy5BtML8jTxaDR3ZQfkXqjmfCf5IrcvGKE+rc="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix index 959b4d2c2f..06392d8afc 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix @@ -26,7 +26,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.9.4"; + version = "0.10.0"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "refs/tags/v${version}"; - hash = "sha256-GDi7kRwI0GujQBJXItQpYZT1I1Hz3DUMyTixJ/lQySY="; + hash = "sha256-9qk7+LJntEmCIuxp0707OOHBVkywlAJA1QmWllR9ZHg="; fetchSubmodules = true; }; - cargoHash = "sha256-7gJi6sykmKRuZZ8svXWlktHnwr78zaE2jxVIt+sZPHg="; + cargoHash = "sha256-O1LuEHH5VD/6875Psfp5N/oWYlo1cuTlHzwcgG9RrpI="; patches = [ # Remove "PermissionsStartOnly" from systemd service files, @@ -63,17 +63,17 @@ rustPlatform.buildRustPackage { openssl sqlite zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; # skip defaults on darwin because foundationdb is not available - buildNoDefaultFeatures = stdenv.isDarwin; - buildFeatures = lib.optional (stdenv.isDarwin) [ "sqlite" "postgres" "mysql" "rocks" "elastic" "s3" "redis" ]; + buildNoDefaultFeatures = stdenv.hostPlatform.isDarwin; + buildFeatures = lib.optional (stdenv.hostPlatform.isDarwin) [ "sqlite" "postgres" "mysql" "rocks" "elastic" "s3" "redis" ]; env = { OPENSSL_NO_VENDOR = true; @@ -140,9 +140,13 @@ rustPlatform.buildRustPackage { # thread 'smtp::queue::concurrent::concurrent_queue' panicked at tests/src/smtp/inbound/mod.rs:65:9: # assertion `left == right` failed "--skip=smtp::queue::concurrent::concurrent_queue" + # Failed to read system DNS config: io error: No such file or directory (os error 2) + "--skip=smtp::inbound::auth::auth" + # Failed to read system DNS config: io error: No such file or directory (os error 2) + "--skip=smtp::inbound::vrfy::vrfy_expn" ]; - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); passthru = { webadmin = callPackage ./webadmin.nix { }; diff --git a/third_party/nixpkgs/pkgs/by-name/st/static-server/package.nix b/third_party/nixpkgs/pkgs/by-name/st/static-server/package.nix index 4ec8b8c208..3be8eec4b8 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/static-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/static-server/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; # tests sometimes fail with SIGQUIT on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/deps.json b/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/deps.json index dcccde30fa..781070050a 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/deps.json +++ b/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/deps.json @@ -350,33 +350,33 @@ "org/springdoc/openapi-gradle-plugin#org.springdoc.openapi-gradle-plugin.gradle.plugin/1.8.0": { "pom": "sha256-LRFzQyMeKb4i5Im8H0gl4dS771RZBeeTJE6VIhlXFU8=" }, - "org/springframework#spring-core/6.0.21": { - "jar": "sha256-6hAcEZYy7BwVwGO9avCtJV5/dMDSBhOHGDHlsOsc7ew=", - "module": "sha256-cmbm7tQH6OwzKmgs5QaTvyHPewmc60uZBkJd/fwzgKE=", - "pom": "sha256-G6Nuhhu3V4VGBQE+l/6muxKZ6tawr5PcqV7hg6ThD0M=" + "org/springframework#spring-core/6.0.23": { + "jar": "sha256-TOmcA/2FlH1DV/xCrN5OCAs2TVOjrLHPq52jmCQMQpE=", + "module": "sha256-eCrk9Me63PoSiLZ+lzw96kPqoMD4am2RCEIAn2i+l9w=", + "pom": "sha256-FU3YnVr9T1idQA4GJkk87ONTsYc2e/ODPvVx97KQ5kE=" }, - "org/springframework#spring-jcl/6.0.21": { - "jar": "sha256-wD7+HIUhxnsBnesYD9UEiv4rxYBV0HUpoDPgs+rAoBg=", - "module": "sha256-nzNxci3DureCbLLX1kmxIuA3bpIUs9UuerE16c0qBdQ=", - "pom": "sha256-hTuGMxKwJwk99Y8CkKaD4f0+RU7oc5aijLPLTRZsigg=" + "org/springframework#spring-jcl/6.0.23": { + "jar": "sha256-zCnuRaX/A2qZwLue0aCEBls2HvWiSeD0XxZYzMP0dQQ=", + "module": "sha256-4F58rXbbpxI0nJWB/wt3dyzJ9jiRsOtI9Feyq36ObtQ=", + "pom": "sha256-JAilcZX6oBf25+ye+N2K7InB3Qa5ZyBopMpWiALKl7I=" }, - "org/springframework/boot#org.springframework.boot.gradle.plugin/3.3.2": { - "pom": "sha256-q6trOUpFRpRSzVe6nAx3Td/ljzoQTTr94CYa8V20bj4=" + "org/springframework/boot#org.springframework.boot.gradle.plugin/3.3.3": { + "pom": "sha256-SHyRhpM1VBVPNMRGjdmXT7uP5RFIQufpX/+xRgByx2o=" }, - "org/springframework/boot#spring-boot-buildpack-platform/3.3.2": { - "jar": "sha256-7xcRIXIV73LWr1kLp8MFb0syrpH3KAmqbnA/2an6yW8=", - "module": "sha256-JTX+Q0EJDDhDf4qozqccCkW5svpWoBCQATq4tkNl1us=", - "pom": "sha256-jHjQVnsMbDUsHEcWMlNLZmHLpdBksYb1lg83W7rRqTk=" + "org/springframework/boot#spring-boot-buildpack-platform/3.3.3": { + "jar": "sha256-UEKb3MNeOZCt2ihxww/XUrAnGv7g5TjyE8PX5ZByLbs=", + "module": "sha256-m7CjJpiRH2Ihu7HZzDvnbl47Vwo6iDzo4SrDOG/bt/U=", + "pom": "sha256-+tXOpADAaQCnG2cd6bFlSbD09toq7OPD96/oVaLfZVY=" }, - "org/springframework/boot#spring-boot-gradle-plugin/3.3.2": { - "jar": "sha256-hk7oyLFWJPkEhhr65FIBRuJemZEtpX5Bi2Xu+8xPws8=", - "module": "sha256-a4OnNwvt/CW4VewSTQa9fRRJMl0WvzZ+RmbHnY/MjSo=", - "pom": "sha256-+Wpjm5nY86dtiJLI76GE0WV6YEyKrTUd0WuqVkwWRyE=" + "org/springframework/boot#spring-boot-gradle-plugin/3.3.3": { + "jar": "sha256-ysPXrX3mx/HuKuuYYPPYRPmJ5aWID9584uJD+LX87to=", + "module": "sha256-eVyg3KXtRGn6y4ncKYXwLaTw0t/njtYQ0lqllgy2tS4=", + "pom": "sha256-C3vpjWCiOYC+vmjURltwZu6gIaYp3hhubccMPx7wVw0=" }, - "org/springframework/boot#spring-boot-loader-tools/3.3.2": { - "jar": "sha256-lEn2gx09mr95Vo0jKDxQ5gRFecEunj/ZzRJrkW0xz+M=", - "module": "sha256-YeDeRJPWGXi0HbEgjrnlB/VOgRsITtF9WHMLFkNWFxw=", - "pom": "sha256-/kXzLTimfw1ihpVimELOpZvBxUOoyffhy39JAk8hRrM=" + "org/springframework/boot#spring-boot-loader-tools/3.3.3": { + "jar": "sha256-t7GP3zNlrA7EpAx7SKKrCkG1pO/tG6hNCV6X2B6FKkA=", + "module": "sha256-71wjj5dj89YIFc+F9MWAhb87IXIN61BXtRSqXqvYacE=", + "pom": "sha256-L7qaHz+9geHzuzFVkS9Mx+i5GWWoZOeJGkGEiIGy8uM=" }, "org/tomlj#tomlj/1.0.0": { "jar": "sha256-Mml8dWeykhxHNnioILE/xkcAqoe7FFdu60jQ7VhHz9Q=", @@ -392,16 +392,16 @@ } }, "https://repo.maven.apache.org/maven2": { - "ch/qos/logback#logback-classic/1.5.6": { - "jar": "sha256-YRXGysXtHZ24ENFPL39N1qnyHwrLuoAW5NqsoroPXrg=", - "pom": "sha256-SysA32EjwOKmHnG1vis/AHOWeLtLBplA1cScJN9T9Zo=" + "ch/qos/logback#logback-classic/1.5.7": { + "jar": "sha256-fLF/axL9pO5pGRYEjKeprk0bDNvmgSWs+dbi2v2ywX0=", + "pom": "sha256-xu/O1xfr0JOrhQE78w+G8vw8KyrpOQtbEZkzQ+GJGMM=" }, - "ch/qos/logback#logback-core/1.5.6": { - "jar": "sha256-iYx9EgGZ834azIEY2XqxWk0CsOcuJ7qfBYQ8s3ThYMY=", - "pom": "sha256-BpPQaN02h3R1rYCQbjHHvA1RlbgtTAB1HcGcHqUR5xE=" + "ch/qos/logback#logback-core/1.5.7": { + "jar": "sha256-wyspr2nCAe/eaGIl+LQ5+QU+iOyqrBEMAvy+G0cj+tw=", + "pom": "sha256-wUBD7EJzFU9mAbrmNZ+EldTDIbC51lIDEi3PqS9ozpc=" }, - "ch/qos/logback#logback-parent/1.5.6": { - "pom": "sha256-e9/LJJJGgaSRRNujSpJ7i9B5INCS6sw972H55kevTeg=" + "ch/qos/logback#logback-parent/1.5.7": { + "pom": "sha256-jKYZjNN538JvvZ9nzbMR8+pF0KQXlAaQsnVEuyK8kmM=" }, "com/bucket4j#bucket4j_jdk17-core/8.14.0": { "jar": "sha256-bNVTaEKXO+mR8nzFrcvK87+UqNVCpKfSiqgu9unXkk4=", @@ -432,8 +432,8 @@ "com/fasterxml/jackson#jackson-bom/2.16.1": { "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" }, - "com/fasterxml/jackson#jackson-bom/2.17.0": { - "pom": "sha256-SWSsYtWw5Ne/Vuz4sscC+pkUGCpfwtLnZvTPdoZP0qU=" + "com/fasterxml/jackson#jackson-bom/2.17.1": { + "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU=" }, "com/fasterxml/jackson#jackson-bom/2.17.2": { "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" @@ -488,12 +488,12 @@ "com/fasterxml/jackson/module#jackson-modules-java8/2.17.2": { "pom": "sha256-PznFUQn1GiKIF7SxheQ1G57wUBwJ/B4aMHWulUfMLQM=" }, - "com/fathzer#javaluator-parent-pom/1.0.0": { - "pom": "sha256-U/69/ms0GhAC65MQ1e96dgJGefcqduxSMrBVfZ1wrM8=" + "com/fathzer#javaluator-parent-pom/1.0.1": { + "pom": "sha256-YRV0qFwGU9vwoDS7iJ9LrCZr0oZz6EZ2w2o6TNqWLfg=" }, - "com/fathzer#javaluator/3.0.4": { - "jar": "sha256-azLZDUDV4A5sTRLy0WvKe4tQO2vv05IpIVFqL9aR9fk=", - "pom": "sha256-KN9au2+4cC0WQ5yhJwf8vwXt/G/DsXeivZPO7L2gaZ4=" + "com/fathzer#javaluator/3.0.5": { + "jar": "sha256-kRfz3GEP5z7oe7YtQRjxjpK4+lfj6U+sa+vDVL3aTJk=", + "pom": "sha256-y1S3+s1i4tvFhS2gx773uFnMeK+5Q3lTRiC2bxzLpr0=" }, "com/fathzer#parent-pom/1.0.8": { "pom": "sha256-zRQ6tSZOnHOx0gQmT1GKVaAZpmgdV/J5C+s9s90sPCA=" @@ -671,39 +671,42 @@ "io/micrometer#micrometer-bom/1.11.2": { "pom": "sha256-2qo2vb6vKmnTVi6A92D+f4bU02uUGsBbqhjPpGtkvhA=" }, - "io/micrometer#micrometer-bom/1.13.2": { - "pom": "sha256-XE2QmZjMh2t+0GcFTjbf3jhyqvHMwXlYRBPRm5otOKs=" + "io/micrometer#micrometer-bom/1.13.3": { + "pom": "sha256-xD1wWkeHyOQp6bMFsKpiVfviCX1HcYPwCAndinZ2M2k=" }, - "io/micrometer#micrometer-commons/1.13.2": { - "jar": "sha256-aHdswJpL3YCrz+ZeCiyu5cmohYDfH3xhW/0T5LqmD3s=", - "pom": "sha256-uaqM32HoDCx07UB/H0nlXIA7N4s+vXdTdUpqVOpMxWQ=" - }, - "io/micrometer#micrometer-core/1.13.2": { - "pom": "sha256-zAmX1LlLcPM4U+b6oXzci1GgJgI7GNR0g0liWYFruPA=" + "io/micrometer#micrometer-commons/1.13.3": { + "jar": "sha256-H8SQ4yL89PO7dTknt3bQVlKTRWwy/jCkWPDockT0LJA=", + "pom": "sha256-SoLrComRu0BDukTCGWKSaVFjbL/GLepXphAbYK1+HgA=" }, "io/micrometer#micrometer-core/1.13.3": { - "jar": "sha256-Rr7DcsfOF45esPJSlVFpng1CGpFggea9ixn9BNNMJLM=", "pom": "sha256-R+O5kmD9CNE6N+B79dGkPZH3xt3z0c+EMwWRtHgMFak=" }, - "io/micrometer#micrometer-jakarta9/1.13.2": { - "jar": "sha256-fzFkhb65YiRd6dKlrPQBT54IBpj0YL47/SILfzXun9k=", - "pom": "sha256-oEAGCvo0R6MppKhnXxn2D1ZvGd4PM+UiWrvTsfxM0A4=" + "io/micrometer#micrometer-core/1.13.4": { + "jar": "sha256-Hp4vjK5OA7J6UxU4JY6KxJltQGnc5qWHRpKx6sQ69M0=", + "pom": "sha256-mSMQXJGJa84JZLz+P4lYFfdYCUpWzo/CgsugHhfeX/0=" }, - "io/micrometer#micrometer-observation/1.13.2": { - "jar": "sha256-RFthXXsKKwkXsES+pJbC7ITFfLNAKkfqvJ4jpyodb2g=", - "pom": "sha256-t+zBGzKL4yCVgS2xrzBETY0A31jVCnjed9HoNmGGqL8=" + "io/micrometer#micrometer-jakarta9/1.13.3": { + "jar": "sha256-2/+Z75paecE+fMOcbCpOBiU9GsHZct7mxZEa3eawXOI=", + "pom": "sha256-USyflJ7tBuQj3a9rOyooy2lY2XV/ez6MjoqXSb1d/kM=" + }, + "io/micrometer#micrometer-observation/1.13.3": { + "jar": "sha256-KEQJqlIbvZTQ7kTtXNzYQa6SWVtOCX8cXtmRFLPXfq0=", + "pom": "sha256-kOBBaz0gKPFhoUHdOTOlaSnaOatb3y5e+LR8OudZ7qs=" }, "io/micrometer#micrometer-tracing-bom/1.1.3": { "pom": "sha256-fprbb3oR0grb8tb/f7NMCJ9FGvQdM7uRjr17kcXszJk=" }, - "io/micrometer#micrometer-tracing-bom/1.3.2": { - "pom": "sha256-WCBle6ny978wTH3Hm3Ff/kNLZxDsSL9thtWUxsCgeyA=" + "io/micrometer#micrometer-tracing-bom/1.3.3": { + "pom": "sha256-asg8mL5RXogZ6gCu+UC5waAhWbQwWMOv7bCMBQlYGLg=" }, "io/netty#netty-bom/4.1.107.Final": { "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" }, - "io/netty#netty-bom/4.1.111.Final": { - "pom": "sha256-LxE5AjZCCLuzLVUeBisFqyGWkvvBK9SN4dg8dXbltHA=" + "io/netty#netty-bom/4.1.109.Final": { + "pom": "sha256-ZjFy46WwvVMEUtlhTVh9KtU6Pdp+9CPaJbc0KSIqNJE=" + }, + "io/netty#netty-bom/4.1.112.Final": { + "pom": "sha256-u0u5kR+qJuoVQQ3khkTldI6uHDyYl7giipZDTIFIdkc=" }, "io/netty#netty-bom/4.1.94.Final": { "pom": "sha256-FLsEPt93HvaT1f9ezBRm913JFpjwSn+oIrMJPT0COdE=" @@ -720,13 +723,9 @@ "module": "sha256-BfI8ABvRI1lpnqe+Y6bRi03YWoqRZ/PxehkRrwI9t7k=", "pom": "sha256-agI/PfE5yap6gWUR1YSSnd0PXrhIeb+i46VRTFsXYJI=" }, - "io/projectreactor#reactor-bom/2023.0.7": { - "module": "sha256-KIu60CfoIui75I1Hg7i5Qes3yWtUwTYRtYTlgRZIoIU=", - "pom": "sha256-5DaYyGxzzJ/iStBv9xvDnJ+pu8TA0XH1Akrm5s2f7as=" - }, - "io/projectreactor#reactor-bom/2023.0.8": { - "module": "sha256-RPdA2LQUlNzTcXf80BpT6lHHYTPOdeyhXYhGo9Puxys=", - "pom": "sha256-rbEqFI/dxgJBs/NA1cgZs3mEPwtKVToZSUckOjqodvw=" + "io/projectreactor#reactor-bom/2023.0.9": { + "module": "sha256-vgQb/Qssr/3lUPq24GQ96BMDMtZebbjl4QU20H3oQvE=", + "pom": "sha256-jKuM4gyjXW9iffsW6evwiYCUt9Y00E2bN8jAFIQ+jiw=" }, "io/prometheus#client_java/1.2.1": { "pom": "sha256-/I9/4rTvDO7chDk7iQCpPWSxnJg/+CFmyEozZnBwun0=" @@ -853,16 +852,16 @@ "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" }, - "net/bytebuddy#byte-buddy-agent/1.14.18": { - "jar": "sha256-O6V6UELEzgk6uH4LM+CPSwuoxemV9nlyg/moBfOB8cw=", - "pom": "sha256-O9eBQc8GlZ2fw6B/B+mcvtj88/VPaXPfhfqjHVmvcS8=" + "net/bytebuddy#byte-buddy-agent/1.14.19": { + "jar": "sha256-nzOGemHnJhrw/kt46NhDQoS1dylZeFJNFoHlv7z96E0=", + "pom": "sha256-61VgCGre00h7uCvIw7/GVJoonQpBGOJAUSOryZ2dBdw=" }, - "net/bytebuddy#byte-buddy-parent/1.14.18": { - "pom": "sha256-dpxdCxEV5z9oRSu6qjVrrZtzfV/ge4PUyeSDl1uB/jw=" + "net/bytebuddy#byte-buddy-parent/1.14.19": { + "pom": "sha256-Swuyl9Wz4gov5jLlorCt8Qoy27CdUuaeMbGtumfemm0=" }, - "net/bytebuddy#byte-buddy/1.14.18": { - "jar": "sha256-UhF68WlqU6p3wTE1MHStolzL3y31EfKvM/rWcE+pUQQ=", - "pom": "sha256-IvsZB4/nBkirYFSSZscUaZaEciaqbm9+iP7MCBRySTk=" + "net/bytebuddy#byte-buddy/1.14.19": { + "jar": "sha256-hBWkTYQbLN7N9dc6BcKajPktwrYPyn/3s/Ic1DG1pOw=", + "pom": "sha256-fEn+DXvCCenqFWsqmFUbCJzxOTI1zNr9O7cr8NTaodg=" }, "net/minidev#accessors-smart/2.5.1": { "jar": "sha256-J5auhX0Me+S8NYDapNOCjVVSEjVfTIPTjdCvB0KzyBI=", @@ -918,6 +917,9 @@ "org/apache#apache/7": { "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" }, + "org/apache/activemq#activemq-bom/6.1.3": { + "pom": "sha256-9psWXzrwS+S91wLXDv3brT3AMh0XlUhN05WKYndB03I=" + }, "org/apache/activemq#artemis-bom/2.33.0": { "pom": "sha256-AsD+oOjmq5RmO0Lv87cWE74rlBxUoKrY9dB8E3ICQvI=" }, @@ -1008,18 +1010,18 @@ "jar": "sha256-X7o5sziM5KOnf6ALCcQpY+Zw4IIE+qfsvzYeVrQ/TAg=", "pom": "sha256-0QoW58RKxMdKydm1gPBz+Vds5DxXnyS0VQcW0Ha2Chc=" }, - "org/apache/pulsar#pulsar-bom/3.2.3": { - "pom": "sha256-glIRsTCZxKtjxW1RyjSxkwsK5wSTriM65NlgDCxyciI=" + "org/apache/pulsar#pulsar-bom/3.2.4": { + "pom": "sha256-tYnjUUDRq5YAR+TVHhioOwdpbqhZxtBizQpmFH91NP0=" }, - "org/apache/tomcat/embed#tomcat-embed-core/10.1.26": { - "pom": "sha256-vy/AoBY1jgaRQg7DqkpOKJltsCqHMt2YGQlIA8l9TtY=" + "org/apache/tomcat/embed#tomcat-embed-core/10.1.28": { + "pom": "sha256-pFlWRkZovs3BsTLQ8PmOwBr7F/rpFcE1Qc/sH7HSuxc=" }, - "org/apache/tomcat/embed#tomcat-embed-el/10.1.26": { - "jar": "sha256-4LAtF3NaV7I346uY0G/Z22zH/8Is63fRXqpuF21Hl80=", - "pom": "sha256-O03JYoIqoQNM5yMYS8gQXeSlbT/gl+xPboEp74NoRcw=" + "org/apache/tomcat/embed#tomcat-embed-el/10.1.28": { + "jar": "sha256-VR21zzai+YP+XyZstVwRVU8BJtBVjnXSM8KblFUuRpM=", + "pom": "sha256-x/zALShLPoogeyuFJVCOcOtdEWaL5MnWu+Tr8VcI8q4=" }, - "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.26": { - "pom": "sha256-Eosbto+denJJNe1aMNXdXkWzXeSEyRPeBlJoJIlsYKM=" + "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.28": { + "pom": "sha256-4DzQjxzE+dC4jvGMT93iqGbV5QB3V+i8os3LE5ZNeaQ=" }, "org/apache/xmlgraphics#batik-all/1.17": { "jar": "sha256-F0thbZPqTauabQwjwatfFGEjwO4lNAh5MWB/nuElMZE=", @@ -1055,12 +1057,12 @@ "jar": "sha256-dd0cBFSSv/jhljqrsov+kDwgZOEeJ/4vDwr/GtPYRHY=", "pom": "sha256-sJ04k7/zYJkkXdPBnELIDdzLGAukcvlMGqti8A41vgg=" }, - "org/awaitility#awaitility-parent/4.2.1": { - "pom": "sha256-WsfwsKQvHZ8FlOR2BzWtZ/tB44/XvG8T32rYepIweH0=" + "org/awaitility#awaitility-parent/4.2.2": { + "pom": "sha256-X123oZqQMkVHlOJP5gCsfe0UJqKJGdxKwUxK7haMWiU=" }, - "org/awaitility#awaitility/4.2.1": { - "jar": "sha256-U+fWTNLJqW4csFMh0mwc6l1VYlvnXjmtmMdzzl//pqc=", - "pom": "sha256-jHasu3eUMbnT7TBJXhCa9hfA0h1LFQ+tlRjI8kYFBY0=" + "org/awaitility#awaitility/4.2.2": { + "jar": "sha256-6DH+4w7UAeIgjxvVoO+a3VONnLEQPA5DIWaRtke96cY=", + "pom": "sha256-huWduqlfl1kBmysOurS8nW4Mqgtp++oPwFPA0gbOyFk=" }, "org/bouncycastle#bcpkix-jdk18on/1.78.1": { "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=", @@ -1107,139 +1109,139 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/jetty#jetty-alpn-client/12.0.11": { - "jar": "sha256-d233t/2wqQpRdButSEfM8fsbRYYdyZp5p76IAOX1JAs=", - "pom": "sha256-LkhOWJqoXzwsqxqpRhRMD9ioqQxJwQ91xSM5nzPah38=" + "org/eclipse/jetty#jetty-alpn-client/12.0.12": { + "jar": "sha256-4mf9xsx02y6eJuwnll1aczAE12hLpsLtfAswpwQ0pHs=", + "pom": "sha256-FYdywozNsWimWZn3c88+69/nqgBSzolCCPYsA2poyi0=" }, - "org/eclipse/jetty#jetty-alpn/12.0.11": { - "pom": "sha256-u8/h6g/UpXvql1sm/UBUBVBWGLCRG5DRn0dqm7N+qqg=" + "org/eclipse/jetty#jetty-alpn/12.0.12": { + "pom": "sha256-t7+M4tllKw6ld+lh8bCPkLaVV8+2jcb0vLW4JG8WZSg=" }, "org/eclipse/jetty#jetty-bom/11.0.15": { "pom": "sha256-+ksNDeuvyR9Q++wI7+RkInAzTzeOg562o1+jdqoaLPg=" }, - "org/eclipse/jetty#jetty-bom/12.0.11": { - "pom": "sha256-+HG/S+2tbNiGmmrLq++gofJW3vAjCoI2jw0JLH5+RBc=" + "org/eclipse/jetty#jetty-bom/12.0.12": { + "pom": "sha256-dzRoBQU3U3I2j/ipaQwnOuSIx7DdIIOHm0NB7WFQ6MQ=" }, "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": { "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" }, - "org/eclipse/jetty#jetty-client/12.0.11": { - "jar": "sha256-BIuCF9K//qpHr7udZrJhcMFXLchtKDIif306HtbI8AI=", - "pom": "sha256-1XFsJCtmxYNx6WS18+teqtrfoYZFwaKGcY0P6KFPtOc=" + "org/eclipse/jetty#jetty-client/12.0.12": { + "jar": "sha256-1zfWnTUArGN/4dg4fmw25A5EK8ts4rofglh9V7iAIWE=", + "pom": "sha256-aCSLpuFN2qDN2FwS6NYSYvzwfryByhaFXcmZjvCJqIQ=" }, - "org/eclipse/jetty#jetty-core/12.0.11": { - "pom": "sha256-mrdvtmr7NPjpyzfNTP8gTE8V8BfAle0APblBS+oCMSc=" + "org/eclipse/jetty#jetty-core/12.0.12": { + "pom": "sha256-Upv+JBwPlFsDsxc7Kl5dw2FvFUjF8uOLC94L2aJ1Vgg=" }, - "org/eclipse/jetty#jetty-ee/12.0.11": { - "jar": "sha256-0RavVD+BUW8djjz2+8HuZ6CpXkxegkCqBT/yvUgRttw=", - "pom": "sha256-2v3DN7UXHuyMizwSHK10I2QwPak6ztcnNCjcMbzuhfs=" + "org/eclipse/jetty#jetty-ee/12.0.12": { + "jar": "sha256-ejG2W8SyBrRlut4wbqsdTVmCmOPry0tmm2vE9qMX++A=", + "pom": "sha256-lvjEqFNJaRHSoKqIyJFYwRqNRB92cYF6IdJ3WtmtI1o=" }, - "org/eclipse/jetty#jetty-http/12.0.11": { - "jar": "sha256-A7NdesatITaGabdMWxTELh2XSnpL/M+eBp8iJld4KT4=", - "pom": "sha256-uz4/YcXF0PD/08PvNHRo405RfZOPgj5NVjF14DIX6nI=" + "org/eclipse/jetty#jetty-http/12.0.12": { + "jar": "sha256-g6fRsmj2qNyHmByqlrSoffbn9r2dkxUJmq5wVukbAs4=", + "pom": "sha256-G1wG3OoOY5GZxn2sHhUxE1e8QLFN0ZZ8vy9gIGX2b7o=" }, - "org/eclipse/jetty#jetty-io/12.0.11": { - "jar": "sha256-5ybND6N+Oe87E4zERc8ZQ7ujnUM6DpJvDKInTo/2OIA=", - "pom": "sha256-HB0GR2FWyzr4TEXHzmEhe9W7iyjWUySAMkqD5YS4gcQ=" + "org/eclipse/jetty#jetty-io/12.0.12": { + "jar": "sha256-AYfbD3qZRnfKRPgGX1pGru5AXWpLfpG3SlDKJi3cuzk=", + "pom": "sha256-H9RV1Psn9s6q460D3mg5Nll8jG5YJ3ZeGAaruFn05xQ=" }, - "org/eclipse/jetty#jetty-plus/12.0.11": { - "jar": "sha256-sIZVYoiuAeFienM6yQFnu/hCDKOYgbvzCtGOQsUpnTw=", - "pom": "sha256-30H18x9lMOFrX5Rmek4OU9EQiZGoXN7hpCkQ6JJL1IU=" + "org/eclipse/jetty#jetty-plus/12.0.12": { + "jar": "sha256-bMx+snI/x7x2CP3l0cdFFMhbMmktKNpZAupKG60fgz0=", + "pom": "sha256-QLRXmY/1wH4ACMrw7BxcndDmbbp4IX/rQcKiubufP5I=" }, - "org/eclipse/jetty#jetty-project/12.0.11": { - "pom": "sha256-YqN/jBjUWr/Q/V8VpET3LrUcTyR7ht2HLILPkJaanCw=" + "org/eclipse/jetty#jetty-project/12.0.12": { + "pom": "sha256-sC2BLgmxK6YvgctyJRr+jDyCgO+CfbFGsmJmY+PAQUM=" }, - "org/eclipse/jetty#jetty-security/12.0.11": { - "jar": "sha256-NT6yGeEP9WNWIHxsG6/9IplMsttNuGJqotbD+6vnyx0=", - "pom": "sha256-P+Kt+LtwUswIYMmAWyJhzfuk6YKtDJoBXKcNoZv37BU=" + "org/eclipse/jetty#jetty-security/12.0.12": { + "jar": "sha256-ta/GVeMrPnRwmO8aPwN0VLFXLRrJT/SYMvY17Gq6JT0=", + "pom": "sha256-K/r4acVb/WS6EiDpkGiT2TZ7ZDt/D0Mn4ThXDtUL66A=" }, - "org/eclipse/jetty#jetty-server/12.0.11": { - "jar": "sha256-nmDSz5xB5dYmlee/sqMVOHDChk42faykA+hO5nP9QJM=", - "pom": "sha256-+mCyprUeeqdmAz867x1rdGiBoR1zitd5x2RxoGjgt5E=" + "org/eclipse/jetty#jetty-server/12.0.12": { + "jar": "sha256-KZuZLlDH2YcbRQ+jOqDjbVZBIYrhD/v0RJ9Z2EX+LiI=", + "pom": "sha256-gQWA463CC2hOmy/jjscrHlgSBvmROGPwTVIZmp9bW8M=" }, - "org/eclipse/jetty#jetty-session/12.0.11": { - "jar": "sha256-GnAchVy5XkcUbff8rZYAX1Xp1qrfYsXoiSNwQnSEncA=", - "pom": "sha256-NGiAIMIuE2Ny4x+QdchXQA3ZfKkyrVZT5IJrp1wJ9Wg=" + "org/eclipse/jetty#jetty-session/12.0.12": { + "jar": "sha256-ifbkwJzjVy1JUGtXTSNbmxz+w2feNd6nzkejk+vnXPY=", + "pom": "sha256-7AdduV9udDbFaXKznrsOOo/0XI3mJWQqAkzXBot7f6Q=" }, - "org/eclipse/jetty#jetty-util/12.0.11": { - "jar": "sha256-i8PdWUW82WK/xNfWh1R7JaB4x1Zar9ldzTfVjmFciz0=", - "pom": "sha256-XamFfv8WXdXLa0/gm35w8wd1pP6J6t+OHuJjtp36C6M=" + "org/eclipse/jetty#jetty-util/12.0.12": { + "jar": "sha256-YYbEa6qOI2/evtsmxtK/oQIDkI2wgFDXJCX1rKcHwY0=", + "pom": "sha256-V1o5JPYPx3paSnsc72NQYyKI8DKuQQJUWkVmQk1S09k=" }, - "org/eclipse/jetty#jetty-xml/12.0.11": { - "jar": "sha256-PQmh/srT7/YzywR0tjgQybIRTMAgTTTnpnudlqBoJbk=", - "pom": "sha256-DUe1D3awABu62QjgKsmt/t9VhwpjRU0GoRlKThS1Z9w=" + "org/eclipse/jetty#jetty-xml/12.0.12": { + "jar": "sha256-Uvw8VZh0YNS+wdAYrPkvQx+OXkgcEA6ilc/NS7dUDzI=", + "pom": "sha256-gJ5nTeTqZ9cniJYF+/vnpIy0xOV4S5AEJbsTVCfoeJM=" }, - "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.11": { - "jar": "sha256-krEOTZGtZhzt7dQpYk3DkW/rj0qeHoAGkgM+TAKIeTQ=", - "pom": "sha256-ye6RcyJ5zfmZhhz4hGwnNgFXDIIEI9vhkXdpJnCSE68=" + "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.12": { + "jar": "sha256-b9pshCbAQkNfY0B2jsBviFFSOVEh8rttpuvZg2KsED0=", + "pom": "sha256-BR7X88+PpcbDDpmdawJWV11/9tDX27xsm8ko/9bfKZ8=" }, - "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.11": { - "pom": "sha256-tCm2e3nigmhxXBsj7ZvQtUrhXQlQm3ZRPtT2PzkNqU4=" + "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.12": { + "pom": "sha256-k7TEDwUFaFDXGo5rY55HhR8+FBR1FX1C6QrbzdtSpfY=" }, - "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.11": { - "jar": "sha256-erGduHdZzNEdnmrz3ciQzqUBCWBF04lTQUDYfIfuaVE=", - "pom": "sha256-q+YMuJbPZnugZXgxRkvCDV34i65dGn4zKKRmvWuGPfg=" + "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.12": { + "jar": "sha256-RlOwU7HOQHvX34uvHULJryR9IPSsnbuMQvL8KGHYCQA=", + "pom": "sha256-+5r7sujyqgDHsEThDpagvDTPF6NZqYErZ4ItbSo1X/4=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.11": { - "jar": "sha256-MSk6krPpidXVd+Xdnoo7b8wDDHh2F7aZp4O1cfauczk=", - "pom": "sha256-/0e4pSxcC1T7H+OUzm/EEh9JPr70wPFgzAoBPG+/7tw=" + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.12": { + "jar": "sha256-34G3jxfDRU8V9mcfLMGi9CMYzHioVubnnqWkwv47nHo=", + "pom": "sha256-4atDXmtWqwM3vofgjc3yYvVXa/+eHf8VhDcQAkH57Lk=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.11": { - "jar": "sha256-LWjqf7zog9qPdlgb5ZYYmAifbeLY/CiGE7TT2jwKA9o=", - "pom": "sha256-5j9nzvdfYi8GKJcSsVUWhZBVAbOqDE7aLb2psb/tDJY=" + "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.12": { + "jar": "sha256-64AQ7QTWnJisRR7mD/EPFeprXr1uUTZIv/k7AP562/I=", + "pom": "sha256-K2u0CFNmKF00LgTYU3xIvxpNwqgKinWGJeot5tFxDhw=" }, - "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.11": { - "jar": "sha256-o+LW+37CPXY2vt0WkJSBkdHGHjYMgQ/NRyZM8zKFfMg=", - "pom": "sha256-k9+uxX/ggVGLNuJCIHQoCHz4jNxzTxlgimaBnaq8/2k=" + "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.12": { + "jar": "sha256-TfoaPmyPnPv02LtVmO2nvokkGv6XqVh19Rmzk/eYfs8=", + "pom": "sha256-LK3Tjj2idBy5ITBQn8MJ5p6EDcZG+yrzS1FTwqaUHF4=" }, - "org/eclipse/jetty/ee10#jetty-ee10/12.0.11": { - "pom": "sha256-H7jnAVhNEOCH/blxrgCAyJvaQviblZTWCKCqaHSxOgc=" + "org/eclipse/jetty/ee10#jetty-ee10/12.0.12": { + "pom": "sha256-PU7E8jbFs+6r9Wb10Sx2EstbHsR8VCOImrAw1v2gAJI=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.11": { - "jar": "sha256-YHiyeQw63Sl7D3Wwn4d2AgjUFk25BiJNxyilSJmQduo=", - "pom": "sha256-YcVt2R9ZfoxQ6Z/NTt01WGvSXLftKs8BXPFyBzMPnhg=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.12": { + "jar": "sha256-4ZcI+q7ZKVDnm2WZWTgGjV2NVMn7A2T1ObimEApp0tA=", + "pom": "sha256-dH6wuRPFZDlCCHa+lau6CyFOzTB+o0OK/Ko+uxJoRBw=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.11": { - "jar": "sha256-0/QaafQNf9PIVoP6LHARaK1N15zo+kydBk+1ACBhSR4=", - "pom": "sha256-iHYwn9bI+wekTGA2LXz2PCkW4GnrVkQw9EaxHkG47k0=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.12": { + "jar": "sha256-MBPT/F2Sr1/XWU7LWPW7x01zx29+WVPe1rYbeexmyWQ=", + "pom": "sha256-IhiPnL4qWDpTJKqOSsd9P1WNTbcbZviZGleW1RJGJyk=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.11": { - "jar": "sha256-2Noj6IAW6d8QSVi1si6PTS5TJTAnyhaBDFFfeAF/WcE=", - "pom": "sha256-gLpVxr2PNSQRc4h0qNSZUchOYRTQPZUxR9y6yuAiwas=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.12": { + "jar": "sha256-moBo1h2AEJOvawEjNgLF3uslpXs8tjcleYIkBni8Wzo=", + "pom": "sha256-7yxNOTJgnCDvCBm9yFBQKH7VHD+cVw622ScFPbXUumY=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.11": { - "jar": "sha256-9Eu4v380uWP9R19uDtXP3Snk/RW4xWUc/hN1Gxi3pnw=", - "pom": "sha256-BlVpcN7wokz84d+1Oae5dL3e5zH+SwPvq4748Y1grLw=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.12": { + "jar": "sha256-xKebDmTGgZbH7DF8LiQ41Q7XZWHzWnSkMCjASV931Og=", + "pom": "sha256-sambI9rJ8IrB/uYVXUByTt3Lh0a4hPpyZZgP5o8IVLo=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.11": { - "jar": "sha256-hQn0pMRASCgxo7ata2pkLoA3wfjHonOxwWe8ELoMmVM=", - "pom": "sha256-cmcj1ZYAqmHHKsUtr3InhTnynApw06l83zGwl+bc+Fs=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.12": { + "jar": "sha256-BxNzPPmXmXk9zRBamSSSA2zo4rzT+dRc/h7MbMzxGg4=", + "pom": "sha256-uhS5/90KrkIh0L6Mi3Xgcrh8aXziptTwZizQbLOpdRI=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.11": { - "pom": "sha256-8aR4ZQM8DLwILYzTT9NGW92MrgLpmumTsNEM8MD8Auo=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.12": { + "pom": "sha256-SC7ohkYUVjPv0gqEv7YIj5u9YOIDF2/jm3LITpXbW8g=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.11": { - "jar": "sha256-+FQqb1TtsZwAUHzbqu673Nrowxc7J/ZJUuxPj4lM5HI=", - "pom": "sha256-/fh9a/ZbJCAS1uZcKM9cBpkrPDXE+2UVdVl70vk/CqI=" + "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.12": { + "jar": "sha256-7uCgNxXBJ/QipABBn1k39BZf/P8fjsiG02Yw0/3Glfc=", + "pom": "sha256-7qG/C0jWUhJHA3BMj9ig5R2b1Vc88Ep4i24V43JdxXk=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.11": { - "jar": "sha256-H1rL0W316nufV15f46aSjY2QdfU+WcpaxPo5sMXRk+4=", - "pom": "sha256-Fqstj9z4skIMCWnY2kAFFi5C+0MnM8LO6k172l8MNcU=" + "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.12": { + "jar": "sha256-G9WmKF1E7466lxCB0ukUzZn0xEBWMJuhgj7BEdqev44=", + "pom": "sha256-8hkYN9bolAInBcv9z5utm3DCino9ogoFwrdD71IZRdM=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.11": { - "jar": "sha256-TpSxhOC46Jfy7v2WtmV2V3FCFbBtuAv23PXlfA30SyA=", - "pom": "sha256-UtBkEPFAOSiWTGZYvb7uj1CVO9DYqYVk96gZphyHqqA=" + "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.12": { + "jar": "sha256-tPzDCMNA6G2opmlilRoPp3xuQ+YBysR2V7POGEd5vyQ=", + "pom": "sha256-qo56LVuDcL1rdiIloQo84MI6Szi0tBhWeU5ANNREl3o=" }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.11": { - "jar": "sha256-14+rLBDd6meO3SOpvjTu7sSQWIdSh/yCBENuQmOPtjs=", - "pom": "sha256-9YUSCOu5lXuwf5dvPMP8euMqCVEptdIvEfVpC0YS8rg=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.12": { + "jar": "sha256-UsUEn4qzzjSfdm6UYvV/rARRYSW/RE703xNxCMV6lB8=", + "pom": "sha256-eOVSVCtPyb3CEjy/iTDIvWVP31iLASwGHIrQCo2bvWY=" }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.11": { - "jar": "sha256-f8l220puL/sgBEm5ryRnUXG/WnZ6Wj9BIZsqFMISuBo=", - "pom": "sha256-/IA8acw88k01Tkta77D4dqUhChr+RWEHVr1KiccOY8o=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.12": { + "jar": "sha256-hmOaTrEqDLKou60n8hrpmiDgDWkHVoaaIloQFOygvHU=", + "pom": "sha256-jk1dZZNxR2bNkO518I2FwQMNqhxjTGchwMhgQRIFpmk=" }, - "org/eclipse/jetty/websocket#jetty-websocket/12.0.11": { - "pom": "sha256-N/WTlTAf5wmt6G7HB6r4BTBvhPcCxkYItxDBjgRF0AI=" + "org/eclipse/jetty/websocket#jetty-websocket/12.0.12": { + "pom": "sha256-5thUcMY/08Lp1VHFCTkkEyu2jgi0GjHroiepjhDpino=" }, "org/glassfish/jaxb#jaxb-bom/4.0.3": { "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" @@ -1262,8 +1264,8 @@ "org/glassfish/jersey#jersey-bom/3.1.2": { "pom": "sha256-WmsvkyguMAlcrhRpCiqrWpxTa1f/MuiQ6giu/4qEwT4=" }, - "org/glassfish/jersey#jersey-bom/3.1.7": { - "pom": "sha256-m4AjmwxYfUZRKmDg3M1mA+W3LiCUhcI6ZIUjrMBXsxs=" + "org/glassfish/jersey#jersey-bom/3.1.8": { + "pom": "sha256-KlqyAV6x4PzvSYnUSPttyL7+LM87PROGPhhtYse77RY=" }, "org/hamcrest#hamcrest/2.2": { "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", @@ -1291,12 +1293,18 @@ "org/infinispan#infinispan-bom/15.0.5.Final": { "pom": "sha256-1qTKkMta/plIFuxQ2jX3GG5PG835+2eNC8ggZpvj9tk=" }, + "org/infinispan#infinispan-bom/15.0.7.Final": { + "pom": "sha256-WBOzn+0YV1/lSnwSp43HOw29ikxhFZH1jT0whVsy/+Q=" + }, "org/infinispan#infinispan-build-configuration-parent/14.0.12.Final": { "pom": "sha256-WTir5k+BZwjr5C5mlla+UltuhfxMyAh3OkVqnp6ne6I=" }, "org/infinispan#infinispan-build-configuration-parent/15.0.5.Final": { "pom": "sha256-DAglqIiuar5Z8TLIQEnnXpNY9m8jXB+VFNR4V8wz5KE=" }, + "org/infinispan#infinispan-build-configuration-parent/15.0.7.Final": { + "pom": "sha256-uM6y236AO1bdaktGtBoKEchNP5Rpee4SnO/oT8kxYWI=" + }, "org/jboss#jboss-parent/39": { "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" }, @@ -1313,8 +1321,8 @@ "org/jetbrains/kotlin#kotlin-bom/1.8.22": { "pom": "sha256-yNeU63YYiNNDaeZ33o6roLAfnop1bPv/UyFcz6XFjD8=" }, - "org/jetbrains/kotlin#kotlin-bom/1.9.24": { - "pom": "sha256-C0X4euepSH/YOQ938pltWiWBkgCPts6ie3zqeM906v8=" + "org/jetbrains/kotlin#kotlin-bom/1.9.25": { + "pom": "sha256-GZrnpYnroWgYRqlUmmlc87CkLB2SEZpQqDD/Erq7oCM=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" @@ -1443,19 +1451,19 @@ "jar": "sha256-cZCVwH1CA5YTINpZNEHYs7ZDwY6x2Bqpjqkzu36zUbo=", "pom": "sha256-xqiAc3trPIon2aBcYEhTanpwuzUMuR3OIza2cQorpig=" }, - "org/slf4j#jul-to-slf4j/2.0.13": { - "jar": "sha256-+l7Y8j3yFY0NTVyC+FyuKJ02zDzXt0l97/Wjewt9eHg=", - "pom": "sha256-/fhn5qka/IR0hVPTl0qbplH19MRaUZ9rfR6iwjjpMK8=" + "org/slf4j#jul-to-slf4j/2.0.16": { + "jar": "sha256-Dy7DluopyaRAiQ0fCf24L91XS0eymENXZCNUUcGThh0=", + "pom": "sha256-ZrmCqPWdeK480y5UaMHUjn78wYZruIPYqYgE2E3rZn8=" }, - "org/slf4j#slf4j-api/2.0.13": { - "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", - "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" }, - "org/slf4j#slf4j-bom/2.0.13": { - "pom": "sha256-evJy16c44rmHY3kf/diWBA6L6ymKiP1gYhRAeXbNMQo=" + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" }, - "org/slf4j#slf4j-parent/2.0.13": { - "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -1478,35 +1486,35 @@ "org/springdoc#springdoc-openapi/2.2.0": { "pom": "sha256-Los3sS+E+doEZrqeLfbA2nneG1cyCSPFNW/oXbE0d2w=" }, - "org/springframework#spring-aop/6.1.11": { - "jar": "sha256-gW42lwosddylchzAUtX7UgLfRZ+SO9DCfsTwEzcab20=", - "module": "sha256-idHxz7bRA6WbxEak+MripJkA0Z7BSrhYDT3yqt3m3qg=", - "pom": "sha256-hUlyUooyoTWgQxcdmiGtCPTKkgGWPptXt47jZO9HWbE=" + "org/springframework#spring-aop/6.1.12": { + "jar": "sha256-fBLmk3hEpCgC1o7WmrMcnTNnXgxLLx7BL/t5U4vx8P4=", + "module": "sha256-eb5GsboCAyyRGfZa1kY4JCVJIn9DRA4OY/OFO5Urw8M=", + "pom": "sha256-4MOBWbo0jp6yZaavDnq9eSsujxJq81yGrWvoWdQIGuU=" }, - "org/springframework#spring-aspects/6.1.11": { - "jar": "sha256-w0hSoqKQHf+Ja/QF2wEWzyULvJbvl/mueO5SNUpenDA=", - "module": "sha256-9vk/4nrfj9pq3Z/C+K0xBjSBfP2mEpJCGtZScxTUnE4=", - "pom": "sha256-5W8A3+SonvFwEx5ZbQ8WtCFbHpVsAg0ZW1tK7qleMNk=" + "org/springframework#spring-aspects/6.1.12": { + "jar": "sha256-CcS/SjYtnK5dVGSzwY47o7Bk4S6jBhyGy0Rjiz1PEic=", + "module": "sha256-+4RoppA5n5CXzGFLxYUdJZ81FbHDYCZett5CdQ4VMtw=", + "pom": "sha256-UgHQPY4IDkWidn3s2zI+IqTL8XdOhgpHTTRehRNydJU=" }, - "org/springframework#spring-beans/6.1.11": { - "jar": "sha256-Na+FCUpE+fm8s7UKkyN7YJ5DqLeJ3y6UGPRHJf+bLb8=", - "module": "sha256-f0Kod9ywNrC3051T2g60uqWuOfkU/G+dP/h/GAN9wzA=", - "pom": "sha256-vg3AHpEhUpIzaILVlrd6zHRb2+pen+ttD4fXk2SoWo0=" + "org/springframework#spring-beans/6.1.12": { + "jar": "sha256-UDXoYsT6o0NJ+Z7vKDgN7fmUCjACIYw+UB1gqMyJPj8=", + "module": "sha256-x9ISxLxFi17XsVwZh59Nr+nzFlcni4qZ3Sq46HQcqwo=", + "pom": "sha256-zciJOknEs6M13llL6C/Vn7hW2MlzPDno1iKBTcwMkLM=" }, - "org/springframework#spring-context/6.1.11": { - "jar": "sha256-Auf7t/iVL+GCsnjwsv3/fstrq2nXfu4XO8SnDaBUU6A=", - "module": "sha256-rwdUGLT6qFjRTcAt9jz0/YGttb2yQFr6IAHr9m8f3dA=", - "pom": "sha256-V10K3ZiWFYYoIJoA5Sp5puURIMVEn8ivfer5L0OBR04=" + "org/springframework#spring-context/6.1.12": { + "jar": "sha256-V2NQ6DkMWQV+fTOUQeCujCvwjh8sjh1ZQVwh3H7SyfA=", + "module": "sha256-6dRwpGQ6DsNpTtdYztMYGx99LIDXLhJmjtTs+mRyiCc=", + "pom": "sha256-hUnp0JGFg5yJFJljfAx3a8ogNw1kkAfwFbpUFFtLBTA=" }, - "org/springframework#spring-core/6.1.11": { - "jar": "sha256-H4fvuCAmOKqH3AHaOn/3zCpyRCsuALteQg0g5MywUgQ=", - "module": "sha256-CWGTK1IJIHmIMgC6sxl2QMjvTihCCOdR8h/Eq4xQHEw=", - "pom": "sha256-nwuchJ3lsDuCeqHuAELLIrzHQfTVVCujtqk1zWW2qp0=" + "org/springframework#spring-core/6.1.12": { + "jar": "sha256-AQ1jmMf2W8LaPDi81sDrt5b0/jJVgAvAXnEvQ9T8p/s=", + "module": "sha256-KWYBRVUVcWZ06vLZydcD0m5q0BXf+lThEzNLr8y7HUs=", + "pom": "sha256-ncr5G5WfB+zIT68GdhMmrlHTwS6jzf9u7EUNvVdj3xo=" }, - "org/springframework#spring-expression/6.1.11": { - "jar": "sha256-Ut5tuApp34MIPYs5Z9TzrP37gJXQoUSwCsDbM/NaLxw=", - "module": "sha256-7cw6pn7XDxPHA/gs0DqOCWpYoRTBqn0iCFk/uMAlPPI=", - "pom": "sha256-hpMYHwI2GqmOagbywCbILmghRNaIAg/Q/S1Kvi+KWeA=" + "org/springframework#spring-expression/6.1.12": { + "jar": "sha256-x4y58ZojPqg3uYV+w8hMImM71jN+s5rnPxayrfPWyiU=", + "module": "sha256-FxMjcUcyUZ1WLY+m/0hW8maC2p3ZI75DLhNA4o78i+o=", + "pom": "sha256-/dl5KKzEMdiziCvjeSOSQpmNwpihBF0G8PJhynxY6x0=" }, "org/springframework#spring-framework-bom/5.3.29": { "module": "sha256-pslWW9lncgrg50PCMmUst9yai4GAjvFDWv1/aJICE78=", @@ -1520,47 +1528,43 @@ "module": "sha256-CV5xI53YkWkSRMjWvm19o05nC2UYaUeexdJBXZmrYZI=", "pom": "sha256-SK3yYlH1WiPKJZbVBuBZEdmnZ3fm0CxSgMGhd4wUMGc=" }, - "org/springframework#spring-framework-bom/6.1.11": { - "module": "sha256-JaL1MJ2lmvZubwE+g+IbieuRTqi4ST1I9qdw/qdzuXw=", - "pom": "sha256-f/NFyM7iqyR8ben5kg7wR5Vufm07osUJBoTxuzOVS8w=" + "org/springframework#spring-framework-bom/6.1.12": { + "module": "sha256-qAd2W08tD0aUcxc2YkBjLvqq/fO1fpE/x/kREgfGs9Y=", + "pom": "sha256-5dIoSA7FyCwgv6QfpIlBcQ+R23xQ3bZxJVYOqPlYQmo=" }, - "org/springframework#spring-framework-bom/6.1.9": { - "module": "sha256-whdM2fhXIyWikIjKKKDJULPBoxzSq1HsUCkPApGRFi0=", - "pom": "sha256-x7tJ/c8GM5pkE6z/G+pugtWTVopXqkOAsPXBrpfb1io=" + "org/springframework#spring-jcl/6.1.12": { + "jar": "sha256-6JgP3HCrRL6yAZOVcSMt/EDtgE1UtxVU/I/Ihu1de/k=", + "module": "sha256-rtWyIwjzLzOCN5jqf3a14h84TBuP7Ef3/ZLnltEAOdk=", + "pom": "sha256-cfXigwQNj/CpOQgEEPJ5GiBfAjvTBBWRD1wOPmzwI54=" }, - "org/springframework#spring-jcl/6.1.11": { - "jar": "sha256-wXiifaKVGtU418SiNhb1rcUNhjQkymNhmAgWSLNxpjc=", - "module": "sha256-kZtw4TNm/YfUZ2gaG/XlezymLL74zU3fmAFLIOApTvI=", - "pom": "sha256-lDLO7DwGVGzB1YEwuyt9Do++jKc4rgsStkgWxtI79PA=" + "org/springframework#spring-jdbc/6.1.12": { + "jar": "sha256-AoimhmOJmJ04ajKqrRU5RXXabXho3P6m6Q9Lpu1oXIs=", + "module": "sha256-d5mzq9Ryug7sMs4MfruN9TcfKCiB5JEtKeCUkPLw5sY=", + "pom": "sha256-76Nq1ppmJJC/OIhr2gt4XJSiAOAKmQfV6AqTzaiMC84=" }, - "org/springframework#spring-jdbc/6.1.11": { - "jar": "sha256-mYsiWiukjTNUuISzFL70vemByjgEdFpXLAexgCbU3Ag=", - "module": "sha256-9Yr9BYDkLozFbbODZr+bd4FmN3s58qxTPo7mPXucMy8=", - "pom": "sha256-kIqKKl1MBOkKShkCqk2GiQO+uSnpcu/MtfWwfJ9th/I=" + "org/springframework#spring-orm/6.1.12": { + "jar": "sha256-bqsM2YZddpbUNpflzuTPgBsZbHhLBlSoAuR7fS6Yc1E=", + "module": "sha256-tbAqbAYaYC4/zupu/3FEEVdL2BFO9bBaM2kHfghHhIY=", + "pom": "sha256-3LiQSzxlkFQRNRhIAZfpwIqcnthC/4PqpDRteL3JhgA=" }, - "org/springframework#spring-orm/6.1.11": { - "jar": "sha256-yNbRHAcbRjGG8TLXObfUdBOqKRMcLdbA6vILZk6hC/E=", - "module": "sha256-n+fohCgtRRMUKqiHKMnNkq413kbpe8KGdQEUn+84KeU=", - "pom": "sha256-SGaJYZoy7L4A6R7wJ1/8UnNTiD7WkE25xkGtvT25xtE=" + "org/springframework#spring-test/6.1.12": { + "jar": "sha256-BqWoDpNTOTwiuyscRHT+iAHYW42BcQU9XbkItudXmgE=", + "module": "sha256-5hX4INIATuHh9Bo3/9o1jCnLDT0A7rODj6PqC917iQ8=", + "pom": "sha256-Lb1NiCNsd7d32VSsaL7u9ppHh2dfh7R/O5dwBms9CA0=" }, - "org/springframework#spring-test/6.1.11": { - "jar": "sha256-b/a/oqJDHkZIqADLAKcTh+Jy+2KhtMvwxX4iiaWsVGc=", - "module": "sha256-oLJ8oZj/q6rP+5Nz+5P5aCmHtlQXuRDMoXbJmzV6AT4=", - "pom": "sha256-ipWmvb2YmhBBamdXqAT+PUfpZwahw0LOutkjPnvMjok=" + "org/springframework#spring-tx/6.1.12": { + "jar": "sha256-cpbRDoc2KBFHOf5+o3wRYmc6m/9cvLCpUTkfq49ufGs=", + "module": "sha256-l8iUsJPidI05lpdxd+rkn7ifYMGFzBuImKvbOAyr9wU=", + "pom": "sha256-SNSMwvlBXa2BATN2aLqwF6X/uCMs9x/Viepvo/PZwo0=" }, - "org/springframework#spring-tx/6.1.11": { - "jar": "sha256-blTm57fWY1nO4zZimeNP26w+9fLQ6m2hWPgBef+axck=", - "module": "sha256-ciM+9M18lWxeYJoaG9fyUD3N/e5LtQnmlZCdyOAuV0Y=", - "pom": "sha256-Ff4nY0/lIjknKICdJ2H1pA9Szz4qSl/xe8HlGvr46q0=" + "org/springframework#spring-web/6.1.12": { + "jar": "sha256-qeExXvr90qLygLd4Gc/P0JcOg8dopKyS1UvkSOgYl2Q=", + "module": "sha256-byUGRQ0WNtnZ6ag1syT3tzYQQ74yA03GcaBYmajNGYE=", + "pom": "sha256-5WpNnV8fg+nJoDi0r7SPYMosRixfMDpDPX8JiuFdjq8=" }, - "org/springframework#spring-web/6.1.11": { - "jar": "sha256-20jF/qrmMaAQF3wdcuvprQZM7DjquAnDcDgjF6qZF0s=", - "module": "sha256-+MdtQVPjJrB2YTmta6zld2GMKRZdsNASkJ96dFVFLqY=", - "pom": "sha256-Beh8W3H1oy1BAfxd2+oeaFjXXaMwuUK1UqFx9VK4O+I=" - }, - "org/springframework#spring-webmvc/6.1.11": { - "module": "sha256-Re29abcsiZpCYjzeMFdrwUpfaxMLBS2h+23Aajj3P7Q=", - "pom": "sha256-ub6MO42uEjvaHre0s6sX4hAGSi3sQ3LNAO9PRQ+0msQ=" + "org/springframework#spring-webmvc/6.1.12": { + "module": "sha256-UmPNrZVdGM2kiNE9nhWKcIlP9MYuw9mTvWdV9aSTiww=", + "pom": "sha256-TXHTQtGEjnxSN/UD4dbEFxwP8Gf43zQjqAKPRYdTJZE=" }, "org/springframework#spring-webmvc/6.1.9": { "jar": "sha256-LEJrlcJ9UhC2/t+LqDVadSs+LWNx/lfvkVyRKTO6Y4w=", @@ -1570,9 +1574,9 @@ "org/springframework/amqp#spring-amqp-bom/3.0.6": { "pom": "sha256-sch8n8omH3LZPz+tDWBfn6FQECv1fU6eT9Ga0ltYvB4=" }, - "org/springframework/amqp#spring-amqp-bom/3.1.6": { - "module": "sha256-76k8GqTnxJefgZbgPzdz3cgeNVC0FKnSVIeoQpxHx18=", - "pom": "sha256-KE0ojW6dJa9zkTVB8K7BDBBimWo9XqxU1FBXpfGyDFI=" + "org/springframework/amqp#spring-amqp-bom/3.1.7": { + "module": "sha256-V4RBJN1QOg+8JPUIUkNMFcSAjMhCvicZBqU+D0Xrq1M=", + "pom": "sha256-+A8UHBSgtP2fT9njnZ1s41LUal2VhEmPZS9Haq6cfAw=" }, "org/springframework/batch#spring-batch-bom/5.0.2": { "pom": "sha256-aDpeNRsQ0aR8gkN/CtTnhmTUICWhpXBtaPpDhCHt1uw=" @@ -1580,152 +1584,152 @@ "org/springframework/batch#spring-batch-bom/5.1.2": { "pom": "sha256-sVvWVb7ESiLKe/VnhcpPfubUcAOBaqBwJtF0bbECwAg=" }, - "org/springframework/boot#spring-boot-actuator-autoconfigure/3.3.2": { - "jar": "sha256-kOTRzbKOECwpF60Kx64THh5FGuW2umw0lO8KC3o9W3I=", - "module": "sha256-VMjS+7hXyXmbuozQtfgRyWL9CV+F+dM9cvFZurnj2/k=", - "pom": "sha256-Rw/ZDSBXgyFueiDFT5RMn8gaRVMqXzYXT9310z3BZmg=" + "org/springframework/boot#spring-boot-actuator-autoconfigure/3.3.3": { + "jar": "sha256-y0kydzDBH/mKJpDYnyLtCNpYmXohKDuEzVCHEGzC+mE=", + "module": "sha256-FopZO/qHKQcKsgy+WEYdPKFUNWiWEi+MVcnzwZmdyeo=", + "pom": "sha256-woBs2IPedAKqYwfPKeIuYuJfD7x55yFHTlhWPEVcUD4=" }, - "org/springframework/boot#spring-boot-actuator/3.3.2": { - "jar": "sha256-EZfC3xF0APMp9Zl8NwNPzUemZr4Q4xHK63Rqb3e6J+w=", - "module": "sha256-jajNaMkrLKhPvjl8MJCq71ZtgaNAlwhRlGiPPI4wmmo=", - "pom": "sha256-hV3xSyxQxPggnMhO3AvQAktI6U17+uoTFW8PlXo0seY=" + "org/springframework/boot#spring-boot-actuator/3.3.3": { + "jar": "sha256-YZbfrxKpRC0XKLq3pCVI89Ib5FtRBhASbyCANEw7Aww=", + "module": "sha256-8Zek/lcavWdjSJ/6AZ5GEhoMY5RuUn++bC82c+Cp1LQ=", + "pom": "sha256-Mc470SjHokTE2Hxc1vGee66p+d3Zs0hgrF9/MyG4ijo=" }, - "org/springframework/boot#spring-boot-autoconfigure/3.3.2": { - "jar": "sha256-X0epuAhcJXsxVIBaQ08CYkVH0UsLjmdarzRU9+xWsYo=", - "module": "sha256-iyInkXbCv+tNy4iCVlFJs8zCAYmt/+DAnCcfYtpeUVU=", - "pom": "sha256-l0TAtPv9xVljvcLAO/klWRxL70MOzZdk9KEap3fCsdU=" + "org/springframework/boot#spring-boot-autoconfigure/3.3.3": { + "jar": "sha256-VFThf+bmkoU86euEK9ZMbHq9kIvNgUEVOSXk4M/V1vU=", + "module": "sha256-rmN63QYIyfb5RAoG+On/Dm03wkSVc/FuenP3S/zHvYg=", + "pom": "sha256-klhrwFBjQd7B2OrM5XYBhxJblZmJnBVWVllaH3S1/y0=" }, "org/springframework/boot#spring-boot-dependencies/3.1.2": { "pom": "sha256-DIaB6QfO2iWOWU6lt8/aByuKxHDamKrAGEqO62lQV9o=" }, - "org/springframework/boot#spring-boot-dependencies/3.3.2": { - "pom": "sha256-QqSZ7zCgLVSoJs3CHyic8eq/5WGn8MXKngq32aW7GhA=" + "org/springframework/boot#spring-boot-dependencies/3.3.3": { + "pom": "sha256-NuSuqGqUmgcjhBHAFojdSdyshdNCU6kLog+3L9yXMWo=" }, - "org/springframework/boot#spring-boot-devtools/3.3.2": { - "jar": "sha256-z2bEm17YhVRoLvPfBr48tMgHmqzqhzqAEgrvJbnxEBA=", - "module": "sha256-pV79K2KsyMVqtxeinrNQIBxL4n4Akqdp/QwDoyMPGZM=", - "pom": "sha256-QznbRnlnYekkVM3VQa5ouD2N7azAON8qVcAHZBKInQ4=" + "org/springframework/boot#spring-boot-devtools/3.3.3": { + "jar": "sha256-ZaV86ii0NkH9erenzPWoQ0Mu/ez+0NV3AaXex0r1Qng=", + "module": "sha256-HIJnm4UwDQb4oKxQk2IkUcIhPuv3mdZIXs0RlvcnRbQ=", + "pom": "sha256-XllSdMXb1LzOe0Lyv/XNpHTuy6YiOqON9vqVFtZhMLk=" }, - "org/springframework/boot#spring-boot-starter-actuator/3.3.2": { - "jar": "sha256-ubo2Zofd9X5BapqHzkA/dRR9flT7vrWdK5f3DdiZkJM=", - "module": "sha256-xXKyjiyllNIt8EXinEsToWOTCwKV8Ymmwj0rttIsucw=", - "pom": "sha256-JHSVg8+lj/tOMiUd6498JkNiQQUuU2605LazT4mRH7E=" + "org/springframework/boot#spring-boot-starter-actuator/3.3.3": { + "jar": "sha256-ZyKv+UNdrdw6aZfqxctXQq3c9rwSGOVvrFYlioP2VyI=", + "module": "sha256-J6oYeXViTIcefsF5x5+laOVZRBK8aLzH7+L/dfuENR4=", + "pom": "sha256-E60HIeEPdAt4HuATH/54JBXZPibSfkKAOybz8hR+rkY=" }, - "org/springframework/boot#spring-boot-starter-aop/3.3.2": { - "jar": "sha256-nU3no0h4pzTXoib9Yqb7gtGBxWuqp/ZgD8S03Ls/BVY=", - "module": "sha256-Q174GKpAvbKD/nzZ9+G4K6NGtPd1+sfHQkhpX68Rq9A=", - "pom": "sha256-vcxdDTJhl2SR6kVeuOVcRslll/1Aei6vf58wxAuxr1A=" + "org/springframework/boot#spring-boot-starter-aop/3.3.3": { + "jar": "sha256-U/LE92SlnA+TMQyzq2SZiI1yWr+GPxoZe7nKy8ZZ/Ds=", + "module": "sha256-X3I3RS7d0PonHsEAJbPUaS0cE7AM8OJP7U2JAG79VuA=", + "pom": "sha256-NRSb/k/ckZh9CfUPssqY8W2FiaMoiPOv4xNfGfgGSyU=" }, - "org/springframework/boot#spring-boot-starter-data-jpa/3.3.2": { - "jar": "sha256-IgPb2YA3L6qu5TzpiizdguWFVnRWnuuCDHZWbhaGbjE=", - "module": "sha256-B9NR5mQtut0zsG4qmSLhXFz0r6yC8MWpayn/D2OEt4s=", - "pom": "sha256-7me2/8HrqfKKyAxwcKPYj872eVM3rhri95gxIMJaqBk=" + "org/springframework/boot#spring-boot-starter-data-jpa/3.3.3": { + "jar": "sha256-RIse6OgsBS62iDYNGoE4psungOK9f26Fphm7ANjePsY=", + "module": "sha256-pRAgmkIdEGxsy+s8lzSwbrgnxZLHCDr7a2bDN+Vtwxk=", + "pom": "sha256-JkfOyUCetcrFYNlF88R0QROjeEie7DIeVPDXuajCGUY=" }, - "org/springframework/boot#spring-boot-starter-jdbc/3.3.2": { - "jar": "sha256-f9QDVHt/IIU9R3+td0qXZq0gyjzoWz/LvQM+7jNTheA=", - "module": "sha256-Mxe6vAUlYFyJamUAS1xS1xGfXWU0ErkVqJb2eb8ntw4=", - "pom": "sha256-zCU2but7oJmaKk7vcecqbkYn42nF/Mk+z927pg85FOs=" + "org/springframework/boot#spring-boot-starter-jdbc/3.3.3": { + "jar": "sha256-ZBrNyGxc+Iqw3yd7ljqApeBcdhez4BApEw1+npExKQk=", + "module": "sha256-ljtLAENxUwhcn3KJ0Q9UBsabcG2snlk5uuLB1OZTHpI=", + "pom": "sha256-2VpTuALfAbit1qHqC9id7VLRj3za2RKIMVPE0PhKc+w=" }, - "org/springframework/boot#spring-boot-starter-jetty/3.3.2": { - "jar": "sha256-Ji22r8/lTe+uXzSMr71ttg9WU2qJmAOEdjN9Z1L0O1M=", - "module": "sha256-hrb1xcnh7Vuc3TrCOLMJOJVllqo3xdlGuamsYKU66vk=", - "pom": "sha256-6JL7+xxGxi59FZVsWGNkq0nF3ZzbmJalOzvqwL2zK7Y=" + "org/springframework/boot#spring-boot-starter-jetty/3.3.3": { + "jar": "sha256-uEd57lFkN1/4U+0HppEB1rEQSvVINIXA5Te52N4JgN8=", + "module": "sha256-TJ7qufMibHsTI9kICxbvRcm801aQDO11xVwd0zHaU04=", + "pom": "sha256-jZma/FuAIo3ce6Qtgk8O9pZm1/B8eMbAVGsfaUTEDMQ=" }, - "org/springframework/boot#spring-boot-starter-json/3.3.2": { - "jar": "sha256-G34NNdUkeRKcfN81JH8YUT+rfjO02c5nXdlQdneZvWA=", - "module": "sha256-4AuQI8+pULvhDSg9KeWXPHi3CWl1P9jSu47Cph/rn2s=", - "pom": "sha256-0ua/A4fVT6rOto4NIomLeZdqpqTW6L3lOLcwQeQ1yFM=" + "org/springframework/boot#spring-boot-starter-json/3.3.3": { + "jar": "sha256-X6ME0eqc1ZdVwP1x4QyzqXWd0YLOvlB0dE4sXXjZBTQ=", + "module": "sha256-IQWePrdHCNehiWf6tXiQdA5vjS4GMH90+v2qx1z7Qn8=", + "pom": "sha256-yaaxICYx3zCpYWiqGHnhmTFk4eBARI8NLhwgHqZqk5Y=" }, - "org/springframework/boot#spring-boot-starter-logging/3.3.2": { - "jar": "sha256-yb7ZppTXhmea+zlE7FKW02e6uPX1cbczBzRXvaZD6QE=", - "module": "sha256-fNqa1e//h0fd+L+SIAjPxFE6Aods499mGepIRSYhJo0=", - "pom": "sha256-thd9eXBFa60LEfQNwuD6m5XVl690S6/ZVsf7ti2X/Go=" + "org/springframework/boot#spring-boot-starter-logging/3.3.3": { + "jar": "sha256-G9bCZUeDegCf1QMokW9lKLcyiHWyZZ9DrzW5gWkwWjI=", + "module": "sha256-aG88tWFrlIRq9Jm5C4Frmpbq0cvw7c69wFsdtl1GcrI=", + "pom": "sha256-i5ywHoh0oZsCkz9zhpAG4vCI285Gz5xtZdBLc0KGP2U=" }, - "org/springframework/boot#spring-boot-starter-oauth2-client/3.3.2": { - "jar": "sha256-0CJB5wa2j4Z5WvxbaOGhB9TlO7f8KQEQ9eQRIDemsZk=", - "module": "sha256-UmgytkKLc+4t8gx70JPUp9cd5tE9M95h7Q2BWG9/Mt4=", - "pom": "sha256-X7BcPakLqNXarMl/fVyCcVrsfctEBSUqWx0I8AosLJg=" + "org/springframework/boot#spring-boot-starter-oauth2-client/3.3.3": { + "jar": "sha256-R3TvNTp/VzY9nn+VjDMJ2S1Uuzw501mmmn3PojW/m2Y=", + "module": "sha256-PX9cgZRLXAgbHJ8t7pY8fD4fQIuigxK/9Dm6vOZLP+Y=", + "pom": "sha256-sZU/zDXdqBefv0Y2Twxsrj5InQhDU2sxFq75mWGnfnI=" }, "org/springframework/boot#spring-boot-starter-parent/3.1.2": { "pom": "sha256-TB9NCfr9cgJEhZCDvfx7VytHF22Bil965q1m0ZOODO4=" }, - "org/springframework/boot#spring-boot-starter-security/3.3.2": { - "jar": "sha256-ideFKtD4gdWxnBt4j0+yL+YWBTHk46WpBaejUCdQ60s=", - "module": "sha256-YqVWLsA1QZnyDZ/OBs1YC9twMME1kjBkNvgqq383YAg=", - "pom": "sha256-UNV2IfpshPCw21feq8EsAb7oc3X+mv08adh59nlnTOY=" + "org/springframework/boot#spring-boot-starter-security/3.3.3": { + "jar": "sha256-CZIHz7uRJJcUffXLLLP+Flg0z7P9bVBxNVjEmFaedSM=", + "module": "sha256-FRjYKR/TgSaXG5Q2Tct2tyAf0PtHjaauc3K0PnIalNI=", + "pom": "sha256-HmJAJiOKA2e4EV4aURQM7P/IAteOlwLZJb6Od8KHo5k=" }, - "org/springframework/boot#spring-boot-starter-test/3.3.2": { - "jar": "sha256-dSNSweaOF0OOTTizUJ38XJQ8eGeg1geCumHJsMN+gPo=", - "module": "sha256-/7E/QBz64GoAoKU7X4rKH47zwyU3dn4VAgBMr2cIFKo=", - "pom": "sha256-3q8lMZyGx0cp6GrkGq9DGp/UkuPAOClHE2v4ovS5Nbg=" + "org/springframework/boot#spring-boot-starter-test/3.3.3": { + "jar": "sha256-AI4ei5CNbpXTYRN14o7kafJvS6dqfzxCNPwy4AP605s=", + "module": "sha256-hh+ixlqrT4uXNdwbL2xRne+mSVlWbPMG9ZdI7Xra9uc=", + "pom": "sha256-whVzqqrU3vbalhRNWhJPEOqUipTIRVp7890QQ2ZqCdc=" }, - "org/springframework/boot#spring-boot-starter-thymeleaf/3.3.2": { - "jar": "sha256-m07jcaL5ZbHc6HFJ5JNskus4GQ8Jz426xV93sHVWI5g=", - "module": "sha256-nTYqkeN8zd0YDGbysVVROGeE5qlk6rIYSjwl5j8kheE=", - "pom": "sha256-t9R/sy2vgnY8vPd1SJhWniCI7rLGQu7gc8P57Dxqao0=" + "org/springframework/boot#spring-boot-starter-thymeleaf/3.3.3": { + "jar": "sha256-tyT8jyhlULdsrrwKs8Klv+q5zsWwLGuW21/5R5EHj7Q=", + "module": "sha256-uxKYSj1FcAGcMcg6LCchkqMhlPLlBeLVT7updLwy8g8=", + "pom": "sha256-0PnSxrEZGSmh62WyZqvUCkR+EYnyiY2KUmlbt1KKwNs=" }, - "org/springframework/boot#spring-boot-starter-tomcat/3.3.2": { - "module": "sha256-bF22BjtRg59koLfTBXG39yuoJwDfnR4fjvabnJXn6UE=", - "pom": "sha256-06TxA+S2scuhwKd3LqFRrX7UOUsJtnYypzG0oJw9iJU=" + "org/springframework/boot#spring-boot-starter-tomcat/3.3.3": { + "module": "sha256-gqNQsznFvFVvtrQa21SjZWa2P1GaCwciu4J+6ATNA40=", + "pom": "sha256-CIpedDvlnXcUjmHqsf/szbM0ej6czfxmerlQXIDnQIY=" }, - "org/springframework/boot#spring-boot-starter-web/3.3.2": { - "jar": "sha256-06TvIQ1O4kLe02NSKPIlJsWtm/a5vdA2+6U62kR3ZH8=", - "module": "sha256-msfRm7RmcOtlC+evmQG/ElblKEoE1MLRTM5zBdUQh3w=", - "pom": "sha256-LocnH1L6rl4kDxjnVkPtUCbVPPyZHaA+M4ZpC6Y6bRI=" + "org/springframework/boot#spring-boot-starter-web/3.3.3": { + "jar": "sha256-4MUrXbgjmjzsXTvf84uolT4JejJflzTqyNjinJyXPw8=", + "module": "sha256-VwEcN82+JK3+GsCm/2vavD7qypw4bTGWQQw/0b/5278=", + "pom": "sha256-Ne4F6DhJkDCEHov0hvIEf6yhOMJk4pfAjyIm8y8xDSk=" }, - "org/springframework/boot#spring-boot-starter/3.3.2": { - "jar": "sha256-JunC64I7dT1Y3ybu0v6CIub4j6cUtIduOnMny4Jr/ik=", - "module": "sha256-DrdG4ex2XCWj38y4uIMD06wOnI2ns2gdE8Cb7435P0U=", - "pom": "sha256-++gpAen3rkPUPUd71ymvxrwHH8rH0LN1Ajo8khXzqtA=" + "org/springframework/boot#spring-boot-starter/3.3.3": { + "jar": "sha256-ipNJmoxD/qwTEjX9S4hSB3jR2IngEiQknjOq5bkAod8=", + "module": "sha256-pHs7v7Qxy99nxYzoy+9lAR+oG728u3SgZAFsrPICXR4=", + "pom": "sha256-A0XHriNxIaMINYEhc02WiuViIQFZ0mXld+ZiypI1fWs=" }, - "org/springframework/boot#spring-boot-test-autoconfigure/3.3.2": { - "jar": "sha256-7g8mqgsmp7jYi2b3cF/LdZhh61Q0xQZcz4VmtHvzPwM=", - "module": "sha256-OAaZJTIpRrDHw87ia9hBMMIwckIvmjak9AwYmibbExM=", - "pom": "sha256-Zr+RvYu1ZQHLQJYrwohicC+LlNzxqqb96375HsKpK1o=" + "org/springframework/boot#spring-boot-test-autoconfigure/3.3.3": { + "jar": "sha256-P7TbxV/b78P6fwUY7owIOfWCC59Cxh+9tvLDkJQL7H8=", + "module": "sha256-utHcyo/rq7H7KMYyR9luQgwIvATNTdUaFGi+nAPr6TI=", + "pom": "sha256-nvanD0tVVKL4sqdCUOC98n/NzJCjiiSTR7FI8IL8yZY=" }, - "org/springframework/boot#spring-boot-test/3.3.2": { - "jar": "sha256-D1bjDTW9dQX5louomjUVIQ2NvU7AdRK7fXHYcml+OnM=", - "module": "sha256-bFKFOzTWv37fADPpKaIBq72duwRQHuGqVod114r7vzQ=", - "pom": "sha256-tcgc739AIlEYut3QsbB6jVwxIR3MzbhKZeEtktX2U+4=" + "org/springframework/boot#spring-boot-test/3.3.3": { + "jar": "sha256-S9qi4BovimkdlOf2TDrKZuzG52nSDH0x1kEzzLccIlg=", + "module": "sha256-WmigsG5CzkWLxm9O1zFrKwm8QMRnopAJ3f289bgcgQU=", + "pom": "sha256-MFM/JB4QlYhbsdS+wx2+pycXLCJ+ifvlDji61HMslVw=" }, - "org/springframework/boot#spring-boot/3.3.2": { - "jar": "sha256-Hhj8yDtbSPshtZINlEOCjhHYpa5TLT/ByOi8MlcpSq4=", - "module": "sha256-KdtX510aJfq6q6dsZVyf/s0lMODoX13dF8m2ZZFr2/Q=", - "pom": "sha256-nNRFM3HXkVM2vN7rzoTyXRfZyqH13nwKMKuU50PFups=" + "org/springframework/boot#spring-boot/3.3.3": { + "jar": "sha256-Zfnp+qEw6u+3i2X+TYk4NIZLqRF8/0v+IjnuExyjs6o=", + "module": "sha256-sDR7AWx8szcQRq1FsDUVhGUXfpE8ZHQbVR5dYyDwUGM=", + "pom": "sha256-pFVAtzdElmL+wgr5nVlYIx/Cg+F/aR9z7wPlmiRWQ0k=" }, "org/springframework/data#spring-data-bom/2023.0.2": { "pom": "sha256-r5JYFO1beGWJH9CGEGBVcLS7hFCi9Rv55bhjXNNoHgQ=" }, - "org/springframework/data#spring-data-bom/2024.0.2": { - "pom": "sha256-rsq52NFQam0XdWHDOKwoGP6G7f7+70m2M8gPTXX85sg=" + "org/springframework/data#spring-data-bom/2024.0.3": { + "pom": "sha256-oRnTY0THGKAnk8SvmnB7rFEvlRQ8HhxTuSCHCkQ+dCI=" }, - "org/springframework/data#spring-data-commons/3.3.2": { - "jar": "sha256-tvu5ro1j9ulc+IP2B1iRgYsxJxfmoIOrCTQgN+407Zk=", - "pom": "sha256-domR7cAl3wbRWHYZJFUvl+CYiprlJzxboduZpla7LzQ=" + "org/springframework/data#spring-data-commons/3.3.3": { + "jar": "sha256-GDklxh/hxcbcpSP/BDINB0wAaSttlCIkFfB8MdD003g=", + "pom": "sha256-LAQzKSci9N15p1ftLprzyuie0xuZBbBhXYzOG91hpfg=" }, - "org/springframework/data#spring-data-jpa-parent/3.3.2": { - "pom": "sha256-LGChkDBDq0Pqu9uy3ZxlibDmZfXjYvp0YLVIFMiv40c=" + "org/springframework/data#spring-data-jpa-parent/3.3.3": { + "pom": "sha256-jYLHGTBW0ZxrXgpkzQnMQECQ/L8+UoiJaFuga63BP2Q=" }, - "org/springframework/data#spring-data-jpa/3.3.2": { - "jar": "sha256-m60Juh5dVd5R+PKLMB5Mg7UKCo4AlNuGS6xla4fhWUo=", - "pom": "sha256-vlxRAUH9Zhh8wzkx8foQo6qiIWEh0VT10GtXyMufFmg=" + "org/springframework/data#spring-data-jpa/3.3.3": { + "jar": "sha256-xQy8pH1Z6qPXdhHjchljKiCcIW9IV9Nhjfyrvgtb7A0=", + "pom": "sha256-BxEkYRsRA73zgVF+63+CzPnD8ovOHjLvXInl5iYbVh8=" }, - "org/springframework/data/build#spring-data-build/3.3.2": { - "pom": "sha256-HLMuxaw2PlKFkhC5NyrQkD/YEPtb42xTC3ffgF0FbYE=" + "org/springframework/data/build#spring-data-build/3.3.3": { + "pom": "sha256-PR6nlloFVB5WlvrcsjPXd4lDpSGO+xBc9WBTJwSiMUA=" }, - "org/springframework/data/build#spring-data-parent/3.3.2": { - "pom": "sha256-W1WQ0vnyExg/8zO/Yr51zNCEWq1KNFUqPcJlNpNW56g=" + "org/springframework/data/build#spring-data-parent/3.3.3": { + "pom": "sha256-7lhfrM5yJbJjJYkVDT8zUdULhKtgzbudZNU0ehjS7KU=" }, "org/springframework/integration#spring-integration-bom/6.1.2": { "pom": "sha256-0mxOaZYUSD15O82BeZxUTtpYlXYrSzGXFX7tAo7GL+c=" }, - "org/springframework/integration#spring-integration-bom/6.3.2": { - "module": "sha256-jtTN03h9fSx7Bs+iW+t3nlgwVECemodQu+nVEwBvK+8=", - "pom": "sha256-XCkogoxuL2IiIKJflQTQAOyvAJJyHadLJ686PLl+520=" + "org/springframework/integration#spring-integration-bom/6.3.3": { + "module": "sha256-4G2ff/AE5rIXIM7mTB4eTLz2p/F9YOX8a/hVcr+ZGAk=", + "pom": "sha256-Qtk7GmD4VaFBciWxl//uoIRX9OmSTP1lDApxGJ4oRuE=" }, - "org/springframework/pulsar#spring-pulsar-bom/1.1.2": { - "module": "sha256-BEKJLyKXoAs03CLUHTiKwWuKOBrpbkE74mJru3B8XRc=", - "pom": "sha256-VD+X63md1tjtm6Tb8fs8AU4SJjNcKzUN06Qk6RVES7o=" + "org/springframework/pulsar#spring-pulsar-bom/1.1.3": { + "module": "sha256-N+CeG+oqv+uQ18KW+Vt2LFKaluuDTg5CibNIRlsigaU=", + "pom": "sha256-OZFprHySNZldO5qv5NXem/Ucb7gRt34cTnZyTlICC9E=" }, "org/springframework/restdocs#spring-restdocs-bom/3.0.0": { "pom": "sha256-/8nEe+Wo60iO3pJozgiaeZyT6JT7G9P5QPYsRnpmEyM=" @@ -1741,52 +1745,52 @@ "module": "sha256-HMJ40imEfP7hLpBd9w5W5W4eo2m+LKd3S/u60EtbMos=", "pom": "sha256-P0nGqe8bTNCnKRAzAyshnLkmzIPX3KlutclyzSQnI44=" }, - "org/springframework/security#spring-security-bom/6.3.1": { - "module": "sha256-Czp67CjE8d+a2Ngwu52CriaW8hi5eBqA/Ioj8M/Czaw=", - "pom": "sha256-gVx1DQkI+pq9qHlb8VAL5GQUsClpBeubVQKfK/OumRI=" + "org/springframework/security#spring-security-bom/6.3.3": { + "module": "sha256-kTKmxBqYZ4xUDkUaNrv0ZCFJalswy0rXf73Dl5cnnLc=", + "pom": "sha256-5Y6DOSLjyl/6ZaRuBL+CY3TXB2n9+xDxBA71D3QptlY=" }, - "org/springframework/security#spring-security-config/6.3.1": { - "jar": "sha256-2rWGDJVRrJ28E4z26yFbuipE+XTO9WM6i+zOBfTzKXs=", - "module": "sha256-0Hwqae0yRqJesq2U4JIraMxrmh9swC1eakYS5+IccO0=", - "pom": "sha256-c37cXLqCnz/N7KCpNO6xVUek12Ej6aCiPJjcJJ8Omo0=" + "org/springframework/security#spring-security-config/6.3.3": { + "jar": "sha256-672m0SlDFoZXbXZBW2O6Y9dt/NC+JUii5Q6JmStGYsI=", + "module": "sha256-dIEluCvITAfMoxhdGi1XN6x81kx+pRF2HTycDjnVAnw=", + "pom": "sha256-H13TQVrtRbAhWH+twdgjXLe+XpZd/fKU7+9MSThGWfc=" }, - "org/springframework/security#spring-security-core/6.3.1": { - "jar": "sha256-FMQlBcDlGJW5t+e2slyfVAgCCM6+AkiKGWWDuqwVDzw=", - "module": "sha256-9Quuq5mPJAa1M/adnnAYKsPXkMQWpnLD1azg1QU/zqs=", - "pom": "sha256-QOYMCS19rlGCY79GANAWOF9Pqdv8W5KPrHBEM5Sv+OU=" + "org/springframework/security#spring-security-core/6.3.3": { + "jar": "sha256-1s6q03Ccx+MD8iulW1eTPneHva39FxqA/+latu6/+bg=", + "module": "sha256-HIz+YwaELL1vVbofztwdqEut+RSbcFm04/LT61459GY=", + "pom": "sha256-DJXgTi2a5q+mN0L68WtiforbQQlYXyAHZ4WkyViLlOY=" }, - "org/springframework/security#spring-security-crypto/6.3.1": { - "jar": "sha256-O14oS6BFXgiVG9MM4NDe9AL4BRS/yHQlnNOJk3cGBEs=", - "module": "sha256-58pLc42iolELiuvqQtUAkeEpuPF1sErX7EWiswfNawU=", - "pom": "sha256-/QLuLvobnLrwfNoqfKd+TrJqL+XOkbkfA3iQW/YrW7Q=" + "org/springframework/security#spring-security-crypto/6.3.3": { + "jar": "sha256-xiH5rLR7Q15qgqzaAjh1zftCFuhlKzd2QqXq+zESQe0=", + "module": "sha256-u680Eu4WZIQXNU2V/mbgP1+9Re620KCvukct0GXLTQQ=", + "pom": "sha256-uIotsoiGNWVyfufPgCcq712Qsz7ROhh7rUQ50B+RRNc=" }, - "org/springframework/security#spring-security-oauth2-client/6.3.1": { - "jar": "sha256-fcdyQ3igFQ0zwHqX9oMdI5sKaTV4Jn/cN4/vgFdm1lU=", - "module": "sha256-+LU43JfXw2bvFaJ9t/xGGn+z2TlsP9EXmqmB4UbMVi4=", - "pom": "sha256-a2+rDAtngYNvT0MnJ3Ni3r14U5kfWIvpf+pVLRQWNJU=" + "org/springframework/security#spring-security-oauth2-client/6.3.3": { + "jar": "sha256-Xgkwluq82K0RzUYThPl4cEM0pt2tLVZCl+zdikD2cGI=", + "module": "sha256-oM2kD5ojLO6Qla5LFY3UoC/xJCqairVUqYOdY2vF640=", + "pom": "sha256-X7Q7AeudQZUidqdx4HAMxltQm67LfaR9xmROO9Gn+wc=" }, - "org/springframework/security#spring-security-oauth2-core/6.3.1": { - "jar": "sha256-q3X94TdlXZBMWFFJ723Ny1iNDKPK5HUw3n+WoX6dAfk=", - "module": "sha256-F/m3YcLt7Rptbv8xRh9GlqG86ojoAjbo1bn7PSR4wzM=", - "pom": "sha256-fXZkh/+fbsqFQ1PTqKVdmEjjfAHcw4bLnZhqFJx2IgM=" + "org/springframework/security#spring-security-oauth2-core/6.3.3": { + "jar": "sha256-xu2bUUlLrtFs9VDk6etvgd+TtwsMyiJIslJuQzuxtWc=", + "module": "sha256-ZNjvScYEIVH/ljTFSKVQhRV9Uj01LBvJq602WwI7u2w=", + "pom": "sha256-psaXfbhPPyUJVe+ZN8YuqH5juNaTz98/XhkOhiYMU9Y=" }, - "org/springframework/security#spring-security-oauth2-jose/6.3.1": { - "jar": "sha256-KK84DaD1s/2yjrIdltfNId1tU7D6ApnokmZysaVjBu8=", - "module": "sha256-+K2MUhHqxd7QDE1FkgH4vmCRDrcND+SSONGRUMBD4Vs=", - "pom": "sha256-snzXubBcuEj7LYatOXhvWURHNfgFO8Z+vDtTWwWrns0=" + "org/springframework/security#spring-security-oauth2-jose/6.3.3": { + "jar": "sha256-WeTRlrh2f0kmoBqidUaK+PAaq+nINpXDURr7AY7FwiA=", + "module": "sha256-gXJgEt1f1pXGpR3BTaDThSLg7v65mEhxQ2+Drt4z46k=", + "pom": "sha256-ohcRc2UqxxLnTo4m/E7m/hiesCcp4rtKnxHwk9s80AQ=" }, - "org/springframework/security#spring-security-web/6.3.1": { - "jar": "sha256-GGga5H5lKcYaHKiRmXqsGQveC57hCyd2Q28Kw5L0cPQ=", - "module": "sha256-0UhlsVlvXytW/AUE3l6zImPSzd31WV/rRuLErkpkfSw=", - "pom": "sha256-IZhgyUJ7TBX6bK9iGoj5H0Fwhg/2KHT5g5gI9jDWhQo=" + "org/springframework/security#spring-security-web/6.3.3": { + "jar": "sha256-Xk2dmWl4c31l+LI/OriqREtxXSDfsZNtRCrJw0Modvs=", + "module": "sha256-oC71Y2BWFpewD5hMf9I3YOhEARFC1p19SgM/PwDO6FQ=", + "pom": "sha256-H/FDVEt3wkM6XpCAkwxNZcJB1tQNjErZ0ekXkINj3V8=" }, "org/springframework/session#spring-session-bom/3.1.1": { "module": "sha256-1pUWyPsAHxEYTRTC/WPXiiXTt3H27w40+UMFo+/cYyc=", "pom": "sha256-yKH2TVmHtfeggnybjVe/dSegTYM/7o7EXlKD7kKTwV0=" }, - "org/springframework/session#spring-session-bom/3.3.1": { - "module": "sha256-Gjx14VCDymCBpHhT3Jxz5lPvuU1MDbXmf2K1Pq7nrnA=", - "pom": "sha256-gKxLjdblf/dW+0K0as0tWbWwD4VHAZkSy1bB09QR/3o=" + "org/springframework/session#spring-session-bom/3.3.2": { + "module": "sha256-c8QjNnOut9RIA7C3VsORpxxJI8SczWRFKJ6nYY2LUUg=", + "pom": "sha256-JeeeGvx/vk1PpbtBeEDynti/+RknxUfnuySo1aDOG3E=" }, "org/springframework/ws#spring-ws-bom/4.0.11": { "pom": "sha256-ebcaocK/ikSdMKx+g6qJOo0Ah5L8KUvIYCYVUvoQ7fA=" @@ -1797,9 +1801,6 @@ "org/testcontainers#testcontainers-bom/1.18.3": { "pom": "sha256-l0dtYsuLXM/NHLrmkmHEk3v36BtWUw2oKmZJ4w3DHMw=" }, - "org/testcontainers#testcontainers-bom/1.19.7": { - "pom": "sha256-bDMp72KWE8iKyQI7fa4oHOHdh6AO+hg5ah2pErDJRPQ=" - }, "org/testcontainers#testcontainers-bom/1.19.8": { "pom": "sha256-Nk8kRkvSboev9GTi1JF9PMTS9FNCwuMuupvmphk8lUs=" }, diff --git a/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix index 5888ad860a..565c2c1dfb 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.28.3"; + version = "0.29.0"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-88UdJPn9AeLtpKEu3efHm+xj4lheQ0EPyvId4vYskIo="; + hash = "sha256-pdk8TG+wtFjV3Opv42wovlZ0CNWl4jC/PSVYsDyH0Gw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix index 90a748ca80..090ada0d89 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { libtomcrypt zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; @@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ aanderse karolchmist ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; # installation directory mismatch + broken = stdenv.hostPlatform.isDarwin; # installation directory mismatch }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/st/streamdeck-ui/package.nix b/third_party/nixpkgs/pkgs/by-name/st/streamdeck-ui/package.nix index 9f68a707bf..c739ffa83e 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/streamdeck-ui/package.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { importlib-metadata evdev ] - ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; nativeCheckInputs = [ xvfb-run ] diff --git a/third_party/nixpkgs/pkgs/by-name/st/stu/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stu/package.nix index ab74d428cc..95179b7bcf 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stu/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-/a91ONvKG6aRFAnHDkpOQQFtfGlO1WahWM9LdPs75iw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreGraphics ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/stylelint/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stylelint/package.nix similarity index 71% rename from third_party/nixpkgs/pkgs/development/tools/analysis/stylelint/default.nix rename to third_party/nixpkgs/pkgs/by-name/st/stylelint/package.nix index 6525d524c7..ddf631ff8d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/stylelint/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stylelint/package.nix @@ -1,8 +1,15 @@ -{ buildNpmPackage, fetchFromGitHub, lib }: +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: -buildNpmPackage rec { - pname = "stylelint"; +let version = "16.9.0"; +in +buildNpmPackage { + pname = "stylelint"; + inherit version; src = fetchFromGitHub { owner = "stylelint"; @@ -15,11 +22,11 @@ buildNpmPackage rec { dontNpmBuild = true; - meta = with lib; { + meta = { description = "Mighty CSS linter that helps you avoid errors and enforce conventions"; mainProgram = "stylelint"; homepage = "https://stylelint.io"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/su/sums/package.nix b/third_party/nixpkgs/pkgs/by-name/su/sums/package.nix new file mode 100644 index 0000000000..bc0cc25d2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/su/sums/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + mpfr, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sums"; + version = "0.11"; + + src = fetchFromGitLab { + owner = "leesonwai"; + repo = "sums"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-D8BkrStS6IwkWy8J7YRHIhyJ68kX4Dky0Vbphn6CsVM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + mpfr + ]; + + meta = { + description = "Simple GTK postfix calculator for GNOME"; + homepage = "https://gitlab.com/leesonwai/sums"; + license = lib.licenses.gpl3Plus; + mainProgram = "sums"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix b/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix index dd813563ea..4ebeef24ce 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "supermariowar"; - version = "2023-unstable-2024-07-16"; + version = "2023-unstable-2024-09-17"; src = fetchFromGitHub { owner = "mmatyas"; repo = "supermariowar"; - rev = "0ba445f425d03a444b3814bcd5898590ef8845b9"; - hash = "sha256-4a34m1f7LRA48RZwHLa2Sv3oeTakPZ3ezFv3rEuKmqM="; + rev = "6b8ff8c669ca31a116754d23b6ff65e42ac50733"; + hash = "sha256-P0jV7G81thj0UJoYLd5+H5SjjaVu4goJxc9IkbzxJgs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/su/superscs/package.nix b/third_party/nixpkgs/pkgs/by-name/su/superscs/package.nix index f558bec8a2..ae5fb5537b 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/superscs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/superscs/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Qu7RM6Ew4hEmoIXO0utDDVmjmNX3yt3FxWZXCQ/Xjp4="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace-fail \ ".so" \ ".dylib" diff --git a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix index a3674efe5d..7964d31d96 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix @@ -16,7 +16,7 @@ , waylandSupport ? false }: -assert waylandSupport -> stdenv.isLinux; +assert waylandSupport -> stdenv.hostPlatform.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; @@ -34,7 +34,7 @@ buildGoModule rec { nativeBuildInputs = [ copyDesktopItems pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -44,20 +44,20 @@ buildGoModule rec { buildInputs = [ libglvnd mpv-unwrapped - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libXxf86vm xorg.libX11 - ] ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !waylandSupport) [ xorg.libXrandr xorg.libXinerama xorg.libXcursor xorg.libXi xorg.libXext - ] ++ lib.optionals (stdenv.isLinux && waylandSupport) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [ wayland wayland-protocols libxkbcommon - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.Kernel darwin.apple_sdk_11_0.frameworks.OpenGL diff --git a/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix b/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix index 9a0c443faa..a7065e119d 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-JFkTD/MGvak8EuDEABGH1xLykSNj4rtnnENAruls6W8="; + hash = "sha256-kTTZx/IXXJrkC0qm4Nx0hYPbricNjwFshCq0aFYCTo0="; }; - cargoHash = "sha256-N/4VHvBA9ij+VLPxJ+1237fnOHGoC6guZ62CYrwfHM4="; + cargoHash = "sha256-K62RqJqYyuAPwm8zLIiASH7kbw6raXS6ZzINMevWav0="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/su/sus-compiler/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/su/sus-compiler/Cargo.lock new file mode 100644 index 0000000000..56bc269bde --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/su/sus-compiler/Cargo.lock @@ -0,0 +1,624 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "ariadne" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44055e597c674aef7cb903b2b9f6e4cba1277ed0d2d61dae7cd52d7ffa81f8e2" +dependencies = [ + "unicode-width", + "yansi", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" +dependencies = [ + "shlex", +] + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags", + "clap_lex", + "indexmap", + "strsim", + "termcolor", + "textwrap", +] + +[[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 = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lsp-server" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9" +dependencies = [ + "crossbeam-channel", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "lsp-types" +version = "0.94.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" +dependencies = [ + "bitflags", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "sus-proc-macro" +version = "0.0.1" +dependencies = [ + "quote", + "syn 1.0.109", + "tree-sitter", + "tree-sitter-sus", +] + +[[package]] +name = "sus_compiler" +version = "0.0.2" +dependencies = [ + "ariadne", + "clap", + "lsp-server", + "lsp-types", + "num", + "serde", + "serde_json", + "sus-proc-macro", + "tree-sitter", + "tree-sitter-sus", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-sus" +version = "0.0.2" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" diff --git a/third_party/nixpkgs/pkgs/by-name/su/sus-compiler/package.nix b/third_party/nixpkgs/pkgs/by-name/su/sus-compiler/package.nix new file mode 100644 index 0000000000..adc2bf9b4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/su/sus-compiler/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "sus-compiler"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "pc2"; + repo = "sus-compiler"; + rev = "v${version}"; + hash = "sha256-f93uT6ELW3T2Xd539EfZCf2LSbxcYnEX+smmLzBAxqc="; + fetchSubmodules = true; + }; + + # no lockfile upstream + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/sus_compiler"; + + meta = { + description = "A new Hardware Design Language that keeps you in the driver's seat"; + homepage = "https://github.com/pc2/sus-compiler"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ pbsds ]; + mainProgram = "sus_compiler"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix index 16eaf01be2..6552147449 100644 --- a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl protobuf - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration @@ -50,6 +50,6 @@ rustPlatform.buildRustPackage rec { "https://github.com/svix/svix-webhooks/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ techknowlogick ]; - broken = stdenv.isx86_64 && stdenv.isDarwin; # aws-lc-sys currently broken on darwin x86_64 + broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; # aws-lc-sys currently broken on darwin x86_64 }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svp/mpv.nix b/third_party/nixpkgs/pkgs/by-name/sv/svp/mpv.nix index ac597bd917..8c4e7839c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/sv/svp/mpv.nix +++ b/third_party/nixpkgs/pkgs/by-name/sv/svp/mpv.nix @@ -1,7 +1,7 @@ -{ lib -, mpv-unwrapped -, ocl-icd -, ... +{ + lib, + mpv-unwrapped, + ocl-icd, }: mpv-unwrapped.wrapper { diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svp/package.nix b/third_party/nixpkgs/pkgs/by-name/sv/svp/package.nix index 30e540ba74..0978a9e64f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sv/svp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sv/svp/package.nix @@ -1,25 +1,26 @@ -{ stdenv -, buildFHSEnv -, writeShellScriptBin -, fetchurl -, callPackage -, makeDesktopItem -, copyDesktopItems -, ffmpeg -, glibc -, jq -, lib -, libmediainfo -, libsForQt5 -, libusb1 -, ocl-icd -, p7zip -, patchelf -, socat -, vapoursynth -, xdg-utils -, xorg -, zenity +{ + stdenv, + buildFHSEnv, + writeShellScriptBin, + fetchurl, + callPackage, + makeDesktopItem, + copyDesktopItems, + ffmpeg, + glibc, + jq, + lib, + libmediainfo, + libsForQt5, + libusb1, + ocl-icd, + p7zip, + patchelf, + socat, + vapoursynth, + xdg-utils, + xorg, + zenity, }: let mpvForSVP = callPackage ./mpv.nix { }; @@ -60,13 +61,16 @@ let svp-dist = stdenv.mkDerivation rec { pname = "svp-dist"; - version = "4.5.210-2"; + version = "4.6.263"; src = fetchurl { url = "https://www.svp-team.com/files/svp4-linux.${version}.tar.bz2"; - hash = "sha256-dY9uQ9jzTHiN2XSnOrXtHD11IIJW6t9BUzGGQFfZ+yg="; + sha256 = "sha256-HyRDVFHVmTan/Si3QjGQpC3za30way10d0Hk79oXG98="; }; - nativeBuildInputs = [ p7zip patchelf ]; + nativeBuildInputs = [ + p7zip + patchelf + ]; dontFixup = true; unpackPhase = '' @@ -129,14 +133,25 @@ stdenv.mkDerivation { desktopName = "SVP 4 Linux"; genericName = "Real time frame interpolation"; icon = "svp-manager4"; - categories = [ "AudioVideo" "Player" "Video" ]; - mimeTypes = [ "video/x-msvideo" "video/x-matroska" "video/webm" "video/mpeg" "video/mp4" ]; + categories = [ + "AudioVideo" + "Player" + "Video" + ]; + mimeTypes = [ + "video/x-msvideo" + "video/x-matroska" + "video/webm" + "video/mpeg" + "video/mp4" + ]; terminal = false; startupNotify = true; }) ]; meta = with lib; { + mainProgram = "SVPManager"; description = "SmoothVideo Project 4 (SVP4) converts any video to 60 fps (and even higher) and performs this in real time right in your favorite video player"; homepage = "https://www.svp-team.com/wiki/SVP:Linux"; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix index 423c932f97..42c5421856 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix @@ -9,15 +9,15 @@ , wayland-protocols , wayland-scanner }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "sway-audio-idle-inhibit"; - version = "unstable-2023-08-09"; + version = "0.1.2"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayAudioIdleInhibit"; - rev = "c850bc4812216d03e05083c69aa05326a7fab9c7"; - hash = "sha256-MKzyF5xY0uJ/UWewr8VFrK0y7ekvcWpMv/u9CHG14gs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-6bdIkNosp/mzH5SiyK6Mox/z8kuFk5RLMmcFZ2VIi0g="; }; nativeBuildInputs = [ @@ -36,5 +36,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ rafaelrc ]; mainProgram = "sway-audio-idle-inhibit"; }; -} - +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix index 459f4a9379..d61c2a722f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switchres/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/switchres/package.nix new file mode 100644 index 0000000000..1c1818bc51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/switchres/package.nix @@ -0,0 +1,63 @@ +{ + stdenv, + lib, + pkg-config, + fetchFromGitHub, + xorg, + libdrm, + SDL2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "switchres"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "antonioginer"; + repo = "switchres"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-/21RcpumWYNBPck7gpH6krwC3Thz/rKDPgeJblN2BDA="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + xorg.libXrandr + xorg.xorgproto + libdrm + SDL2 + ]; + + patchPhase = '' + runHook preHook + + substituteInPlace ./custom_video_xrandr.cpp \ + --replace-fail libX11.so ${xorg.libX11}/lib/libX11.so \ + --replace-fail libXrandr.so ${xorg.libXrandr}/lib/libXrandr.so + + substituteInPlace ./custom_video_drmkms.cpp \ + --replace-fail libdrm.so ${libdrm}/lib/libdrm.so \ + + runHook postHook + ''; + + env = { + PREFIX = "$(out)"; + }; + + preInstall = '' + install -Dm755 switchres $out/bin/switchres + ''; + + meta = { + description = "Modeline generation engine for emulation"; + homepage = "https://github.com/antonioginer/switchres"; + changelog = "https://github.com/antonioginer/switchres/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + mainProgram = "switchres"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix index cea6518823..d22a28341a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; rev = "refs/tags/v${version}"; - hash = "sha256-SLNNaEF4Ep9fxYAsO+Qu+yKm+3CHs5kD//mgD8P4FxQ="; + hash = "sha256-4uANrPYqzyiPoqhTvrpbi0plkbJ3b8HzyYaBmj/hi58="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-RVU6vr9ri+lx+PvFve/86cuQCnPnxA+z/lo2Hj4jnbg="; + vendorHash = "sha256-YM3DgkdappyEg3suV39gbikm/XJ7JqvEYbTF8+no7Qo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix index 35487a3540..473f9d64d6 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { bzip2 openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix index ee2e6af318..81f2982a05 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - postInstall = lib.optionalString (!stdenvNoCC.isDarwin) '' + postInstall = lib.optionalString (!stdenvNoCC.hostPlatform.isDarwin) '' mv $out/bin/SyncYomi $out/bin/syncyomi ''; diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/package.nix index 943b5ab4e8..ee425f44d5 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/package.nix @@ -5,7 +5,6 @@ libxml2, libxslt, openssl, - pkg-config, postgresql, sqlite, }: diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syntax/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syntax/package.nix index eceffd5aa0..01b5ade160 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syntax/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syntax/package.nix @@ -25,6 +25,6 @@ buildNpmPackage rec { license = licenses.mit; maintainers = with maintainers; [ h7x4 ]; mainProgram = "syntax-cli"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix index c2a1dbec6f..c220fcc854 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6cFK1wMO5VICfi3tN140XH9inQOkkSfHVogKhTHtQb8="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; passthru = { updateScript = nix-update-script; diff --git a/third_party/nixpkgs/pkgs/by-name/t-/t-rex/package.nix b/third_party/nixpkgs/pkgs/by-name/t-/t-rex/package.nix index f26592e052..7c92e49182 100644 --- a/third_party/nixpkgs/pkgs/by-name/t-/t-rex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/t-/t-rex/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ gdal openssl ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = "Vector tile server specialized on publishing MVT tiles"; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix index 4ebc77e741..df01b5c494 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix @@ -19,7 +19,7 @@ , rocmSupport ? config.rocmSupport , darwin -, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 +, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 # one of [ null "cpu" "rocm" "cuda" "metal" ]; , acceleration ? null @@ -55,16 +55,16 @@ let # If user did not not override the acceleration attribute, then try to use one of # - nixpkgs.config.cudaSupport # - nixpkgs.config.rocmSupport - # - metal if (stdenv.isDarwin && stdenv.isAarch64) + # - metal if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # !! warn if multiple acceleration methods are enabled and default to the first one in the list featureDevice = if (builtins.isNull acceleration) then (warnIfMultipleAccelerationMethods availableAccelerations) else acceleration; - warnIfNotLinux = api: (lib.warnIfNot stdenv.isLinux + warnIfNotLinux = api: (lib.warnIfNot stdenv.hostPlatform.isLinux "building tabby with `${api}` is only supported on linux; falling back to cpu" - stdenv.isLinux); - warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.isDarwin && stdenv.isAarch64) + stdenv.hostPlatform.isLinux); + warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu" - (stdenv.isDarwin && stdenv.isAarch64)); + (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)); validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ "cpu" "rocm" "cuda" "metal" ]; @@ -88,7 +88,7 @@ let # TODO(ghthor): some of this can be removed darwinBuildInputs = [ llamaccpPackage ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation Accelerate CoreVideo @@ -143,7 +143,7 @@ rustPlatform.buildRustPackage { ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin darwinBuildInputs + ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs ++ optionals enableCuda cudaBuildInputs ++ optionals enableRocm rocmBuildInputs ; @@ -164,6 +164,6 @@ rustPlatform.buildRustPackage { mainProgram = "tabby"; license = licenses.asl20; maintainers = [ maintainers.ghthor ]; - broken = stdenv.isDarwin && !stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index 919a2e77a6..9423cb2e46 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -15,7 +15,7 @@ buildGo123Module { "-X tailscale.com/version.shortStamp=${tailscale.version}" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/bin/nginx-auth $out/bin/tailscale.nginx-auth sed -i -e "s#/usr/sbin#$out/bin#" ./cmd/nginx-auth/tailscale.nginx-auth.service install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.service diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 06865660f7..f536741b60 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -26,7 +26,7 @@ buildNpmPackage { npmDepsHash = "sha256-T7YNHunncSv+z86Td1QuBt4dMGF1ipo85ZhW7U9I0Zw="; npmWorkspace = "packages/tailwindcss-language-server"; - buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); + buildInputs = [ libsecret ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); nativeBuildInputs = [ python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/talecast/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/talecast/package.nix index df0f994d51..e18d5fd5f2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/talecast/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/talecast/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix index 49e14d438d..d61478b325 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage { cp docs/*.conf $out/share/examples ''; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreFoundation diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tangerine/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tangerine/package.nix index 5615d441b8..1ec2d6b362 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tangerine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tangerine/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Aeva/tangerine"; license = licenses.asl20; maintainers = [ maintainers.viraptor ]; - broken = stdenv.isDarwin; # third_party/naive-surface-nets doesn't find std::execution + broken = stdenv.hostPlatform.isDarwin; # third_party/naive-surface-nets doesn't find std::execution }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tartan/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tartan/package.nix index d73ffdf99b..56c18653df 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tartan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tartan/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Tools and Clang plugins for developing code with GLib"; homepage = "https://gitlab.freedesktop.org/tartan/tartan"; changelog = "https://gitlab.freedesktop.org/tartan/tartan/-/blob/main/NEWS"; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix index 26b8d8ecd3..4be5fdd072 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { rustc rustPlatform.cargoSetupHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # darwin dependencies darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix b/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix index 4c532f4538..c1ecf1a4bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix @@ -29,9 +29,9 @@ buildNpmPackage rec { nativeBuildInputs = [ makeWrapper versionCheckHook - ] ++ lib.optionals (stdenv.isLinux) [ copyDesktopItems ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ]; - doInstallCheck = stdenv.isLinux; + doInstallCheck = stdenv.hostPlatform.isLinux; env = { # disable code signing on Darwin @@ -60,7 +60,7 @@ buildNpmPackage rec { runHook preInstall '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/{applications,teams-for-linux} cp dist/*-unpacked/resources/app.asar $out/share/teams-for-linux/ @@ -82,7 +82,7 @@ buildNpmPackage rec { --add-flags "$out/share/teams-for-linux/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/teams-for-linux.app $out/Applications makeWrapper $out/Applications/teams-for-linux.app/Contents/MacOS/teams-for-linux $out/bin/teams-for-linux diff --git a/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix b/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix index 1844e08ddf..d49899480e 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/technitium-dns-server/package.nix @@ -8,13 +8,13 @@ let technitium-library = buildDotnetModule rec { pname = "TechnitiumLibrary"; - version = "570ec570b57d8591daa3df682ca9e6f37f373db6"; + version = "5af89bb453dd67ae3119771597451e438a938591"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; rev = version; - hash = "sha256-xPwRoRp/XYrlGX3B9EiHUz2Tueh+hygbBopxFvdASLQ"; + hash = "sha256-ezYC2Nh5lgaN95OEP4TYcH6+3AbHbyTfv1RU19DXI3c="; name = "${pname}-${version}"; }; @@ -30,13 +30,13 @@ let in buildDotnetModule rec { pname = "technitium-dns-server"; - version = "12.2.1"; + version = "13.0.1"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; rev = "refs/tags/v${version}"; - hash = "sha256-2RB/pUlA9z7TJ4xd509nsbO1BnxY3mv2jou6OGRd/yM="; + hash = "sha256-O5QJAo6GjoKes5W4ajMcsYpR3j7EcR1vVMiKtTLcwDE="; name = "${pname}-${version}"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix b/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix index bda948d342..cb98c85bf4 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/telegraf/package.nix @@ -34,7 +34,7 @@ buildGo123Module rec { version = testers.testVersion { package = telegraf; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) telegraf; }; diff --git a/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix b/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix index 1a4db30c90..801cae0b12 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libgrapheme libressl ncurses - ] ++ lib.optional stdenv.isDarwin memstreamHook; + ] ++ lib.optional stdenv.hostPlatform.isDarwin memstreamHook; configureFlags = [ "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" diff --git a/third_party/nixpkgs/pkgs/by-name/te/termpaint/package.nix b/third_party/nixpkgs/pkgs/by-name/te/termpaint/package.nix index acd730dcf5..217d279551 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/termpaint/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/termpaint/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, meson, ninja, - cmake, pkg-config, python3, }: diff --git a/third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix b/third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix index dda1c016fa..a91433762f 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix @@ -7,14 +7,14 @@ }: buildGoModule rec { name = "termsonic"; - version = "0-unstable-2024-02-02"; + version = "0-unstable-2024-09-15"; src = fetchzip { - url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-7a3aabee59e1a427aff755fc69759265ad9d0adc.zip"; - hash = "sha256-C5/4679qw4CAdUt9lXpPIR3yejrPdddvmjgbpLF3SvA="; + url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-93328e0ca6c0ed2424550c7a164b4b1212a554b6.zip"; + hash = "sha256-qn0EB1lCU8nvgwcIuZ0Xt9yGTBz5bSnJelPF8mG6D1k="; }; - vendorHash = "sha256-wCtQD9f1mbN/0qUZnamPoVn9p4Ra5dQ34vlT+XjPF3k="; + vendorHash = "sha256-hBYgRKL9ZFzYy/wLCWacw8I6aqtD5O7lLsB9U5RmLjw="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/te/terraform-local/package.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-local/package.nix index 62470b7470..34f636cb9e 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/terraform-local/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/terraform-local/package.nix @@ -5,12 +5,12 @@ }: python3Packages.buildPythonApplication rec { pname = "terraform_local"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0E11eaEhz1pwP9MBVilqioj92fZP7wjLJcR4no79n9s="; + hash = "sha256-Lxx/gtjLufFZWzcvOiiSUUptM7JtFnigBN7DG+lhQxg="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/th/the-legend-of-edgar/package.nix b/third_party/nixpkgs/pkgs/by-name/th/the-legend-of-edgar/package.nix index 509c6e6552..5ab2fd0858 100644 --- a/third_party/nixpkgs/pkgs/by-name/th/the-legend-of-edgar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/the-legend-of-edgar/package.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "edgar"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix b/third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix index 25da4e5d88..771965b406 100644 --- a/third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ bzip2 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { luajit SDL2 zlib - ] ++ lib.optional stdenv.isDarwin Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/th/thefuck/package.nix b/third_party/nixpkgs/pkgs/by-name/th/thefuck/package.nix index 7d908b9f8d..e0cd1b7b5d 100644 --- a/third_party/nixpkgs/pkgs/by-name/th/thefuck/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/thefuck/package.nix @@ -33,7 +33,7 @@ python311Packages.buildPythonApplication rec { pytest-mock ]); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_settings_defaults" "test_from_file" "test_from_env" diff --git a/third_party/nixpkgs/pkgs/by-name/th/thonny/package.nix b/third_party/nixpkgs/pkgs/by-name/th/thonny/package.nix index 91c40a3c7b..f230b24d58 100644 --- a/third_party/nixpkgs/pkgs/by-name/th/thonny/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/thonny/package.nix @@ -21,7 +21,9 @@ buildPythonApplication rec { hash = "sha256-/ms2RESnV3bsJpK1zYYLHNUu1FtA6PntaseTbKMfUMc="; }; - nativeBuildInputs = [ copyDesktopItems ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + nativeBuildInputs = [ + copyDesktopItems + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; desktopItems = [ (makeDesktopItem { @@ -51,7 +53,7 @@ buildPythonApplication rec { asttokens send2trash ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-next ] ); diff --git a/third_party/nixpkgs/pkgs/applications/system/thumbdrives/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thumbdrives/package.nix similarity index 68% rename from third_party/nixpkgs/pkgs/applications/system/thumbdrives/default.nix rename to third_party/nixpkgs/pkgs/by-name/th/thumbdrives/package.nix index 89711e9968..f4f4015c8e 100644 --- a/third_party/nixpkgs/pkgs/applications/system/thumbdrives/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/thumbdrives/package.nix @@ -1,21 +1,22 @@ -{ lib -, python3 -, fetchFromSourcehut -, gtk3 -, libhandy_0 -, gobject-introspection -, meson -, pkg-config -, ninja -, gettext -, glib -, desktop-file-utils -, wrapGAppsHook3 +{ + lib, + python3, + fetchFromSourcehut, + gtk3, + libhandy_0, + gobject-introspection, + meson, + pkg-config, + ninja, + gettext, + glib, + desktop-file-utils, + wrapGAppsHook3, }: python3.pkgs.buildPythonApplication rec { pname = "thumbdrives"; - version = "0.3.1"; + version = "0.3.2"; format = "other"; @@ -23,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = pname; rev = version; - sha256 = "sha256-CPZKswbvsG61A6J512FOCKAntoJ0sUb2s+MKb0rO+Xw="; + hash = "sha256-Mh3NSEYscnzw6kjR9m0XbTygj07cIQwdyLcdLpfKi3Y="; }; postPatch = '' @@ -56,7 +57,10 @@ python3.pkgs.buildPythonApplication rec { description = "USB mass storage emulator for Linux handhelds"; homepage = "https://sr.ht/~martijnbraam/thumbdrives/"; license = licenses.mit; - maintainers = with maintainers; [ chuangzhu ]; + maintainers = with maintainers; [ + chuangzhu + Luflosi + ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tidgi/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tidgi/package.nix index 20f0b4a194..0717dd8239 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tidgi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tidgi/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.9.6"; src = - if stdenv.isAarch64 + if stdenv.hostPlatform.isAarch64 then fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tigerbeetle/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tigerbeetle/package.nix index e5ec962b6f..585720d889 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-ls2QFCiPkXMTiCHo8AXb5bFl118zjtuQAGl26c4huwU="; - "x86_64-linux" = "sha256-QjQjP5p2fpOLWNGiU2aMMs2bUEFOWfBZrbPGLTOFozg="; - "aarch64-linux" = "sha256-DMxGakZBJhLTgZp7B9lwxilr6yhDVDe/GQCMFaRTWe4="; + "universal-macos" = "sha256-VtKM+Fw1yy0KYvbtxerYykEbYv1hCc81ckfETH36vCU="; + "x86_64-linux" = "sha256-LtnLLWSOUtnp27swwCrRiA3NIKqrOD2MZylXKbLm2fw="; + "aarch64-linux" = "sha256-tmlizjB8BWtbQd75RoYvIsRxqEuj1V7Fx9LgArvphm4="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.15.5"; + version = "0.16.2"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; @@ -49,7 +49,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://tigerbeetle.com/"; description = "Financial accounting database designed to be distributed and fast"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danielsidhion ]; + maintainers = with lib.maintainers; [ + danielsidhion + nwjsmith + ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix index 9928080dd1..53d749a50a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.CoreServices darwin.apple_sdk_11_0.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix index b73fcdeafb..f869dd4523 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.62.2"; + version = "2.62.3"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-x8+UJZYdtiwYAoMgJeDKtXbrT0A96jRu5pbkA6WOce4="; + hash = "sha256-1rj2nfp18EZL9aSiUs1ASJnAqHyM9lztsfkak7Ipy6o="; }; buildInputs = [ sqlite zlib ]; diff --git a/third_party/nixpkgs/pkgs/by-name/tl/tlclient/package.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlclient/package.nix index a789d391cc..04dc61b4e7 100644 --- a/third_party/nixpkgs/pkgs/by-name/tl/tlclient/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tl/tlclient/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation ( changelog = "https://www.cendio.com/thinlinc/docs/relnotes/${version}/"; maintainers = with lib.maintainers; [ felixalbrigtsen ]; platforms = with lib.platforms; linux ++ darwin ++ windows; - broken = !(stdenv.isLinux && stdenv.isx86_64); + broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64); mainProgram = "tlclient"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix index e0e4655235..86e9fe7861 100644 --- a/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix index 6eb9d0d715..1dc3a8db3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { tags = [ "fts5" ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); meta = { description = "Federated nanoblogging service with a Gemini frontend"; diff --git a/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix index 5283e04db8..c0b1dfb33d 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix @@ -29,10 +29,10 @@ , pciutils , zlib -, libnotifySupport ? stdenv.isLinux +, libnotifySupport ? stdenv.hostPlatform.isLinux , libnotify -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libxkbcommon , libdrm , libGL @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.3"; + version = "13.5.4"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-g4wSjFS3VFZcflN2lexAoSledOBCK9taixGEUbM3X1E="; + hash = "sha256-2gu/JzkLYvYveOM1XvDpyV3dLoixqKvfmyHGIAz8nis="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-sw8PFbCTUvmD1+fE3VXX/3A07CnzXjBydQ+b4rshpak="; + hash = "sha256-BnJuKKwB6VqsHlRCU1cAuuaNdNu56oSE4z4wYXnyy/Q="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/to/toxic/package.nix b/third_party/nixpkgs/pkgs/by-name/to/toxic/package.nix index 54462fdaad..036c96dd47 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/toxic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/toxic/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk-pixbuf libnotify - ] ++ lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch32) [ openal libopus libvpx freealut qrencode ]; nativeBuildInputs = [ pkg-config libconfig ]; diff --git a/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix index a19eed1281..ea58c45f57 100644 --- a/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreServices SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/tr/tracker-miners/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/tracker-miners/package.nix index fb882da42b..963df6517e 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/tracker-miners/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/tracker-miners/package.nix @@ -105,12 +105,12 @@ stdenv.mkDerivation (finalAttrs: { libxml2 poppler taglib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp networkmanager systemd upower - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ e2fsprogs ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { # security issue since then. Despite a patch now being availab, we're opting # to be safe due to the general state of the project "-Dminer_rss=false" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dbattery_detection=none" "-Dnetwork_manager=disabled" "-Dsystemd_user_services=false" diff --git a/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix index 1c726affff..5f03796e50 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix @@ -11,7 +11,7 @@ , pkg-config , tbb -, withWayland ? stdenv.isLinux +, withWayland ? stdenv.hostPlatform.isLinux , libxkbcommon , wayland }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { hash = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA="; }; - patches = lib.optionals (stdenv.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [ ./0001-remove-unifiedtypeidentifiers-framework ]; @@ -37,25 +37,25 @@ stdenv.mkDerivation rec { capstone freetype glfw - ] ++ lib.optionals (stdenv.isLinux && withWayland) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWayland) [ libxkbcommon wayland - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus hicolor-icon-theme tbb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Carbon - ] ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ darwin.apple_sdk.frameworks.UniformTypeIdentifiers ]; env.NIX_CFLAGS_COMPILE = toString ([ ] # Apple's compiler finds a format string security error on # ../../../server/TracyView.cpp:649:34, preventing building. - ++ lib.optional stdenv.isDarwin "-Wno-format-security" - ++ lib.optional stdenv.isLinux "-ltbb" + ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-format-security" + ++ lib.optional stdenv.hostPlatform.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation"); buildPhase = '' @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { make -j $NIX_BUILD_CORES -C import-chrome/build/unix release make -j $NIX_BUILD_CORES -C library/unix release make -j $NIX_BUILD_CORES -C profiler/build/unix release \ - ${lib.optionalString (stdenv.isLinux && !withWayland) "LEGACY=1"} + ${lib.optionalString (stdenv.hostPlatform.isLinux && !withWayland) "LEGACY=1"} make -j $NIX_BUILD_CORES -C update/build/unix release runHook postBuild @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { cp -p public/client/*.{h,hpp} $out/include/Tracy/client cp -p public/common/*.{h,hpp} $out/include/Tracy/common cp -p public/tracy/*.{h,hpp} $out/include/Tracy/tracy - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace extra/desktop/tracy.desktop \ --replace Exec=/usr/bin/tracy Exec=tracy @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/tracy ''; diff --git a/third_party/nixpkgs/pkgs/by-name/tr/transmission_3/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/transmission_3/package.nix index 9372ef6dcf..a97e2cbb3e 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/transmission_3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/transmission_3/package.nix @@ -88,8 +88,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postInstall = '' mkdir $apparmor @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ curl libevent openssl pcre zlib libnatpmp miniupnpc ] ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] )}" r @{PROC}/sys/kernel/random/uuid, r @{PROC}/sys/vm/overcommit_memory, diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix index cd18281e7e..288b89a04a 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.55.41"; + version = "2.56.15"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-T1FE8CZNOk3FKnykEwgEhScu6aNbcd5BQlXZOaAxjEo="; + hash = "sha256-PpFZvUyRBOhQuXvnMnaqYgrxPh4owWpv9Y8SHEIu9ck="; }; postPatch = '' @@ -100,6 +100,6 @@ stdenv.mkDerivation (finalAttrs: { ]; mainProgram = "tpl"; platforms = lib.platforms.all; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trigger-control/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trigger-control/package.nix index 3398a3fe0a..838aae472d 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/trigger-control/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/trigger-control/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 dbus libnotify - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdecor ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/trigger-control \ --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; diff --git a/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix index 90a45c133c..d45aa2fafe 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/triton-llvm/package.nix @@ -149,7 +149,7 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # Not sure why this fails rm test/tools/llvm-exegesis/AArch64/latency-by-opcode-name.s ''; @@ -161,7 +161,7 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = buildTests; nativeCheckInputs = [ which ] - ++ lib.optionals stdenv.isDarwin [ sysctl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; checkTarget = "check-all"; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix index 3a7f9bd5ba..73af1faaba 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ libiconv CoreServices Security SystemConfiguration ] else [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ts/tsid/package.nix b/third_party/nixpkgs/pkgs/by-name/ts/tsid/package.nix index 054857f8b2..0bd4b08b60 100644 --- a/third_party/nixpkgs/pkgs/by-name/ts/tsid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ts/tsid/package.nix @@ -32,15 +32,20 @@ stdenv.mkDerivation (finalAttrs: { ]; outputs = [ - "doc" "out" + "doc" ]; - nativeBuildInputs = [ - doxygen - cmake - pkg-config - ] ++ lib.optional pythonSupport python3Packages.python; + nativeBuildInputs = + [ + doxygen + cmake + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; propagatedBuildInputs = [ @@ -51,16 +56,13 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!pythonSupport) pinocchio ++ lib.optional pythonSupport python3Packages.pinocchio; doCheck = true; - # pythonImportsCheck, but in stdenv.mkDerivation - postInstall = lib.optionalString pythonSupport '' - PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH - python -c "import tsid" - ''; + pythonImportsCheck = [ "tsid" ]; meta = { description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio"; homepage = "https://github.com/stack-of-tasks/tsid"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ts/tsukimi/package.nix b/third_party/nixpkgs/pkgs/by-name/ts/tsukimi/package.nix new file mode 100644 index 0000000000..7d8889079a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ts/tsukimi/package.nix @@ -0,0 +1,96 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + mpv-unwrapped, + ffmpeg, + libadwaita, + gst_all_1, + openssl, + libepoxy, + wrapGAppsHook4, + makeDesktopItem, + copyDesktopItems, + stdenv, +}: +rustPlatform.buildRustPackage rec { + pname = "tsukimi"; + version = "0.12.2"; + + src = fetchFromGitHub { + owner = "tsukinaha"; + repo = "tsukimi"; + rev = "v${version}"; + hash = "sha256-pJ+SUNGQS/kqBdOg21GgDeZThcjnB0FhgG00qLfqxYA="; + }; + + cargoHash = "sha256-PCJiSyfEgK8inzoRmRvnAU50kLnyVhNrgLrwtBUFpIU="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + copyDesktopItems + ]; + + buildInputs = + [ + mpv-unwrapped + ffmpeg + libadwaita + openssl + libepoxy + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); + + doCheck = false; # tests require networking + + desktopItems = [ + (makeDesktopItem { + name = "Tsukimi"; + exec = "tsukimi"; + type = "Application"; + icon = "tsukimi"; + categories = [ "AudioVideo" ]; + startupWMClass = "moe.tsuna.tsukimi"; + desktopName = "Tsukimi"; + }) + ]; + + postPatch = '' + substituteInPlace build.rs \ + --replace-fail 'i18n/locale' "$out/share/locale" + + substituteInPlace src/main.rs \ + --replace-fail '/usr/share/locale' "$out/share/locale" + ''; + + postInstall = '' + install -Dm644 moe.tsuna.tsukimi.gschema.xml -t $out/share/glib-2.0/schemas + glib-compile-schemas $out/share/glib-2.0/schemas + + install -Dm644 resources/ui/icons/tsukimi.png -t $out/share/pixmaps + ''; + + meta = { + description = "Simple third-party Emby client, featured with GTK4-RS, MPV and GStreamer"; + homepage = "https://github.com/tsukinaha/tsukimi"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + merrkry + aleksana + ]; + mainProgram = "tsukimi"; + platforms = lib.platforms.linux; + # libmpv2 crate fail to compile + # expected raw pointer `*const u8` found raw pointer `*const i8` + broken = stdenv.hostPlatform.isAarch64; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix index 15706439a3..26b30a477d 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix @@ -6,9 +6,9 @@ , gnome-themes-extra , qt6 , makeWrapper -, x11Support ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux # pypinput is marked as broken for darwin -, pynputSupport ? stdenv.isLinux +, pynputSupport ? stdenv.hostPlatform.isLinux # Experimental Drag & Drop support requires x11 & pyinput suport , hasDndSupport ? x11Support && pynputSupport , enableDragAndDrop ? false diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tup/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tup/package.nix index c6614db178..db6a6058a0 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/tup/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tu/tup/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre2 }: let - fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; + fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3; in stdenv.mkDerivation rec { pname = "tup"; version = "0.8"; @@ -71,6 +71,6 @@ in stdenv.mkDerivation rec { # ../../../../os-specific/darwin/apple-sdk/default.nix # # https://github.com/gittup/tup/commit/3697c74 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix index d3f0959577..f9228f310c 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { protobuf ] # https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies - ++ lib.optional stdenv.isLinux llvmPackages.bintools; + ++ lib.optional stdenv.hostPlatform.isLinux llvmPackages.bintools; buildInputs = [ @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { rust-jemalloc-sys zlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation diff --git a/third_party/nixpkgs/pkgs/by-name/tu/turn-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/turn-rs/package.nix new file mode 100644 index 0000000000..f2f5d863c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tu/turn-rs/package.nix @@ -0,0 +1,36 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + nix-update-script, + nixosTests, +}: + +rustPlatform.buildRustPackage rec { + pname = "turn-rs"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "mycrl"; + repo = "turn-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-uXMRDgSHrwT6+kejWRSE1WjXO8LaOR+fnffIXcL3A4I="; + }; + + cargoHash = "sha256-gO2vuOQMvl6KYp529k3CYDyma5ECzOr/lcSvP4OpUUo="; + + passthru = { + updateScript = nix-update-script { }; + tests.nixos = nixosTests.turn-rs; + }; + + meta = { + description = "Pure rust implemented turn server"; + homepage = "https://github.com/mycrl/turn-rs"; + changelog = "https://github.com/mycrl/turn-rs/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "turn-server"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix index 46e370cfa2..df3a8d4e96 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.19"; + version = "0.1.26"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-3bXOMW6aU4ryJqrUmpCIbBqRWrh4R6tlkEHPqpPSsVI="; + hash = "sha256-wyVNHWMxkRjfo2qOrAOIwUyTYdRyvwD+AfEBoLSchrA="; }; - cargoHash = "sha256-3GHVGjn4upI7U8GyxwlrLpchWALGFuMSektCrwLiIIM="; + cargoHash = "sha256-1wvDMAS0q0UzGb/jUNyq7G4cBxeRc+MSn7er378jaOw="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typst-live/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typst-live/package.nix index 8968adbb5e..3912ed217b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typst-live/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typst-live/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typst-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typst-lsp/package.nix index cc8e2d203e..047be6e535 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typst-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typst-lsp/package.nix @@ -39,14 +39,16 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; checkFlags = [ # requires internet access "--skip=workspace::package::external::remote_repo::test::full_download" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # both tests fail on darwin with 'Attempted to create a NULL object.' "--skip=workspace::fs::local::test::read" "--skip=workspace::package::external::manager::test::local_package" diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix index aa71277fef..de06edfee2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typst/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xz - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix index 906a9738f7..3749424844 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.32"; + version = "0.11.34"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-HHn3dPG+dWjuuhQrot2DaqPoj6klNxAdqSrplABIuuE="; + hash = "sha256-6z2jzs5PxsEsCPSm9+sZnBdzh0edLMylaLBvSSPoPNo="; }; - cargoHash = "sha256-ZWh2TfByabBi9vCvkpseLV49xzWTKLs8T4x8K/igEu0="; + cargoHash = "sha256-MaqsAQvh30nDzoxgnFKu7+wvRZ7WvwLgKYM3Fru8qfg="; nativeBuildInputs = [ pkg-config @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/uc/ucg/package.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucg/package.nix index 99d1b90c43..7ac909b256 100644 --- a/third_party/nixpkgs/pkgs/by-name/uc/ucg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uc/ucg/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ucg"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isAarch64 || stdenv.isDarwin; + broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin; }; }) # TODO: report upstream diff --git a/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix index 011c6bfd87..8869dce9d1 100644 --- a/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix @@ -49,7 +49,7 @@ let KERNEL_HEADERS "${linuxHeaders}/include" '' + lib.optionalString (stdenv.hostPlatform.gcc.float or "" == "soft") '' UCLIBC_HAS_FPU n - '' + lib.optionalString (stdenv.isAarch32 && isCross) '' + '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && isCross) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n diff --git a/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix index 78c1f817ad..0422c54a9d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix @@ -18,14 +18,14 @@ , cli11 , libexif , range-v3 -, enableOpencv ? stdenv.isLinux +, enableOpencv ? stdenv.hostPlatform.isLinux , opencv -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , extra-cmake-modules , wayland , wayland-protocols , wayland-scanner -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux , xorg }: @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.14 or newer - preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' export MACOSX_DEPLOYMENT_TARGET=10.14 ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix index 86c238328e..5bcf16fdd8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix @@ -18,28 +18,28 @@ let in rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.12.3"; + version = "0.13.0-dev.1"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-gI+FaiNN7Hql9HMsrl5skJuJDJv/mVarsFqslLXVvLU="; + hash = "sha256-dwiwv24bhn8/WVxrq8uReEPhU/5zn3oaH/AMjNJiA4M="; }; - cargoHash = "sha256-9mdspWwuZ+dLBnhklSqi4Lg2SjJyhhfn5Ax58evtkDA="; + cargoHash = "sha256-4XHKcmOeaeSGfl7uvQQdhm29DBWEdZLX021d9+Ebrww="; nativeBuildInputs = - lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ] + lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ] ++ lib.optionals audioSupport [ pkg-config ]; buildInputs = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreServices ] - ++ lib.optionals (audioSupport && stdenv.isDarwin) [ AudioUnit ] - ++ lib.optionals (audioSupport && stdenv.isLinux) [ alsa-lib ]; + ++ lib.optionals (audioSupport && stdenv.hostPlatform.isDarwin) [ AudioUnit ] + ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ]; buildFeatures = lib.optional audioSupport "audio"; diff --git a/third_party/nixpkgs/pkgs/by-name/un/unbound/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unbound/package.nix index 0d82715935..9c789a3b05 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unbound/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unbound/package.nix @@ -36,7 +36,7 @@ , withRedis ? false # Avoid .lib depending on lib.getLib openssl # The build gets a little hacky, so in some cases we disable this approach. -, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP +, withSlimLib ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP # enable support for python plugins in unbound: note this is distinct from pyunbound # see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html , withPythonModule ? false diff --git a/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix index ff72272c6c..5188209732 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix @@ -26,7 +26,7 @@ let hash = "sha256-Zuz+HGfxjGviGBKTiHdIFXF8UMRLEIfM8f+LIB/xonk="; }; - envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [ + envLibPath = lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libGL libpulseaudio libXxf86vm diff --git a/third_party/nixpkgs/pkgs/by-name/un/undetected-chromedriver/package.nix b/third_party/nixpkgs/pkgs/by-name/un/undetected-chromedriver/package.nix index 3976f3cc68..844bbe3b06 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/undetected-chromedriver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/undetected-chromedriver/package.nix @@ -6,10 +6,9 @@ python3, testers, - undetected-chromedriver, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "undetected-chromedriver"; inherit (chromedriver) version; @@ -34,11 +33,11 @@ stdenv.mkDerivation { install -D -m 0555 chromedriver $out/bin/undetected-chromedriver ''; - passthru.tests.version = testers.testVersion { package = undetected-chromedriver; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = chromedriver.meta // { description = "Custom Selenium ChromeDriver that passes all bot mitigation systems"; mainProgram = "undetected-chromedriver"; maintainers = with lib.maintainers; [ paveloom ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/un/unhide-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unhide-gui/package.nix index 5fd01f39b5..a8c988ee6d 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unhide-gui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unhide-gui/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, lib, python3Packages, - python3, unhide, }: diff --git a/third_party/nixpkgs/pkgs/by-name/un/unimap/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unimap/package.nix index 7563c1f505..eafe26962c 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unimap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unimap/package.nix @@ -30,16 +30,16 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles makeBinaryWrapper - ] ++ lib.optionals (stdenv.hostPlatform.isAarch && stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) [ pkg-config ]; # only depends on openssl on aarch/arm linux - buildInputs = lib.optionals (stdenv.hostPlatform.isAarch && stdenv.isLinux) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) [ openssl ]; - env = lib.optionalAttrs (stdenv.hostPlatform.isAarch && stdenv.isLinux) { + env = lib.optionalAttrs (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) { OPENSSL_NO_VENDOR = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/un/unison-fsmonitor/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unison-fsmonitor/package.nix index b351071b6d..84d367285c 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unison-fsmonitor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unison-fsmonitor/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-eKRayFU3xq2uo6YeFqcTPLInZYlympH6Z01vOCVsVqQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix index 400c73e105..d0298c7f15 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix @@ -6,7 +6,7 @@ , makeDesktopItem , wrapGAppsHook3 , gsettings-desktop-schemas -, enableX11 ? !stdenv.isDarwin +, enableX11 ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation (finalAttrs: { @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ nevivurn ]; platforms = platforms.unix; - broken = stdenv.isDarwin && enableX11; # unison-gui and uimac are broken on darwin + broken = stdenv.hostPlatform.isDarwin && enableX11; # unison-gui and uimac are broken on darwin mainProgram = if enableX11 then "unison-gui" else "unison"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/un/universal-ctags/package.nix b/third_party/nixpkgs/pkgs/by-name/un/universal-ctags/package.nix index 09186886d5..eda2fc6a81 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/universal-ctags/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/universal-ctags/package.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: { libxml2 jansson ] - ++ lib.optional stdenv.isDarwin libiconv - ++ lib.optional stdenv.isLinux libseccomp; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp; configureFlags = [ "--enable-tmpdir=/tmp" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix index 176a01a456..72ca626c89 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unrar-free/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "unrar-free"; maintainers = with lib.maintainers; [ thiagokokada ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix b/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix index b81390ffc9..fd1242e593 100644 --- a/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix @@ -3,34 +3,29 @@ lib, fetchurl, testers, + installShellFiles, upsun }: +let versions = lib.importJSON ./versions.json; + arch = if stdenvNoCC.hostPlatform.isx86_64 then "amd64" + else if stdenvNoCC.hostPlatform.isAarch64 then "arm64" + else throw "Unsupported architecture"; + os = if stdenvNoCC.hostPlatform.isLinux then "linux" + else if stdenvNoCC.hostPlatform.isDarwin then "darwin" + else throw "Unsupported os"; + versionInfo = versions."${os}-${arch}"; + inherit (versionInfo) hash url; + +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "upsun"; - version = "5.0.13"; + inherit (versions) version; - src = - { - x86_64-darwin = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_darwin_all.tar.gz"; - hash = "sha256-5JKXtAUnqrlufyNE05uZjEDfJv557auYPriTxvUbMJI="; - }; - aarch64-darwin = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_darwin_all.tar.gz"; - hash = "sha256-5JKXtAUnqrlufyNE05uZjEDfJv557auYPriTxvUbMJI="; - }; - x86_64-linux = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_linux_amd64.tar.gz"; - hash = "sha256-fjVL/sbO1wmaJ4qZpUMV/4Q4Jzf0p6qx0ElRdY5EUJU="; - }; - aarch64-linux = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_linux_arm64.tar.gz"; - hash = "sha256-MNlQkwsg5SuIQJBDy7yVtcda1odpaUZezCgrat6OW2Q="; - }; - } - .${stdenvNoCC.system} - or (throw "${finalAttrs.pname}-${finalAttrs.version}: ${stdenvNoCC.system} is unsupported."); + nativeBuildInputs = [ installShellFiles ]; + + # run ./update + src = fetchurl { inherit hash url; }; dontConfigure = true; dontBuild = true; @@ -41,10 +36,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -Dm755 upsun $out/bin/upsun + installShellCompletion completion/bash/upsun.bash \ + completion/zsh/_upsun + runHook postInstall ''; passthru = { + updateScript = ./update.sh; tests.version = testers.testVersion { inherit (finalAttrs) version; package = upsun; diff --git a/third_party/nixpkgs/pkgs/by-name/up/upsun/update.sh b/third_party/nixpkgs/pkgs/by-name/up/upsun/update.sh new file mode 100755 index 0000000000..d01cef8a59 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/up/upsun/update.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq +#shellcheck shell=bash + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/platformsh/cli/releases/latest | jq -e -r ".tag_name") + +linux_arm64_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_linux_arm64.tar.gz +linux_amd64_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_linux_amd64.tar.gz +darwin_all_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_darwin_all.tar.gz +linux_arm64_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_arm64_url")) +linux_amd64_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_amd64_url")) +darwin_all_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$darwin_all_url")) +jq -n \ + --arg version "$version" \ + --arg darwin_all_hash "$darwin_all_hash" \ + --arg darwin_all_url "$darwin_all_url" \ + --arg linux_amd64_hash "$linux_amd64_hash" \ + --arg linux_amd64_url "$linux_amd64_url" \ + --arg linux_arm64_hash "$linux_arm64_hash" \ + --arg linux_arm64_url "$linux_arm64_url" \ + '{ "version": $version, + "darwin-amd64": { "hash": $darwin_all_hash, "url": $darwin_all_url }, + "darwin-arm64": { "hash": $darwin_all_hash, "url": $darwin_all_url }, + "linux-amd64": { "hash": $linux_amd64_hash, "url": $linux_amd64_url }, + "linux-arm64": { "hash": $linux_arm64_hash, "url": $linux_arm64_url } +}' > pkgs/by-name/up/upsun/versions.json diff --git a/third_party/nixpkgs/pkgs/by-name/up/upsun/versions.json b/third_party/nixpkgs/pkgs/by-name/up/upsun/versions.json new file mode 100644 index 0000000000..dbf2a66f0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/up/upsun/versions.json @@ -0,0 +1,19 @@ +{ + "version": "5.0.21", + "darwin-amd64": { + "hash": "sha256-ePm8QOJcC87CqB1PbSAoMblopr7JsViHWW3BEQ+gjlQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_darwin_all.tar.gz" + }, + "darwin-arm64": { + "hash": "sha256-ePm8QOJcC87CqB1PbSAoMblopr7JsViHWW3BEQ+gjlQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_darwin_all.tar.gz" + }, + "linux-amd64": { + "hash": "sha256-1qbgXI3VtYoI/4EWPZ1jmWBVJEP+A60PIqXS38wnBPQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_linux_amd64.tar.gz" + }, + "linux-arm64": { + "hash": "sha256-pUdRvVtEokuf7gznUogyufTtloy4MuT5TMcJ4z1bcwo=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_linux_arm64.tar.gz" + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/ut/ut1999/package.nix b/third_party/nixpkgs/pkgs/by-name/ut/ut1999/package.nix index 98f4690eb2..db06369699 100644 --- a/third_party/nixpkgs/pkgs/by-name/ut/ut1999/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ut/ut1999/package.nix @@ -63,21 +63,21 @@ in stdenv.mkDerivation { stdenv.cc.cc ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems autoPatchelfHook imagemagick - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; installPhase = let - outPrefix = if stdenv.isDarwin then "$out/UnrealTournament.app/Contents/MacOS" else "$out"; + outPrefix = if stdenv.hostPlatform.isDarwin then "$out/UnrealTournament.app/Contents/MacOS" else "$out"; in '' runHook preInstall mkdir -p $out/bin - cp -r ${if stdenv.isDarwin then "UnrealTournament.app" else "./*"} $out + cp -r ${if stdenv.hostPlatform.isDarwin then "UnrealTournament.app" else "./*"} $out chmod -R 755 $out cd ${outPrefix} @@ -86,7 +86,7 @@ in stdenv.mkDerivation { cp -n ${unpackGog}/Textures/* ./Textures || true cp -n ${unpackGog}/System/*.{u,int} ./System || true - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999" ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc" diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix index 96e5941d73..7b507ceebd 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libiconv - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix index 7df5b832c7..44611002f9 100644 --- a/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-gptZld9BIQaujg9fGAgKD7wXjKeL5quXnSGOKn25jn8="; + hash = "sha256-neozpNSTxC4lkCuUpKPAeqGtQGgxf05WZZQOMTIkj2E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix index 7cdb9de51d..0a9db5026a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-08-29"; + version = "1.0-unstable-2024-09-20"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "ea4aaca2a6e5bc1623bbd2bd892a6eff31439fcc"; - hash = "sha256-1LA9IwnWcnr5fS1VP2wLWk6zNxNzJQ1VqAw5BsHz7tA="; + rev = "f8c53f59b012dd56d44ae50cdf90dd1dad6cce23"; + hash = "sha256-Ee4hN3OnqF/OhKieGtzT4XOhNJIhywCgP6Us0DZTVBI="; }; outputs = [ "out" "projects" ]; @@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "uxnemu"; inherit (SDL2.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix index a6a84d4a2c..0a09952d51 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]); checkFlags = [ # The following tests are reaching to the network. "--skip=vale::tests" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # This test does not account for the existence of aarch64-linux machines, # despite upstream shipping artifacts for that architecture "--skip=utils::tests::arch" diff --git a/third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix b/third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix index 1a97c09ebd..d442321216 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSystemd systemd ++ lib.optional tlsSupport openssl; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace-fail "-flto" "" ''; @@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix index 278cf1e567..7a40f1eba1 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ] )) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ApplicationServices ]; @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix + broken = stdenv.hostPlatform.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix description = "Video processing framework with the future in mind"; homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/by-name/va/vatprism/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vatprism/package.nix index c13e0b0cf0..bdc406091d 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vatprism/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vatprism/package.nix @@ -60,7 +60,7 @@ maven.buildMavenPackage rec { ]; mvnHash = - if (stdenv.isLinux && stdenv.isAarch64) then + if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then "sha256-x0nFt2C7dZqMdllI1+Io9SPBY2J/dVgBTVb9T24vFFI=" else "sha256-9uyNCUqnMgpiwm2kz544pWNB/SkRpASm2Dln0e4yZos="; diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix index 902d067f5a..1f5d35a365 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-fYLTaxNeixaHP19dS+BPVJwv/xXEV5hmmE2ob7jzS/A="; + hash = "sha256-rLdUEdAvYy8SDgKWUanZgmMnJ6Dg2dO5tTpGTwlQCrU="; }; pnpmDeps = pnpm.fetchDeps { diff --git a/third_party/nixpkgs/pkgs/by-name/ve/verible/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/verible/package.nix index ac2bd40c1c..4bfc1a1ca2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/verible/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/verible/package.nix @@ -18,8 +18,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2024-08-05"; - GIT_VERSION = "v0.0-3747-g79f6290d"; + GIT_DATE = "2024-09-17"; + GIT_VERSION = "v0.0-3791-g88bf4fb8"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); @@ -28,7 +28,7 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - hash = "sha256-cixhB7QZStfG4DKjqEVipIeM9uUt6vibtbtZypzIcMo="; + hash = "sha256-Na91NpHhPRZ1k82pLQBvEcL8EWi/1imNN3dPNSl65DQ="; }; bazel = bazel_6; diff --git a/third_party/nixpkgs/pkgs/by-name/ve/veryl/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/veryl/package.nix new file mode 100644 index 0000000000..0702a9d114 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ve/veryl/package.nix @@ -0,0 +1,70 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbus, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "veryl"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "veryl-lang"; + repo = "veryl"; + rev = "v${version}"; + hash = "sha256-U4ikR2jRmHUwRycAL/t2XJtvHQniKu6skRKWn8XDIgM="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-t2q3rbY84+0ayxt7a/TCD0exCm7KEs+8UbQjCtqZPoE="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + dbus + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + checkFlags = [ + # takes over an hour + "--skip=tests::progress" + # tempfile::tempdir().unwrap() -> "No such file or directory" + "--skip=tests::bump_version" + "--skip=tests::bump_version_with_commit" + "--skip=tests::check" + "--skip=tests::load" + "--skip=tests::lockfile" + "--skip=tests::publish" + "--skip=tests::publish_with_commit" + # "Permission Denied", while making its cache dir? + "--skip=analyzer::test_25_dependency" + "--skip=analyzer::test_68_std" + "--skip=emitter::test_25_dependency" + "--skip=emitter::test_68_std" + + ]; + + meta = { + description = "Modern Hardware Description Language"; + homepage = "https://veryl-lang.org/"; + changelog = "https://github.com/veryl-lang/veryl/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ pbsds ]; + mainProgram = "veryl"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix index 6d65fe99d8..4979bd32bd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pnpm_9.configHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # vesktop uses venmic, which is a shipped as a prebuilt node module # and needs to be patched autoPatchelfHook @@ -57,12 +57,12 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/172583 makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # on macos we don't need to expand variables, so we can use the faster binary wrapper makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire stdenv.cc.cc.lib @@ -81,12 +81,12 @@ stdenv.mkDerivation (finalAttrs: { # disable code signing on macos # https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export CSC_IDENTITY_AUTO_DISCOVERY=false ''; # electron builds must be writable on darwin - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' cp -r ${electron.dist}/Electron.app . chmod -R u+w Electron.app ''; @@ -98,13 +98,13 @@ stdenv.mkDerivation (finalAttrs: { pnpm exec electron-builder \ --dir \ -c.asarUnpack="**/*.node" \ - -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} runHook postBuild ''; - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' pushd build ${libicns}/bin/icns2png -x icon.icns popd @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preInstall '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/opt/Vesktop cp -r dist/*unpacked/resources $out/opt/Vesktop/ @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png done '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv dist/mac*/Vesktop.App $out/Applications '' @@ -132,18 +132,18 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Vesktop.app/Contents/MacOS/Vesktop $out/bin/vesktop ''; - desktopItems = lib.optional stdenv.isLinux (makeDesktopItem { + desktopItems = lib.optional stdenv.hostPlatform.isLinux (makeDesktopItem { name = "vesktop"; desktopName = "Vesktop"; exec = "vesktop %U"; diff --git a/third_party/nixpkgs/pkgs/by-name/vi/vieb/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/vieb/package.nix index 6927cb3e24..af524a450e 100644 --- a/third_party/nixpkgs/pkgs/by-name/vi/vieb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/vieb/package.nix @@ -20,7 +20,7 @@ buildNpmPackage rec { dontNpmBuild = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isAarch64 python3; desktopItem = makeDesktopItem { name = "vieb"; diff --git a/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix index 9af6170d56..ec8fe41756 100644 --- a/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/vikunja/package.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests }: let - version = "0.24.1"; + version = "0.24.3"; src = fetchFromGitHub { owner = "go-vikunja"; repo = "vikunja"; rev = "v${version}"; - hash = "sha256-39S7Xl8He+unIkAZ9GnjqWHBOfdDj4rSUmrExB+Q6Vc="; + hash = "sha256-UT2afhjEangilvflmxxahj7pEiJUWxqUL1Eni1JvuRI="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-iEcic/oQ33IO9tWqIQGfyjSY4YpJ8FckaI59qTgdq3c="; + hash = "sha256-QUhq1wc+vHCfY2wC0aikAMHmy8I/TOawMX659eqlm3I="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ buildGoModule { in [ fakeGit mage ]; - vendorHash = "sha256-oOa9qTy5jNYq05Tbp9hI4L0OBtKtglhk6Uz380nZH1Y="; + vendorHash = "sha256-d2BNzsBeWlpZGbU7PkXWO5e9FLJA/Wda5ImXwqh/WV4="; inherit frontend; diff --git a/third_party/nixpkgs/pkgs/by-name/vi/violet/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/violet/package.nix index 35e13eea54..e1fada3863 100644 --- a/third_party/nixpkgs/pkgs/by-name/vi/violet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/violet/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, nix-update-script, stdenv, - violet, testers, }: @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { }; - tests = testers.testVersion { package = violet; }; + tests = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/vi/vis/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/vis/package.nix index f16f717e7d..7d37d022a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/vi/vis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/vis/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libtermkey luaEnv tre - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl libselinux ]; diff --git a/third_party/nixpkgs/pkgs/by-name/vl/vlc-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/vl/vlc-bin/package.nix index 275e768c7e..9e496883cc 100644 --- a/third_party/nixpkgs/pkgs/by-name/vl/vlc-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vl/vlc-bin/package.nix @@ -4,9 +4,9 @@ , stdenv , undmg , variant ? - if (stdenv.isDarwin && stdenv.isAarch64) + if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) then "arm64" - else if (stdenv.isDarwin && stdenv.isx86_64) + else if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then "intel64" else "universal" # not reachable by normal means }: diff --git a/third_party/nixpkgs/pkgs/by-name/vo/volk_2/package.nix b/third_party/nixpkgs/pkgs/by-name/vo/volk_2/package.nix index 447922865c..57b849fcc2 100644 --- a/third_party/nixpkgs/pkgs/by-name/vo/volk_2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vo/volk_2/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 # volk_32f_log2_32f: fail on arch neon "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) ''; diff --git a/third_party/nixpkgs/pkgs/by-name/vs/vsce/package.nix b/third_party/nixpkgs/pkgs/by-name/vs/vsce/package.nix index 873b4e2c1a..1ecf3d9204 100644 --- a/third_party/nixpkgs/pkgs/by-name/vs/vsce/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vs/vsce/package.nix @@ -30,7 +30,7 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libsecret ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Security ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Security ]); makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix b/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix index b16717bf5d..bde7ae2215 100644 --- a/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -30,11 +30,11 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config node-gyp - ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = - lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.isDarwin [ + lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; diff --git a/third_party/nixpkgs/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-memory-allocator/package.nix index 4ed3251621..41489f3b94 100644 --- a/third_party/nixpkgs/pkgs/by-name/vu/vulkan-memory-allocator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , cmake }: @@ -15,6 +16,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-j0Z9OEwQx3RB2cni9eK3gYfwkhOc2ST213b6VseaVzg="; }; + patches = [ + # Allows specifying version constraints on the CMake module + # Remove when version > 3.1.0 + (fetchpatch { + name = "0001-vulkan-memory-allocator-add-cmake-package-version-file.patch"; + url = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/257138b8f5686ae84491a3df9f90a77d5660c3bd.patch"; + hash = "sha256-qbQhIJho/WQqzAwB2zzWgGKx4QK9zKmbaGisbNOV8mg="; + }) + ]; + # A compiler is only required for the samples. This lets us use stdenvNoCC. postPatch = '' substituteInPlace CMakeLists.txt \ diff --git a/third_party/nixpkgs/pkgs/by-name/vv/vvvvvv/package.nix b/third_party/nixpkgs/pkgs/by-name/vv/vvvvvv/package.nix index c4ed056166..471a84eecb 100644 --- a/third_party/nixpkgs/pkgs/by-name/vv/vvvvvv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vv/vvvvvv/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { physfs SDL2 tinyxml-2 - ] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation IOKit ]; cmakeDir = "../desktop_version"; diff --git a/third_party/nixpkgs/pkgs/by-name/vw/vwsfriend/package.nix b/third_party/nixpkgs/pkgs/by-name/vw/vwsfriend/package.nix index 63c7ff1434..60a4995a13 100644 --- a/third_party/nixpkgs/pkgs/by-name/vw/vwsfriend/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vw/vwsfriend/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vwsfriend"; - version = "0.24.5"; + version = "0.24.7"; pyproject = true; src = fetchFromGitHub { owner = "tillsteinbach"; repo = "VWsFriend"; rev = "refs/tags/v${version}"; - hash = "sha256-bKL0ExHV/wz3qwB5pMgZDkASr93sCUb01uTipkE5iJU="; + hash = "sha256-ZGH7rcGSAYDBSjv1jZjT/uGJIrFL71RYK6vX71RHz8E="; }; sourceRoot = "${src.name}/vwsfriend"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wakapi/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix rename to third_party/nixpkgs/pkgs/by-name/wa/wakapi/package.nix index 8edcd7bef0..ace3fbb241 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wakapi/package.nix @@ -1,17 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { +{ + lib, + buildGo123Module, + fetchFromGitHub, +}: +let + version = "2.12.0"; +in +buildGo123Module { pname = "wakapi"; - version = "2.11.2"; + inherit version; src = fetchFromGitHub { owner = "muety"; - repo = pname; - rev = version; - sha256 = "sha256-lBjYtb64blFUH/iW/SmC4A7nX9asokvsNKu6QVYgmZ8="; + repo = "wakapi"; + rev = "refs/tags/${version}"; + hash = "sha256-/aacT/VLA5S4PeGcxEGaCpgAw++b3VFD7T0CldZWcQI="; }; - vendorHash = "sha256-Kt7RzAGZeLFhwvq+V6AK88rivqkoTE1Zep7NMh3BXXQ="; + vendorHash = "sha256-Q56Ud0MtkstB/dhn+QyAHTzIqHsmKvHEK+5PAt5lIMM="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; @@ -24,12 +30,15 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { homepage = "https://wakapi.dev/"; changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; description = "Minimalist self-hosted WakaTime-compatible backend for coding statistics"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ t4ccer ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + t4ccer + isabelroses + ]; mainProgram = "wakapi"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix index 94d97dbfc2..420baa5bae 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; buildInputs = [ libiconv openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix index 71c23dc8f7..adb2b2614e 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix @@ -109,6 +109,6 @@ meta = with lib; { }; in -if stdenvNoCC.isDarwin +if stdenvNoCC.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json index 5faab954c3..e9b8cf9586 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json +++ b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-nED8SIfrxlKKT4J88L1Vnpq4Iq6TA4QMFK9TQfX4uRk=", - "version": "0.2024.09.10.08.02.stable_01" + "hash": "sha256-qaJP+du/jaI8zZPRZnM7K1DnC2GOzdZzs5JmKWj6OLQ=", + "version": "0.2024.09.17.08.02.stable_01" }, "linux_x86_64": { - "hash": "sha256-fNy0cNNgpq3JoeZhN20/7pRwCf53DwGkHl92/974FLQ=", - "version": "0.2024.09.10.08.02.stable_01" + "hash": "sha256-l51KJoEOXGokgnDb9pz5LVhgBN7B1eipsFA9J+QpQzM=", + "version": "0.2024.09.17.08.02.stable_01" }, "linux_aarch64": { - "hash": "sha256-HlPR3Q94KEdVlBsy2L+GQcyQ1qxw+As6qhWF5N3n3i4=", - "version": "0.2024.09.10.08.02.stable_01" + "hash": "sha256-zyiDYhxYG+JmiSdB7JBJ+H7yaIIvXaDlpslfa3TTsfI=", + "version": "0.2024.09.17.08.02.stable_01" } } diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wash-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wash-cli/package.nix index d5b3ebecf8..663273e54e 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wash-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wash-cli/package.nix @@ -24,7 +24,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasm-bindgen-cli/package.nix index 517b281347..d9b9978054 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wasm-bindgen-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wasm-bindgen-cli/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wastebin/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wastebin/package.nix index cdc5feb24b..f63429bff2 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wastebin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wastebin/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix index 196e739b2a..e0eb7a76ed 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix @@ -53,7 +53,7 @@ inputSupport ? true, jackSupport ? true, mpdSupport ? true, - mprisSupport ? stdenv.isLinux, + mprisSupport ? stdenv.hostPlatform.isLinux, nlSupport ? true, pipewireSupport ? true, pulseSupport ? true, @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional upowerSupport upower ++ lib.optional wireplumberSupport wireplumber ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; + ++ lib.optional (!stdenv.hostPlatform.isLinux) libinotify-kqueue; nativeCheckInputs = [ catch2_3 ]; doCheck = runTests; @@ -179,13 +179,15 @@ stdenv.mkDerivation (finalAttrs: { "pulseaudio" = pulseSupport; "rfkill" = rfkillSupport; "sndio" = sndioSupport; - "systemd" = false; + "systemd" = true; "tests" = runTests; "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + postPatch = '' substituteInPlace include/util/command.hpp \ --replace-fail /bin/sh ${lib.getExe' bash "sh"} diff --git a/third_party/nixpkgs/pkgs/by-name/we/weaver/package.nix b/third_party/nixpkgs/pkgs/by-name/we/weaver/package.nix index d89c548375..7734b0d6f5 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/weaver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/weaver/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "weaver"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; rev = "v${version}"; - hash = "sha256-HKVUi/XJsvgj+UnhJRa2PkGlfJHNdz8M/re9vYMu1LM="; + hash = "sha256-hSoMt+4D1bpENBD9NmuVBLDUOJkau5Sk2OHS5RyDRYQ="; }; - cargoHash = "sha256-p6NQm4Paq1nDMxmaf3BcZF3V7k6Ifw93BC0InKUjgBk="; + cargoHash = "sha256-4rHDulSsFvKly5M5bo1AtEAl280N/hxhznTngCxw36Y="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ] ); diff --git a/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix b/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix index aa914fdd8f..9f55f565d5 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix @@ -29,10 +29,10 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = - lib.optionals stdenv.isLinux [ btrfs-progs ] + lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs ] ++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ]; - CGO_ENABLED = if stdenv.isLinux then 1 else 0; + CGO_ENABLED = if stdenv.hostPlatform.isLinux then 1 else 0; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wiliwili/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiliwili/package.nix index 302b47b65b..85cc143f45 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wiliwili/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wiliwili/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { curl libxkbcommon dbus - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libffi # needed for wayland wayland egl-wayland @@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "PLATFORM_DESKTOP" true) (lib.cmakeBool "INSTALL" true) - (lib.cmakeBool "GLFW_BUILD_WAYLAND" stdenv.isLinux) - (lib.cmakeBool "GLFW_BUILD_X11" stdenv.isLinux) + (lib.cmakeBool "GLFW_BUILD_WAYLAND" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "GLFW_BUILD_X11" stdenv.hostPlatform.isLinux) # Otherwise cpr cmake will try to download zlib (lib.cmakeBool "CPR_FORCE_USE_SYSTEM_CURL" true) ]; diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wiper/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiper/package.nix index 3eb069de23..1540bbda4b 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wiper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wiper/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-gYWTv0AXOmpx9Nc8akBMVWkESI0AtnGgvfH9hQZ0peo="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; meta = { description = "Disk analyser and cleanup tool"; diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wireguard-ui/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wireguard-ui/package.nix new file mode 100644 index 0000000000..b046bdc5a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wi/wireguard-ui/package.nix @@ -0,0 +1,81 @@ +{ + buildGoModule, + lib, + fetchFromGitHub, + fetchYarnDeps, + yarn, + fixup-yarn-lock, + nodejs, + fetchpatch2, +}: + +buildGoModule rec { + pname = "wireguard-ui"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "ngoduykhanh"; + repo = "wireguard-ui"; + rev = "refs/tags/v${version}"; + hash = "sha256-fK7l9I2s0zSxG1g1oQ1KjJZUcypwS9DxnNN7lhVI+1s="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/ngoduykhanh/wireguard-ui/commit/2fdafd34ca6c8f7f1415a3a1d89498bb575a7171.patch?full_index=1"; + hash = "sha256-nq/TX+TKDB29NcPQ3pLWD0jcXubULuwqisn9IcEW8B8="; + }) + ]; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-ps/GtdtDKA3y5o1GZpRG+z08lSzk8d9zgxb95kjr/gc="; + }; + + vendorHash = "sha256-FTjZ6wf0ym6kFJ58Z3E3shmbq9SaMwlXWeueHQXwkX4="; + + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + ]; + + ldflags = [ + "-X main.appVersion=v${version}" + ]; + + preConfigure = '' + # This is what prepare_assets.sh do. + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline install + + mkdir -p "./assets/dist/js" "./assets/dist/css" && \ + cp -r "./node_modules/admin-lte/dist/js/adminlte.min.js" "./assets/dist/js/adminlte.min.js" && \ + cp -r "./node_modules/admin-lte/dist/css/adminlte.min.css" "./assets/dist/css/adminlte.min.css" + + cp -r "./custom" "./assets" + + mkdir -p "./assets/plugins" && \ + cp -r "./node_modules/admin-lte/plugins/jquery" \ + "./node_modules/admin-lte/plugins/fontawesome-free" \ + "./node_modules/admin-lte/plugins/bootstrap" \ + "./node_modules/admin-lte/plugins/icheck-bootstrap" \ + "./node_modules/admin-lte/plugins/toastr" \ + "./node_modules/admin-lte/plugins/jquery-validation" \ + "./node_modules/admin-lte/plugins/select2" \ + "./node_modules/jquery-tags-input" \ + "./assets/plugins/" + ''; + + meta = { + description = "Web user interface to manage your WireGuard setup"; + changelog = "https://github.com/ngoduykhanh/wireguard-ui/releases/tag/v${version}"; + homepage = "https://github.com/ngoduykhanh/wireguard-ui"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "wireguard-ui"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix index c9b5b49816..4599629cbe 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-eTPP9G3t/P24ck9iZbXxoLV44wUWISb5RAjUPE7hsEA="; + hash = "sha256-AsKbmJBWIv/NjWzGdjTpbCs+esSkIli08qbEApppvOU="; }; - cargoHash = "sha256-CVtUvUnvCrI637H2QjUEE2Ad8ujvJLYlRuuu8SBbzyY="; + cargoHash = "sha256-+/7asqF4eXtl+/AhgSf+M3KIVqFf44EHb0FJTT4lo4c="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix index 3b31f14f8c..cfa8eced28 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ wayland ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Keep Wayland clipboard even after programs close"; homepage = "https://github.com/Linus789/wl-clip-persist"; inherit (wayland.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-applet/package.nix new file mode 100644 index 0000000000..64388cf0b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-applet/package.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + wayland, + libxkbcommon, + fontconfig, + pkg-config, + autoPatchelfHook, +}: + +rustPlatform.buildRustPackage { + pname = "wl-gammarelay-applet"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "lgbishop"; + repo = "wl-gammarelay-applet"; + rev = "8a0d9e6364d7445fc69c59b2f168cfec91c2fe87"; + sha256 = "sha256-t6bycmaquZ0IMs/WnAzkz5FnIWKIq0BTbeeoUFLeuYg="; + }; + + cargoHash = "sha256-1hJLu/ndnBYdzJ+NjLaCYENFszvAj9MYpLsZyLEq0Sg="; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + runtimeDependencies = [ + wayland + libxkbcommon + fontconfig.lib + ]; + + meta = { + description = "Control wl-gammarelay-rs via applet"; + longDescription = '' + wl-gammarelay-applet is a small desktop applet for controlling + wl-gammarelay-rs via DBus. This applet is written in Rust and + provides a Slint UI. + ''; + homepage = "https://github.com/lgbishop/wl-gammarelay-applet"; + mainProgram = "wl-gammarelay-applet"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ lgbishop ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock index 2a9c2efe03..8f089a061a 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock @@ -4556,7 +4556,7 @@ dependencies = [ [[package]] name = "wlx-capture" version = "0.3.12" -source = "git+https://github.com/galister/wlx-capture?tag=v0.3.12#14d2b8a13dad62849973fe90bed7be262aa07143" +source = "git+https://github.com/galister/wlx-capture?tag=v0.3.13#c375a7c1d4b57741655a052ebe8af9fb4774f92d" dependencies = [ "ashpd", "drm-fourcc", @@ -4574,7 +4574,7 @@ dependencies = [ [[package]] name = "wlx-overlay-s" -version = "0.4.4" +version = "0.5.0" dependencies = [ "anyhow", "ash", diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix index fb9404b3c8..36d6ca6fa1 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix @@ -28,13 +28,13 @@ rustPlatform.buildRustPackage rec { pname = "wlx-overlay-s"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "galister"; repo = "wlx-overlay-s"; rev = "v${version}"; - hash = "sha256-+pWhtaYOzh7LPSCQeUTlU+/IxtcQTqRci9X7xEUV18U="; + hash = "sha256-FuhpHByeiUwB14+WHZ7ssJ8YPphs06jPcMhxiGfiaU8="; }; cargoLock = { @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk="; "ovr_overlay-0.0.0" = "sha256-5IMEI0IPTacbA/1gibYU7OT6r+Bj+hlQjDZ3Kg0L2gw="; "vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc="; - "wlx-capture-0.3.12" = "sha256-rZTJp7VhUvE/6lwESW2jKeGweFut6BvcxouG/nyl+GE="; + "wlx-capture-0.3.12" = "sha256-32WnAnNUSfsAA8WB9da3Wqb4acVlXh6HWsY9tPzCHEE="; }; }; @@ -98,7 +98,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Scrumplex ]; platforms = lib.platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "wlx-overlay-s"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ws/wslay/package.nix b/third_party/nixpkgs/pkgs/by-name/ws/wslay/package.nix index 45054f8130..85f3294eba 100644 --- a/third_party/nixpkgs/pkgs/by-name/ws/wslay/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ws/wslay/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { checkInputs = [ cunit ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH=$(pwd)/lib/.libs ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix b/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix index d6c66e152b..ba3800abcd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix @@ -2,9 +2,11 @@ lib, fetchFromGitHub, rustPlatform, + stdenv, nixosTests, nix-update-script, versionCheckHook, + darwin, }: let @@ -25,6 +27,9 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-3b+pX/qQuhOY1OYr+CfT5wtiJcEJ8CJJsQZ4QOcYv74="; nativeBuildInputs = [ versionCheckHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix b/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix index b844b826a9..0110caec8e 100644 --- a/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fuLKWooXn966RORH20D9wwbjNtyLEZOO8Y8RcjsFwqM="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); cargoHash = "sha256-Of1tHKIL2XbzA6YFxtvaP9sa+KMw8uJTFG0n84g2Eog="; diff --git a/third_party/nixpkgs/pkgs/by-name/wt/wtwitch/package.nix b/third_party/nixpkgs/pkgs/by-name/wt/wtwitch/package.nix index 0035e18454..73bfe1c3fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/wt/wtwitch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wt/wtwitch/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { install -Dm755 src/wtwitch $out/bin/wtwitch wrapProgram $out/bin/wtwitch \ --set-default LANG en_US.UTF-8 \ - --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isLinux [ vlc ] ++ [ + --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ vlc ] ++ [ bash coreutils-prefixed curl diff --git a/third_party/nixpkgs/pkgs/by-name/x1/x16/package.nix b/third_party/nixpkgs/pkgs/by-name/x1/x16/package.nix index b6f8926a4d..26a12e480e 100644 --- a/third_party/nixpkgs/pkgs/by-name/x1/x16/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/x1/x16/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "x16emu"; inherit (SDL2.meta) platforms; - broken = stdenv.isAarch64; # ofborg fails to compile it + broken = stdenv.hostPlatform.isAarch64; # ofborg fails to compile it }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/x1/x16/rom.nix b/third_party/nixpkgs/pkgs/by-name/x1/x16/rom.nix index 989e810941..ed85dd5108 100644 --- a/third_party/nixpkgs/pkgs/by-name/x1/x16/rom.nix +++ b/third_party/nixpkgs/pkgs/by-name/x1/x16/rom.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (cc65.meta) platforms; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index f299e46b8d..717facbc03 100644 --- a/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/xdg-desktop-portal-cosmic"; description = "XDG Desktop Portal for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; mainProgram = "xdg-desktop-portal-cosmic"; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/by-name/xd/xdg-user-dirs/package.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-user-dirs/package.nix index 5d141eb804..98d95290ca 100644 --- a/third_party/nixpkgs/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ makeWrapper libxslt docbook_xsl - ] ++ lib.optionals stdenv.isDarwin [ gettext ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; preFixup = '' # fallback values need to be last diff --git a/third_party/nixpkgs/pkgs/by-name/xe/xevd/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xevd/package.nix index d5ba1995bb..fc5c80e31b 100644 --- a/third_party/nixpkgs/pkgs/by-name/xe/xevd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xe/xevd/package.nix @@ -99,6 +99,6 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "xevd" ]; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix index f8acbee0ac..2f9f2b029d 100644 --- a/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xeve_app"; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix b/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix index 30b6926901..fe5ab564e9 100644 --- a/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix @@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libopus - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/xm/xml-tooling-c/package.nix b/third_party/nixpkgs/pkgs/by-name/xm/xml-tooling-c/package.nix index 921175c3e8..709bfee14b 100644 --- a/third_party/nixpkgs/pkgs/by-name/xm/xml-tooling-c/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xm/xml-tooling-c/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-std=c++14"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix b/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix index 0bdfdfbc8a..b75adabdfd 100644 --- a/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-RZgdWhVBZozYxbbNslCBLhN6EnogpyVXvht6GbzLnPs="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin - env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { + env = lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) { TARGET_STRIP = "${stdenv.cc.targetPrefix}strip"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/xr/xreader/package.nix b/third_party/nixpkgs/pkgs/by-name/xr/xreader/package.nix index c8bfafdb68..bf1ad8410b 100644 --- a/third_party/nixpkgs/pkgs/by-name/xr/xreader/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xr/xreader/package.nix @@ -20,7 +20,6 @@ , webkitgtk_4_1 , nodePackages , ninja -, gsettings-desktop-schemas , djvulibre , backends ? [ "pdf" "ps" /* "dvi" "t1lib" */ "djvu" "tiff" "pixbuf" "comics" "xps" "epub" ] }: diff --git a/third_party/nixpkgs/pkgs/by-name/xs/xsimd/package.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsimd/package.nix index 8f8c72bc3f..622f11f400 100644 --- a/third_party/nixpkgs/pkgs/by-name/xs/xsimd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xs/xsimd/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/xtensor-stack/xsimd/commit/c8a87ed6e04b6782f48f94713adfb0cad6c11ddf.patch"; hash = "sha256-2/FvBGdqTPcayD7rdHPSzL+F8IYKAfMW0WBJ0cW9EZ0="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/xtensor-stack/xsimd/issues/1030 ./disable-test_error_gamma.patch ]; diff --git a/third_party/nixpkgs/pkgs/by-name/xt/xtf/package.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtf/package.nix index bb2916c54e..4a19f84c89 100644 --- a/third_party/nixpkgs/pkgs/by-name/xt/xtf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xt/xtf/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { pname = "xtf"; - version = "0-unstable-2024-08-30"; + version = "0-unstable-2024-09-13"; outputs = [ "out" # xtf-runner and test suite. @@ -20,8 +20,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://xenbits.xenproject.org/git-http/xtf.git"; - rev = "f503efe8e5cf8858ec0704f1aaa82d0bf50891a5"; - hash = "sha256-ccI9FcrK7T4Zrv3przZ7qZhJ/ZsPPi+1KOIVCdFKKdc="; + rev = "c9a5e404e70c21c7621db4b8cabdf68261db7e1c"; + hash = "sha256-FMFbAdgH5KCpocAzUXb7nM3wpn4xs/gk/0M8AUVxXv0="; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/by-name/xw/xwiimote/package.nix b/third_party/nixpkgs/pkgs/by-name/xw/xwiimote/package.nix index a17299197d..0114dba714 100644 --- a/third_party/nixpkgs/pkgs/by-name/xw/xwiimote/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xw/xwiimote/package.nix @@ -5,7 +5,6 @@ ncurses, pkg-config, fetchFromGitHub, - bluez, autoreconfHook, }: diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix index c6554adf96..22f21c1910 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix @@ -23,11 +23,11 @@ let SkyLight ; - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.2"; + version = "7.1.3"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -40,12 +40,12 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isx86_64 [ + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ xcodebuild xxd ]; - buildInputs = lib.optionals stdenv.isx86_64 [ + buildInputs = lib.optionals stdenv.hostPlatform.isx86_64 [ Carbon Cocoa ScriptingBridge @@ -53,7 +53,7 @@ stdenv'.mkDerivation (finalAttrs: { ]; dontConfigure = true; - dontBuild = stdenv.isAarch64; + dontBuild = stdenv.hostPlatform.isAarch64; enableParallelBuilding = true; installPhase = '' @@ -62,14 +62,14 @@ stdenv'.mkDerivation (finalAttrs: { mkdir -p $out/{bin,share/icons/hicolor/scalable/apps} cp ./bin/yabai $out/bin/yabai - ${lib.optionalString stdenv.isx86_64 "cp ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/yabai.svg"} + ${lib.optionalString stdenv.hostPlatform.isx86_64 "cp ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/yabai.svg"} installManPage ./doc/yabai.1 runHook postInstall ''; postPatch = - lib.optionalString stdenv.isx86_64 # bash + lib.optionalString stdenv.hostPlatform.isx86_64 # bash '' # aarch64 code is compiled on all targets, which causes our Apple SDK headers to error out. # Since multilib doesn't work on darwin i dont know of a better way of handling this. @@ -96,13 +96,13 @@ stdenv'.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-4ZJs7Xpou0Ek0CCCjbK47Nu/XPpuTpBDU8GJz5AsaUg="; + hash = "sha256-wp5B24DYX1RYHS/3+4WRRCzVE6FyCzatJDpzJWrEIpQ="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-H+7vH6AjP6HQ1ifXe8qlLSh0FQu8KJkwr+38C5akk/c="; + hash = "sha256-hCwI6ziUR4yuJOv4MQXh3ufbausaDrG8XfjR+jIOeC4="; }; }; @@ -146,6 +146,7 @@ stdenv'.mkDerivation (finalAttrs: { ]; sourceProvenance = with lib.sourceTypes; - lib.optionals stdenv.isx86_64 [ fromSource ] ++ lib.optionals stdenv.isAarch64 [ binaryNativeCode ]; + lib.optionals stdenv.hostPlatform.isx86_64 [ fromSource ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ binaryNativeCode ]; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yandex-cloud/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yandex-cloud/package.nix index d93adcae1a..e45cf8ab73 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yandex-cloud/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yandex-cloud/package.nix @@ -12,14 +12,13 @@ nix, # tests testers, - yandex-cloud, }: let pname = "yandex-cloud"; sources = lib.importJSON ./sources.json; inherit (sources) version binaries; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname version; src = fetchurl binaries.${stdenv.hostPlatform.system}; @@ -68,7 +67,7 @@ stdenv.mkDerivation { (lib.makeBinPath [ nix ]) ]; } ./update.py; - tests.version = testers.testVersion { package = yandex-cloud; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = { @@ -96,4 +95,4 @@ stdenv.mkDerivation { ]; mainProgram = "yc"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/info.json b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/info.json index 7564f59339..0223a0ae3a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/info.json +++ b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/info.json @@ -1,7 +1,7 @@ { "branch": "master", - "commit_hash": "98fed92683e2e5a49999d04b5559edd02eddf627", + "commit_hash": "d446a98850abccfe28a78363c96468a2a8109cfc", "commit_message": "Update packages", - "date": "2024-09-10", - "tag": "v5.15.0" + "date": "2024-09-22", + "tag": "v5.18.2" } diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/package.nix index a26e729d7b..6ee96d54fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.15.0"; + version = "5.18.2"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-c+OKyhbgpXMryc6QQH4b5cePlqyHeSfDh4kT2rU+Tpo="; + hash = "sha256-y+T2ckrnhrOiiPKBUlnvDb4FwrIfbaIXwVi16AoX/bQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/ym_info.json b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/ym_info.json index 49ff918d36..cba72691ed 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,9 +1,9 @@ { "ym": { - "version": "5.15.0", - "exe_name": "Yandex_Music_x64_5.15.0.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.15.0.exe", - "exe_sha256": "14396a25b35199f28175d3c15924ec75560cbae6f5fb6767ec7f326637723e36" + "version": "5.18.2", + "exe_name": "Yandex_Music_x64_5.18.2.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.18.2.exe", + "exe_sha256": "a513eb6aa4bd05bae8503f5578a8e91d778794ffe4eb3a450040903570106941" }, "electron": { "version": "29.4.6", diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yapesdl/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yapesdl/package.nix index 44bb2a0dba..9b974c3eeb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yapesdl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yapesdl/package.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "yapesdl"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix index 3245be8f31..561eea7fdb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { env.VERGEN_BUILD_DATE = "2024-09-04"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; postInstall = '' installShellCompletion --cmd yazi \ diff --git a/third_party/nixpkgs/pkgs/by-name/yc/ycmd/package.nix b/third_party/nixpkgs/pkgs/by-name/yc/ycmd/package.nix index 325a8d95e6..56a384df64 100644 --- a/third_party/nixpkgs/pkgs/by-name/yc/ycmd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yc/ycmd/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = with python.pkgs; with llvmPackages; [ abseil-cpp boost libllvm.all libclang.all ] ++ [ jedi jedi-language-server pybind11 ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" diff --git a/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix b/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix index 9a20e9ecf3..077ba87758 100644 --- a/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix @@ -74,7 +74,7 @@ let platforms = builtins.attrNames srcs; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta; diff --git a/third_party/nixpkgs/pkgs/by-name/yt/yt-dlg/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/yt-dlg/package.nix index c40befc28d..a5ba63307b 100644 --- a/third_party/nixpkgs/pkgs/by-name/yt/yt-dlg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yt/yt-dlg/package.nix @@ -2,7 +2,6 @@ lib, python3Packages, fetchFromGitHub, - fetchPypi, }: python3Packages.buildPythonApplication rec { pname = "yt-dlg"; diff --git a/third_party/nixpkgs/pkgs/by-name/yt/ytui-music/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytui-music/package.nix index 3c460082b2..0e520955e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/yt/ytui-music/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yt/ytui-music/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite mpv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/by-name/yu/yubico-piv-tool/package.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubico-piv-tool/package.nix index 1375a66b65..69665583f2 100644 --- a/third_party/nixpkgs/pkgs/by-name/yu/yubico-piv-tool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yu/yubico-piv-tool/package.nix @@ -13,12 +13,12 @@ stdenv, testers, zlib, - withApplePCSC ? stdenv.isDarwin, + withApplePCSC ? stdenv.hostPlatform.isDarwin, }: stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.6.0"; + version = "2.6.1"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Yubico"; repo = "yubico-piv-tool"; rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}"; - hash = "sha256-53cgwXMzVKnouwHhbt6pODhjF2MH0sK5CPWpbZe71jE="; + hash = "sha256-RYT/kBlUfVkJG8RNELVQ5gyC+HDteD5xqaI479nsvKw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/yu/yudit/package.nix b/third_party/nixpkgs/pkgs/by-name/yu/yudit/package.nix new file mode 100644 index 0000000000..e7131c8c54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yu/yudit/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchurl, + xorg, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "yudit"; + version = "3.1.0"; + + src = fetchurl { + url = "https://www.yudit.org/download/yudit-${finalAttrs.version}.tar.gz"; + hash = "sha256-oYgjTWEnNXaE9Sw9bGpLnY9avQ99tnJWa/RE73p85Vc="; + }; + + buildInputs = [ + xorg.libX11 + ]; + + meta = { + description = "Free Unicode plain-text editor for Unix-like systems"; + homepage = "https://www.yudit.org/"; + changelog = "https://www.yudit.org/download/CHANGELOG.TXT"; + mainProgram = "yudit"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + # Might work on Darwin but currently fails, and upstream doesn't officially + # supports it. + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/za/zapret/package.nix b/third_party/nixpkgs/pkgs/by-name/za/zapret/package.nix index 658d525bf3..4cb0f099e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/za/zapret/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/za/zapret/package.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation { mainProgram = "zapret"; # probably gonna work on darwin, but untested - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/zc/zchunk/package.nix b/third_party/nixpkgs/pkgs/by-name/zc/zchunk/package.nix index 0e7df32c08..e0450116f5 100644 --- a/third_party/nixpkgs/pkgs/by-name/zc/zchunk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zc/zchunk/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl zstd - ] ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock index 4a6bdbddb4..e649f27e82 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -25,7 +25,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ - "gimli 0.29.0", + "gimli", ] [[package]] @@ -243,7 +243,6 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "collections", "futures 0.3.30", "http_client", "isahc", @@ -264,9 +263,9 @@ checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "approx" @@ -305,6 +304,9 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "as-raw-xcb-connection" @@ -400,6 +402,7 @@ dependencies = [ "indoc", "language", "language_model", + "languages", "log", "markdown", "menu", @@ -416,6 +419,7 @@ dependencies = [ "regex", "release_channel", "rope", + "rpc", "schemars", "search", "semantic_index", @@ -433,6 +437,7 @@ dependencies = [ "text", "theme", "toml 0.8.19", + "tree-sitter-md", "ui", "unindent", "util", @@ -452,6 +457,7 @@ dependencies = [ "language", "parking_lot", "serde", + "serde_json", "workspace", ] @@ -833,9 +839,9 @@ dependencies = [ [[package]] name = "async-stripe" -version = "0.38.1" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ddaa6999d246ba2c6c84d830a1ba0cd16c9234d58701988b3869f0e5bd732d" +checksum = "58d670cf4d47a1b8ffef54286a5625382e360a34ee76902fd93ad8c7032a0c30" dependencies = [ "chrono", "futures-util", @@ -872,6 +878,20 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" +[[package]] +name = "async-tls" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" +dependencies = [ + "futures-core", + "futures-io", + "rustls 0.20.9", + "rustls-pemfile 1.0.4", + "webpki", + "webpki-roots 0.22.6", +] + [[package]] name = "async-trait" version = "0.1.81" @@ -889,8 +909,8 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ - "async-native-tls", "async-std", + "async-tls", "futures-io", "futures-util", "log", @@ -977,7 +997,6 @@ dependencies = [ "editor", "gpui", "http_client", - "isahc", "log", "markdown_preview", "menu", @@ -1045,7 +1064,7 @@ dependencies = [ "fastrand 2.1.1", "hex", "http 0.2.12", - "ring", + "ring 0.17.8", "time", "tokio", "tracing", @@ -1214,7 +1233,7 @@ dependencies = [ "once_cell", "p256", "percent-encoding", - "ring", + "ring 0.17.8", "sha2", "subtle", "time", @@ -1327,7 +1346,7 @@ dependencies = [ "once_cell", "pin-project-lite", "pin-utils", - "rustls", + "rustls 0.21.12", "tokio", "tracing", ] @@ -1483,7 +1502,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide 0.7.4", - "object 0.36.4", + "object", "rustc-demangle", ] @@ -1710,6 +1729,19 @@ dependencies = [ "profiling", ] +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block" version = "0.1.6" @@ -2376,7 +2408,6 @@ dependencies = [ "cocoa 0.26.0", "collections", "feature_flags", - "fs", "futures 0.3.30", "gpui", "http_client", @@ -2388,6 +2419,8 @@ dependencies = [ "rand 0.8.5", "release_channel", "rpc", + "rustls 0.20.9", + "rustls-native-certs 0.8.0", "schemars", "serde", "serde_json", @@ -2536,6 +2569,7 @@ dependencies = [ "http_client", "hyper", "indoc", + "isahc_http_client", "jsonwebtoken", "language", "language_model", @@ -2753,12 +2787,19 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "context_servers" version = "0.1.0" dependencies = [ "anyhow", "collections", + "command_palette_hooks", "futures 0.3.30", "gpui", "log", @@ -3010,27 +3051,38 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29daf137addc15da6bab6eae2c4a11e274b1d270bf2759508e62f6145e863ef6" +checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" dependencies = [ "cranelift-entity", ] [[package]] -name = "cranelift-codegen" -version = "0.108.1" +name = "cranelift-bitset" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de619867d5de4c644b7fd9904d6e3295269c93d8a71013df796ab338681222d4" +checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "cranelift-codegen" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.28.1", + "gimli", "hashbrown 0.14.5", "log", "regalloc2", @@ -3041,43 +3093,44 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f5cf277490037d8dae9513d35e0ee8134670ae4a964a5ed5b198d4249d7c10" +checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3e22ecad1123343a3c09ac6ecc532bb5c184b6fcb7888df0ea953727f79924" +checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" [[package]] name = "cranelift-control" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ca3ec6d30bce84ccf59c81fead4d16381a3ef0ef75e8403bc1e7385980da09" +checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eabb8d36b0ca8906bec93c78ea516741cac2d7e6b266fa7b0ffddcc09004990" +checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" dependencies = [ + "cranelift-bitset", "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b42630229e49a8cfcae90bdc43c8c4c08f7a7aa4618b67f79265cd2f996dd2" +checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" dependencies = [ "cranelift-codegen", "log", @@ -3087,15 +3140,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918d1e36361805dfe0b6cdfd5a5ffdb5d03fa796170c5717d2727cbe623b93a0" +checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" [[package]] name = "cranelift-native" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aea85a0d7e1800b14ce9d3f53adf8ad4d1ee8a9e23b0269bdc50285e93b9b3" +checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" dependencies = [ "cranelift-codegen", "libc", @@ -3104,9 +3157,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac491fd3473944781f0cf9528c90cc899d18ad438da21961a839a3a44d57dfb" +checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -3114,7 +3167,7 @@ dependencies = [ "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-types", ] @@ -3285,7 +3338,7 @@ version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.29.0", + "nix", "windows-sys 0.59.0", ] @@ -3685,6 +3738,7 @@ dependencies = [ "serde", "serde_json", "settings", + "similar", "smallvec", "smol", "snippet", @@ -3963,6 +4017,34 @@ dependencies = [ "num-traits", ] +[[package]] +name = "evals" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "client", + "clock", + "collections", + "env_logger", + "feature_flags", + "fs", + "git", + "gpui", + "http_client", + "isahc_http_client", + "language", + "languages", + "node_runtime", + "open_ai", + "project", + "semantic_index", + "serde", + "serde_json", + "settings", + "smol", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -4046,6 +4128,7 @@ dependencies = [ "http_client", "indexed_docs", "isahc", + "isahc_http_client", "language", "log", "lsp", @@ -4067,8 +4150,8 @@ dependencies = [ "ui", "url", "util", - "wasm-encoder 0.201.0", - "wasmparser 0.201.0", + "wasm-encoder 0.215.0", + "wasmparser 0.215.0", "wasmtime", "wasmtime-wasi", "wit-component", @@ -4084,7 +4167,7 @@ dependencies = [ "env_logger", "extension", "fs", - "http_client", + "isahc_http_client", "language", "log", "rpc", @@ -4188,6 +4271,7 @@ dependencies = [ name = "feature_flags" version = "0.1.0" dependencies = [ + "futures 0.3.30", "gpui", ] @@ -4330,7 +4414,7 @@ dependencies = [ "futures-core", "futures-sink", "nanorand", - "spin", + "spin 0.9.8", ] [[package]] @@ -4779,21 +4863,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator", "indexmap 2.4.0", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - [[package]] name = "git" version = "0.1.0" @@ -4845,7 +4923,6 @@ dependencies = [ "git", "gpui", "http_client", - "isahc", "pretty_assertions", "regex", "serde", @@ -4929,6 +5006,7 @@ dependencies = [ "anyhow", "futures 0.3.30", "http_client", + "isahc", "schemars", "serde", "serde_json", @@ -5161,6 +5239,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", + "serde", ] [[package]] @@ -5476,12 +5555,11 @@ dependencies = [ "anyhow", "derive_more", "futures 0.3.30", - "futures-lite 1.13.0", - "http 1.1.0", - "isahc", + "http 0.2.12", "log", "serde", "serde_json", + "smol", "url", ] @@ -5543,8 +5621,8 @@ dependencies = [ "http 0.2.12", "hyper", "log", - "rustls", - "rustls-native-certs", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls", ] @@ -5956,6 +6034,17 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "isahc_http_client" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures 0.3.30", + "http_client", + "isahc", + "util", +] + [[package]] name = "itertools" version = "0.10.5" @@ -6060,7 +6149,7 @@ dependencies = [ "base64 0.21.7", "js-sys", "pem", - "ring", + "ring 0.17.8", "serde", "serde_json", "simple_asn1", @@ -6138,7 +6227,7 @@ dependencies = [ "lsp", "parking_lot", "postage", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "rand 0.8.5", "regex", "rpc", @@ -6311,7 +6400,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin", + "spin 0.9.8", ] [[package]] @@ -6658,7 +6747,7 @@ dependencies = [ "linkify", "log", "node_runtime", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "settings", "theme", "ui", @@ -6678,7 +6767,8 @@ dependencies = [ "linkify", "log", "pretty_assertions", - "pulldown-cmark", + "pulldown-cmark 0.12.1", + "settings", "theme", "ui", "workspace", @@ -6773,7 +6863,7 @@ dependencies = [ "once_cell", "opener", "pathdiff", - "pulldown-cmark", + "pulldown-cmark 0.10.3", "regex", "serde", "serde_json", @@ -7067,18 +7157,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - [[package]] name = "nix" version = "0.29.0" @@ -7391,24 +7469,15 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "object" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" -dependencies = [ - "crc32fast", - "hashbrown 0.14.5", - "indexmap 2.4.0", - "memchr", -] - [[package]] name = "object" version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ + "crc32fast", + "hashbrown 0.14.5", + "indexmap 2.4.0", "memchr", ] @@ -7442,7 +7511,6 @@ dependencies = [ "anyhow", "futures 0.3.30", "http_client", - "isahc", "schemars", "serde", "serde_json", @@ -7884,7 +7952,7 @@ name = "perplexity" version = "0.1.0" dependencies = [ "serde", - "zed_extension_api 0.1.0", + "zed_extension_api 0.2.0", ] [[package]] @@ -8540,9 +8608,6 @@ version = "0.1.0" dependencies = [ "anyhow", "collections", - "futures 0.3.30", - "gpui", - "parking_lot", "prost", "prost-build", "serde", @@ -8557,11 +8622,10 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "protols-tree-sitter-proto" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bac092da66e21a71eb832925de7b542f8ac34f75fd05cd2fc3e272863e3fd2b" +source = "git+https://github.com/zed-industries/tree-sitter-proto?rev=0848bd30a64be48772e15fbb9d5ba8c0cc5772ad#0848bd30a64be48772e15fbb9d5ba8c0cc5772ad" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] @@ -8605,6 +8669,17 @@ dependencies = [ "unicase", ] +[[package]] +name = "pulldown-cmark" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666f0f59e259aea2d72e6012290c09877a780935cc3c18b1ceded41f3890d59c" +dependencies = [ + "bitflags 2.6.0", + "memchr", + "unicase", +] + [[package]] name = "pulldown-cmark-escape" version = "0.10.1" @@ -9036,6 +9111,7 @@ dependencies = [ "http_client", "language", "log", + "lsp", "node_runtime", "project", "remote", @@ -9046,6 +9122,7 @@ dependencies = [ "shellexpand 2.1.2", "smol", "toml 0.8.19", + "util", "worktree", ] @@ -9125,7 +9202,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -9183,12 +9260,27 @@ dependencies = [ "gpui", "language", "linkify", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "theme", "ui", "util", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + [[package]] name = "ring" version = "0.17.8" @@ -9199,8 +9291,8 @@ dependencies = [ "cfg-if", "getrandom 0.2.15", "libc", - "spin", - "untrusted", + "spin 0.9.8", + "untrusted 0.9.0", "windows-sys 0.52.0", ] @@ -9256,12 +9348,13 @@ dependencies = [ [[package]] name = "rodio" -version = "0.17.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb" dependencies = [ "cpal", "hound", + "thiserror", ] [[package]] @@ -9355,7 +9448,7 @@ dependencies = [ "futures 0.3.30", "glob", "rand 0.8.5", - "ring", + "ring 0.17.8", "serde", "serde_json", "shellexpand 3.1.0", @@ -9476,6 +9569,18 @@ dependencies = [ "rustix 0.38.35", ] +[[package]] +name = "rustls" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +dependencies = [ + "log", + "ring 0.16.20", + "sct", + "webpki", +] + [[package]] name = "rustls" version = "0.21.12" @@ -9483,7 +9588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -9495,7 +9600,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "schannel", "security-framework", ] @@ -9509,14 +9627,30 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -9630,8 +9764,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -9814,17 +9948,22 @@ name = "semantic_index" version = "0.1.0" dependencies = [ "anyhow", + "arrayvec", + "blake3", "client", "clock", "collections", "env_logger", + "feature_flags", "fs", "futures 0.3.30", "futures-batch", "gpui", "heed", "http_client", + "isahc_http_client", "language", + "language_model", "languages", "log", "open_ai", @@ -9928,9 +10067,9 @@ dependencies = [ [[package]] name = "serde_json_lenient" -version = "0.1.8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc61c66b53a4035fcce237ef38043f4b2f0ebf918fd0e69541a5166104065581" +checksum = "a5d0bae483150302560d7cb52e7932f39b69a6fbdd099e48d33ef060a8c9c078" dependencies = [ "indexmap 2.4.0", "itoa", @@ -10254,7 +10393,7 @@ dependencies = [ name = "slash_commands_example" version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] @@ -10382,6 +10521,12 @@ dependencies = [ "smallvec", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -10504,8 +10649,8 @@ dependencies = [ "paste", "percent-encoding", "rust_decimal", - "rustls", - "rustls-pemfile", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -10518,7 +10663,7 @@ dependencies = [ "tracing", "url", "uuid", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -11030,17 +11175,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", - "windows 0.52.0", + "windows 0.54.0", ] [[package]] @@ -11651,7 +11795,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", "tokio", ] @@ -11942,110 +12086,112 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.22.6" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f4a57817d58a2f134fe863674acad6bbf007228#7f4a57817d58a2f134fe863674acad6bbf007228" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff" dependencies = [ "cc", "regex", + "regex-syntax 0.8.4", "tree-sitter-language", "wasmtime-c-api-impl", ] [[package]] name = "tree-sitter-bash" -version = "0.21.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5244703ad2e08a616d859a0557d7aa290adcd5e0990188a692e628ffe9dce40" +checksum = "3aa5e1c6bd02c0053f3f68edcf5d8866b38a8640584279e30fca88149ce14dda" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-c" -version = "0.21.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f956d5351d62652864a4ff3ae861747e7a1940dc96c9998ae400ac0d3ce30427" +checksum = "e795ad541f7ae6a80d22975296340a75a12a29afd3a7089f4368021613728e17" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-cpp" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d509a22a992790d38f2c291961ff8a1ff016c437c7ec6befc9220b8eec8918c" +checksum = "c0a588a816017469b69f2e3544742e34a5a59dddfb4b9457b657a6052e2ea39c" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-css" -version = "0.21.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e08e324b1cf60fd3291774b49724c66de2ce8fcf4d358d0b4b82e37b41b1c9b" +checksum = "8d0018d6b1692a806f9cddaa1e5616951fd58840c39a0b21401b55ab3df12292" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-elixir" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70" +checksum = "6174acad8a059851f6f768d7893f4b25eedc80eb6643283d545dd71bbb38222a" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-embedded-template" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33817ade928c73a32d4f904a602321e09de9fc24b71d106f3b4b3f8ab30dcc38" +checksum = "9644d7586ebe850c84037ee2f4804dda4a9348eef053be6b1e0d7712342a2495" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-go" -version = "0.21.2" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d702a98d3c7e70e466456e58ff2b1ac550bf1e29b97e5770676d2fdabec00d" +checksum = "caf57626e4c9b6d6efaf8a8d5ee1241c5f178ae7bfdf693713ae6a774f01424e" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-gomod" version = "1.0.2" -source = "git+https://github.com/camdencheek/tree-sitter-go-mod?rev=1f55029bacd0a6a11f6eb894c4312d429dcf735c#1f55029bacd0a6a11f6eb894c4312d429dcf735c" +source = "git+https://github.com/zed-industries/tree-sitter-go-mod?rev=a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca#a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-gowork" version = "0.0.1" -source = "git+https://github.com/d1y/tree-sitter-go-work?rev=dcbabff454703c3a4bc98a23cf8778d4be46fd22#dcbabff454703c3a4bc98a23cf8778d4be46fd22" +source = "git+https://github.com/zed-industries/tree-sitter-go-work?rev=acb0617bf7f4fda02c6217676cc64acb89536dc7#acb0617bf7f4fda02c6217676cc64acb89536dc7" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-heex" version = "0.0.1" -source = "git+https://github.com/phoenixframework/tree-sitter-heex?rev=6dd0303acf7138dd2b9b432a229e16539581c701#6dd0303acf7138dd2b9b432a229e16539581c701" +source = "git+https://github.com/zed-industries/tree-sitter-heex?rev=1dd45142fbb05562e35b2040c6129c9bca346592#1dd45142fbb05562e35b2040c6129c9bca346592" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] @@ -12060,96 +12206,96 @@ dependencies = [ [[package]] name = "tree-sitter-jsdoc" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d07920101ff12a59574890318a37fa7e18d9c06d9aa4be334aa24adbb480f18" +checksum = "f8c4049eb0ad690e34e5f63640f75ce12a2ff8ba18344d0a13926805b139c0c8" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-json" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b737dcb73c35d74b7d64a5f3dde158113c86a012bf3cee2bfdf2150d23b05db" +checksum = "86a5d6b3ea17e06e7a34aabeadd68f5866c0d0f9359155d432095f8b751865e4" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-language" version = "0.1.0" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f4a57817d58a2f134fe863674acad6bbf007228#7f4a57817d58a2f134fe863674acad6bbf007228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57" [[package]] name = "tree-sitter-md" -version = "0.2.3" -source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=e3855e37f8f2c71aa7513c18a9c95fb7461b1b10#e3855e37f8f2c71aa7513c18a9c95fb7461b1b10" +version = "0.3.2" +source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=4cfa6aad6b75052a5077c80fd934757d9267d81b#4cfa6aad6b75052a5077c80fd934757d9267d81b" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-python" -version = "0.21.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" +checksum = "65661b1a3e24139e2e54207e47d910ab07e28790d78efc7d5dc3a11ce2a110eb" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-regex" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff1286fe9651b2797484839ffa37aa76c8618d4ccb6836d7e31765dfd60c0d5" +checksum = "0b9a7087b1cf769c96b7e74414947df067fb6135f04d176fd23be08b9396cc0e" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-ruby" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0031f687c0772f2dad7b77104c43428611099a1804c81244ada21560f41f0b1" +checksum = "6ec5ee842e27791e0adffa0b2a177614de51d2a26e5c7e84d014ed7f097e5ed0" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-rust" -version = "0.21.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-typescript" -version = "0.21.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb35d98a688378e56c18c9c159824fd16f730ccbea19aacf4f206e5d5438ed9" +checksum = "aecf1585ae2a9dddc2b1d4c0e2140b2ec9876e2a25fd79de47fcf7dae0384685" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-yaml" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad27ec46ad343d8b514f64dd3fdffb478c592ece561b6c935d90ef55589c6b6" +source = "git+https://github.com/zed-industries/tree-sitter-yaml?rev=baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a#baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] @@ -12176,7 +12322,6 @@ dependencies = [ "http 0.2.12", "httparse", "log", - "native-tls", "rand 0.8.5", "sha1", "thiserror", @@ -12246,6 +12391,7 @@ dependencies = [ "story", "strum 0.25.0", "theme", + "ui_macros", "windows 0.58.0", ] @@ -12260,6 +12406,16 @@ dependencies = [ "ui", ] +[[package]] +name = "ui_macros" +version = "0.1.0" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "unicase" version = "2.7.0" @@ -12350,6 +12506,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "untrusted" version = "0.9.0" @@ -12772,9 +12934,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d996306fb3aeaee0d9157adbe2f670df0236caf19f6728b221e92d0f27b3fe17" +checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" dependencies = [ "leb128", ] @@ -12808,35 +12970,38 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c" +checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e" dependencies = [ "ahash 0.8.11", "bitflags 2.6.0", "hashbrown 0.14.5", "indexmap 2.4.0", "semver", + "serde", ] [[package]] name = "wasmprinter" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115" +checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" dependencies = [ "anyhow", - "wasmparser 0.207.0", + "termcolor", + "wasmparser 0.215.0", ] [[package]] name = "wasmtime" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92a1370c66a0022e6d92dcc277e2c84f5dece19569670b8ce7db8162560d8b6" +checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" dependencies = [ "anyhow", "async-trait", + "bitflags 2.6.0", "bumpalo", "cc", "cfg-if", @@ -12848,8 +13013,7 @@ dependencies = [ "log", "mach2", "memfd", - "memoffset", - "object 0.33.0", + "object", "once_cell", "paste", "postcard", @@ -12861,7 +13025,7 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-asm-macros", "wasmtime-component-macro", "wasmtime-component-util", @@ -12877,18 +13041,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dee8679c974a7f258c03d60d3c747c426ed219945b6d08cbc77fd2eab15b2d1" +checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-c-api-impl" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76af8b62c8d2814b7d5975c5dc140122e4c086150db6c15d25a4b76f11c929dd" +checksum = "765e302e7d9125e614aaeec3ad6b6083605393004eca00214106a4ff6b47fc58" dependencies = [ "anyhow", "log", @@ -12900,9 +13064,9 @@ dependencies = [ [[package]] name = "wasmtime-c-api-macros" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d74b92f917c9ced9c6262a00e9cb982ebac183e6900b4d44e2480f936b9495eb" +checksum = "2d09d02eaa84aa2de5babee7b0296557ad6e4903bb10aa8d135e393e753a43d6" dependencies = [ "proc-macro2", "quote", @@ -12910,9 +13074,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cae30035f1cf97dcc6657c979cf39f99ce6be93583675eddf4aeaa5548509c" +checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" dependencies = [ "anyhow", "proc-macro2", @@ -12920,20 +13084,20 @@ dependencies = [ "syn 2.0.76", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.207.0", + "wit-parser 0.215.0", ] [[package]] name = "wasmtime-component-util" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ae611f08cea620c67330925be28a96115bf01f8f393a6cbdf4856a86087134" +checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" [[package]] name = "wasmtime-cranelift" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2909406a6007e28be964067167890bca4574bd48a9ff18f1fa9f4856d89ea40" +checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" dependencies = [ "anyhow", "cfg-if", @@ -12943,36 +13107,38 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.28.1", + "gimli", "log", - "object 0.33.0", + "object", "target-lexicon", "thiserror", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e227f9ed2f5421473723d6c0352b5986e6e6044fde5410a274a394d726108f" +checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" dependencies = [ "anyhow", "cpp_demangle", + "cranelift-bitset", "cranelift-entity", - "gimli 0.28.1", + "gimli", "indexmap 2.4.0", "log", - "object 0.33.0", + "object", "postcard", "rustc-demangle", + "semver", "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.207.0", - "wasmparser 0.207.0", + "wasm-encoder 0.215.0", + "wasmparser 0.215.0", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -12980,9 +13146,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42edb392586d07038c1638e854382db916b6ca7845a2e6a7f8dc49e08907acdd" +checksum = "0f39043d13c7b58db69dc9a0feb191a961e75a9ec2402aebf42de183c022bb8a" dependencies = [ "anyhow", "cc", @@ -12995,9 +13161,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe088f9b56bb353adaf837bf7e10f1c2e1676719dd5be4cac8e37f2ba1ee5bc" +checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" dependencies = [ "anyhow", "cfg-if", @@ -13007,28 +13173,29 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff75cafffe47b04b036385ce3710f209153525b0ed19d57b0cf44a22d446460" +checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" [[package]] name = "wasmtime-types" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2fa462bfea3220711c84e2b549f147e4df89eeb49b8a2a3d89148f6cc4a8b1" +checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" dependencies = [ + "anyhow", "cranelift-entity", "serde", "serde_derive", "smallvec", - "wasmparser 0.207.0", + "wasmparser 0.215.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cedc5bfef3db2a85522ee38564b47ef3b7fc7c92e94cacbce99808e63cdd47" +checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" dependencies = [ "proc-macro2", "quote", @@ -13037,9 +13204,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbbe94245904d4c96c7c5f7b55bad896cc27908644efd9442063c0748b631fc" +checksum = "545ae8298ffce025604f7480f9c7d6948c985bef7ce9aee249ef79307813e83c" dependencies = [ "anyhow", "async-trait", @@ -13068,16 +13235,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b27054fed6be4f3800aba5766f7ef435d4220ce290788f021a08d4fa573108" +checksum = "2a25199625effa4c13dd790d64bd56884b014c69829431bfe43991c740bd5bc1" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", - "object 0.33.0", + "gimli", + "object", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -13085,14 +13252,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936a52ce69c28de2aa3b5fb4f2dbbb2966df304f04cccb7aca4ba56d915fda0" +checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" dependencies = [ "anyhow", "heck 0.4.1", "indexmap 2.4.0", - "wit-parser 0.207.0", + "wit-parser 0.215.0", ] [[package]] @@ -13199,6 +13366,25 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + [[package]] name = "webpki-roots" version = "0.25.4" @@ -13234,6 +13420,7 @@ dependencies = [ "util", "vim", "workspace", + "zed_actions", ] [[package]] @@ -13272,9 +13459,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89ea6f74ece6d1cfbd089783006b8eb69a0219ca83cad22068f0d9fa9df3f91" +checksum = "cc850ca3c02c5835934d23f28cec4c5a3fb66fe0b4ecd968bbb35609dda5ddc0" dependencies = [ "anyhow", "async-trait", @@ -13287,9 +13474,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36beda94813296ecaf0d91b7ada9da073fd41865ba339bdd3b7764e2e785b8e9" +checksum = "634b8804a67200bcb43ea8af5f7c53e862439a086b68b16fd333454bc74d5aab" dependencies = [ "anyhow", "heck 0.4.1", @@ -13302,9 +13489,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47d2b4442ce93106dba5d1a9c59d5f85b5732878bb3d0598d3c93c0d01b16b" +checksum = "474b7cbdb942c74031e619d66c600bba7f73867c5800fc2c2306cf307649be2f" dependencies = [ "proc-macro2", "quote", @@ -13345,17 +13532,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.19.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc69899ccb2da7daa4df31426dcfd284b104d1a85e1dae35806df0c46187f87" +checksum = "073efe897d9ead7fc609874f94580afc831114af5149b6a90ee0a3a39b497fe0" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-cranelift", "wasmtime-environ", ] @@ -13369,16 +13556,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.54.0" @@ -13862,9 +14039,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c83dab33a9618d86cfe3563cc864deffd08c17efc5db31a3b7cd1edeffe6e1" +checksum = "935a97eaffd57c3b413aa510f8f0b550a4a9fe7d59e79cd8b89a83dcb860321f" dependencies = [ "anyhow", "id-arena", @@ -13875,7 +14052,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.207.0", + "wasmparser 0.215.0", ] [[package]] @@ -14034,7 +14211,7 @@ dependencies = [ [[package]] name = "xim" version = "0.4.0" -source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" +source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd" dependencies = [ "ahash 0.8.11", "hashbrown 0.14.5", @@ -14047,7 +14224,7 @@ dependencies = [ [[package]] name = "xim-ctext" version = "0.3.0" -source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" +source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd" dependencies = [ "encoding_rs", ] @@ -14055,7 +14232,7 @@ dependencies = [ [[package]] name = "xim-parser" version = "0.2.1" -source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" +source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd" dependencies = [ "bitflags 2.6.0", ] @@ -14155,7 +14332,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.29.0", + "nix", "ordered-stream", "rand 0.8.5", "serde", @@ -14197,7 +14374,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.152.4" +version = "0.154.1" dependencies = [ "activity_indicator", "anyhow", @@ -14242,6 +14419,7 @@ dependencies = [ "inline_completion_button", "install_cli", "isahc", + "isahc_http_client", "journal", "language", "language_model", @@ -14253,7 +14431,7 @@ dependencies = [ "markdown_preview", "menu", "mimalloc", - "nix 0.28.0", + "nix", "node_runtime", "notifications", "outline", @@ -14317,72 +14495,63 @@ name = "zed_astro" version = "0.1.0" dependencies = [ "serde", - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_clojure" version = "0.0.3" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_csharp" version = "0.0.2" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_dart" -version = "0.0.3" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_deno" version = "0.0.2" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_elixir" version = "0.0.9" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_elm" version = "0.0.1" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_emmet" version = "0.0.3" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_erlang" -version = "0.0.1" -dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "zed_extension_api" version = "0.1.0" dependencies = [ - "serde", - "serde_json", - "wit-bindgen", + "zed_extension_api 0.1.0", ] [[package]] @@ -14396,82 +14565,91 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "zed_extension_api" +version = "0.2.0" +dependencies = [ + "serde", + "serde_json", + "wit-bindgen", +] + [[package]] name = "zed_gleam" version = "0.2.0" dependencies = [ "html_to_markdown 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_glsl" version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_haskell" version = "0.1.1" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_html" version = "0.1.2" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_lua" version = "0.0.3" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_ocaml" -version = "0.0.2" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_php" -version = "0.1.3" +version = "0.2.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_prisma" version = "0.0.3" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_purescript" version = "0.0.1" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_ruby" version = "0.2.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_ruff" -version = "0.0.2" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] @@ -14479,42 +14657,42 @@ name = "zed_snippets" version = "0.0.5" dependencies = [ "serde_json", - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_svelte" -version = "0.0.3" +version = "0.2.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_terraform" -version = "0.0.4" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_test_extension" version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.2.0", ] [[package]] name = "zed_toml" version = "0.1.1" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_uiua" version = "0.0.1" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] @@ -14522,14 +14700,14 @@ name = "zed_vue" version = "0.1.0" dependencies = [ "serde", - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_zig" version = "0.3.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix index d9e240d6c1..fcb283f472 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, clang, + cmake, copyDesktopItems, curl, perl, @@ -35,10 +36,10 @@ withGLES ? false, }: -assert withGLES -> stdenv.isLinux; +assert withGLES -> stdenv.hostPlatform.isLinux; let - executableName = "zed"; + executableName = "zeditor"; # Based on vscode.fhs # Zed allows for users to download and use extensions # which often include the usage of pre-built binaries. @@ -84,14 +85,14 @@ let }; in rustPlatform.buildRustPackage rec { - pname = "zed"; - version = "0.152.4"; + pname = "zed-editor"; + version = "0.154.1"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-nmnhJQ8DDKuy0DBfQCEj9FsVXre/gTkIsr5UjiiWasU="; + hash = "sha256-ZYaWkmLWhmGM7muU70JqD5HjgsI+oaouilqjUYUQcg8="; fetchSubmodules = true; }; @@ -111,18 +112,20 @@ rustPlatform.buildRustPackage rec { "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo="; "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js="; "nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo="; - "tree-sitter-0.22.6" = "sha256-P9pQcofDCIhOYWA1OC8TzB5UgWpD5GlDzX2DOS8SsH0="; - "tree-sitter-gomod-1.0.2" = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE="; - "tree-sitter-gowork-0.0.1" = "sha256-803ujH5qwejQ2vQDDpma4JDC9a+vFX8ZQmr+77VyL2M="; - "tree-sitter-heex-0.0.1" = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec="; - "tree-sitter-md-0.2.3" = "sha256-Fa73P1h5GvKV3SxXr0KzHuNp4xa5wxUzI8ecXbGdrYE="; - "xim-0.4.0" = "sha256-vxu3tjkzGeoRUj7vyP0vDGI7fweX8Drgy9hwOUOEQIA="; + "protols-tree-sitter-proto-0.2.0" = "sha256-0pvHuwqtkHYLevQnaEFmfyDtILD7Wy0in2KSKFR2mKw="; + "tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0="; + "tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE="; + "tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw="; + "tree-sitter-md-0.3.2" = "sha256-sFcQDabSay9qxzVNAQkHEZB1b9j171dDoYQqaL1iVhE="; + "tree-sitter-yaml-0.6.1" = "sha256-95u/bq74SiUHW8lVp3RpanmYS/lyVPW0Inn8gR7N3IQ="; + "xim-0.4.0" = "sha256-BXyaIBoqMNbzaSJqMadmofdjtlEVSoU6iogF66YP6a4="; "xkbcommon-0.7.0" = "sha256-2RjZWiAaz8apYTrZ82qqH4Gv20WyCtPT+ldOzm0GWMo="; }; }; nativeBuildInputs = [ clang + cmake copyDesktopItems curl perl @@ -130,7 +133,9 @@ rustPlatform.buildRustPackage rec { protobuf rustPlatform.bindgenHook cargo-about - ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]; + + dontUseCmakeConfigure = true; buildInputs = [ @@ -143,13 +148,13 @@ rustPlatform.buildRustPackage rec { zlib zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libxkbcommon wayland xorg.libxcb ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -196,7 +201,7 @@ rustPlatform.buildRustPackage rec { bash script/generate-licenses ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --add-rpath ${gpu-lib}/lib $out/libexec/* patchelf --add-rpath ${wayland}/lib $out/libexec/* ''; @@ -218,7 +223,7 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/bin $out/libexec cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor - cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zed + cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png @@ -227,7 +232,7 @@ rustPlatform.buildRustPackage rec { # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name) ( export DO_STARTUP_NOTIFY="true" - export APP_CLI="zed" + export APP_CLI="zeditor" export APP_ICON="zed" export APP_NAME="Zed" export APP_ARGS="%U" @@ -262,9 +267,9 @@ rustPlatform.buildRustPackage rec { GaetanLepage niklaskorz ]; - mainProgram = "zed"; + mainProgram = "zeditor"; platforms = lib.platforms.all; # Currently broken on darwin: https://github.com/NixOS/nixpkgs/pull/303233#issuecomment-2048650618 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix index eb09f58e88..728ec4ee3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { lzo openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.CoreServices @@ -88,7 +88,7 @@ in stdenv.mkDerivation { # Ensure Rust compiles for the right target env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTarget; - preBuild = if stdenv.isDarwin then '' + preBuild = if stdenv.hostPlatform.isDarwin then '' makeFlagsArray+=("ARCH_FLAGS=") # disable multi-arch build if ! grep -q MACOS_VERSION_MIN=10.13 make-mac.mk; then echo "You may need to update MACOSX_DEPLOYMENT_TARGET to match the value in make-mac.mk" diff --git a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix index 5ffd0a2223..d73d34b8d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix +++ b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix @@ -5,8 +5,6 @@ { mkYarnPackage , fetchYarnDeps -, lib - , grpc-gateway , protoc-gen-grpc-web , protoc-gen-js diff --git a/third_party/nixpkgs/pkgs/by-name/zo/zoekt/package.nix b/third_party/nixpkgs/pkgs/by-name/zo/zoekt/package.nix index afc6e099c0..27f6d12f09 100644 --- a/third_party/nixpkgs/pkgs/by-name/zo/zoekt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zo/zoekt/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "zoekt"; - version = "0-unstable-2024-09-05"; + version = "3.7.2-2-unstable-2024-09-19"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "35dda3e212b7d7fb0df43dcbd88eb7a7b49ad9d8"; - hash = "sha256-YdInCAq7h7iC1sfMekLgxqu3plUHr5Ku6FxyPKluQzw="; + rev = "5379bc90f3f96b371b219beeb64340bcfd7f7149"; + hash = "sha256-1i95C11unZV7eUDxsRKRswwsxELH+oHXUbmY74c5mVs="; }; - vendorHash = "sha256-GPeMRL5zWVjJVYpFPnB211Gfm/IaqisP1s6RNaLvN6M="; + vendorHash = "sha256-+ayixWCD2e+7Nh9WJmDAloSzp63v9hQYQd8UMuo8qxQ="; nativeCheckInputs = [ git diff --git a/third_party/nixpkgs/pkgs/by-name/zo/zola/package.nix b/third_party/nixpkgs/pkgs/by-name/zo/zola/package.nix index e6fc773a21..5f658eed39 100644 --- a/third_party/nixpkgs/pkgs/by-name/zo/zola/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zo/zola/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); diff --git a/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix b/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix index 230825c935..b4dbcf3d85 100644 --- a/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zo/zoom-us/package.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.1.11.39163"; - versions.x86_64-darwin = "6.1.11.39163"; - versions.x86_64-linux = "6.1.11.1545"; + versions.aarch64-darwin = "6.2.0.40111"; + versions.x86_64-darwin = "6.2.0.40111"; + versions.x86_64-linux = "6.2.0.1855"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-xWeCiDhYPfTAJttXG5bCwhLu+bmHlcFF/s3+EACeph4="; + hash = "sha256-/oi10pi9Xykmfo0UA1cDPzlB4xUQxAr8rkEoUpp1fQM="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-AB+QXx6r3raymVU7rEJ9dO4CqJI9tnRF3l61vuGnqpI="; + hash = "sha256-CZm0lrBYGHkPpdLu0sE/V+ADwglk/btSNvdzPRaeysI="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-wkG/fYbn3EdbVJwZQI8EcRPmHFX+4zggmfM4sHUjD8I="; + hash = "sha256-Ej8BRySQso62VE7e4XjXFGsvlB9cEVceha/WVhTBG4E="; }; }; @@ -119,8 +119,8 @@ stdenv.mkDerivation rec { src = srcs.${system} or throwSystem; - dontUnpack = stdenv.isLinux; - unpackPhase = lib.optionalString stdenv.isDarwin '' + dontUnpack = stdenv.hostPlatform.isLinux; + unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' xar -xf $src zcat < zoomus.pkg/Payload | cpio -i ''; @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar cpio ]; @@ -151,9 +151,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Desktop File substituteInPlace $out/share/applications/Zoom.desktop \ --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" diff --git a/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix index e59b17a67e..4a80ec499e 100644 --- a/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zs/zsh-wd/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "wd"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mfaerevaag"; repo = "wd"; rev = "v${version}"; - hash = "sha256-rHHCnHa0/t2ij+6rExgvNt2EFBnkgs6l7oE6zL+xc58="; + hash = "sha256-8gL0+SZwVCQRokcYwSljDHtSusYY79/T9hqJGgAK1EU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/zu/zutty/package.nix b/third_party/nixpkgs/pkgs/by-name/zu/zutty/package.nix new file mode 100644 index 0000000000..4c493483df --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/zu/zutty/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchgit, + pkg-config, + freetype, + wafHook, + python3, + libXmu, + glew, + ucs-fonts, + nixosTests, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "zutty"; + version = "0.16-unstable-2024-08-18"; + + src = fetchgit { + url = "https://git.hq.sig7.se/zutty.git"; + rev = "04b2ca3b3aaa070c41583247f8112c31b6003886"; # 20240818 + hash = "sha256-izUbn2B3RqIIOW9tuL7DFLqJdektCftxnpQssJMYxC8="; + }; + + postPatch = + let + fontpaths = [ + "/run/current-system/sw/share/X11/fonts" # available if fonts.fontDir.enable = true + "${ucs-fonts}/share/fonts" + ]; + in + '' + substituteInPlace src/options.h \ + --replace-fail /usr/share/fonts ${builtins.concatStringsSep ":" fontpaths} + ''; + + nativeBuildInputs = [ + pkg-config + wafHook + python3 + ]; + + buildInputs = [ + freetype + libXmu + glew + ]; + + passthru = { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + default = nixosTests.terminal-emulators.zutty; + }; + }; + + meta = { + homepage = "https://tomscii.sig7.se/zutty/"; + description = "X terminal emulator rendering through OpenGL ES Compute Shaders"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.rolfschr ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix b/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix index bd09d6efae..2941a0030c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "i.ming"; - version = "8.00"; + version = "8.10"; src = fetchurl { url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - hash = "sha256-6345629OdKz6lTnD3Vjtp6DzsYy0ojaL0naXGrtdZvw="; + hash = "sha256-y6E7dbBQ1nG2EdAGMUcmLkIeFDWa1FMJSLBw9WER8PM="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 89d33b59dc..7f7979c5be 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -55,21 +55,21 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "31.6.0"; + version = "31.6.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-5FqfJCquF26Mbpm2pN9P1gg4B2nASZz9utFJWBgScLY="; + hash = "sha256-pulOJ3mJqfonoQPmk6VtdWLhFVeoBjANVi0S9fN9N7c="; }; - npmDepsHash = "sha256-/qx+pnXbAgdkUCHH2SQSgI0omjrL3PLtni3iLbswd3c="; + npmDepsHash = "sha256-3GEWJLiWDZcjUU1yms0h0mm4eH4Ov20WVSHZN1OB5bA="; nativeBuildInputs = [ remarshal ttfautohint-nox - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # libtool cctools ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index a608a53e42..1a44790819 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.056"; + version = "0.057"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-RaohSyTWHbhJXW6pRaLX20UAMA0uIJ4LWtq2MSQmnGU="; + hash = "sha256-SSTv/cyZ+7nK0VvQPqQ+T5JXDXOZgLmv++cjHLlObb8="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/uni-vga/default.nix b/third_party/nixpkgs/pkgs/data/fonts/uni-vga/default.nix index 1239b12388..5be5a817b8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/uni-vga/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/uni-vga/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime xorg.fonttosfnt xorg.mkfontscale - ] ++ lib.optionals stdenv.isLinux [ perl kbd ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ perl kbd ]; postPatch = "patchShebangs ."; @@ -24,7 +24,7 @@ stdenv.mkDerivation { # convert bdf font to otb faketime -f "1970-01-01 00:00:01" \ fonttosfnt -v -o u_vga16.otb u_vga16.bdf - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # convert font to compressed psf ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \ | psfaddtable - UniCyrX.sfm - \ @@ -40,7 +40,7 @@ stdenv.mkDerivation { install -m 644 -D *.bdf -t "$bdf/share/fonts" mkfontdir "$bdf/share/fonts" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # install psf (for linux virtual terminal) install -m 644 -D *.psf.gz -t "$out/share/consolefonts" ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix index 811b2b60b7..9eab69f1d3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.05"; + version = "16.0.01"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-e2K1CsuxhmidwwxEbOQ2e4fXlInpkHuDJV+fvg3PueE="; + hash = "sha256-6jmg5hTnSGSQI5xXWeGgzYb9SeM1xLCNL9E+MTFH8CI="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-zpc9Z4XXvma/tXRYOvAAQIpjyYS+1XPiaLZF4xYPTbw="; + hash = "sha256-51YEW6CJPuLoNpsnr8AkNr7ZApnbThZyznZuBHDNmCU="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index fbd1d4b536..0c2ac5e160 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.1.05"; + version = "16.0.01"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-A/Z/+IMNUH/3Ir3ewf/U2xqkkpZDUDKO+dlnRYt+7U0="; + hash = "sha256-5EUz6F3GlAMCOnA2xk0CplRUaLLACmewH/PiRtCRzsE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix index 44b92c465b..22289b73c4 100644 --- a/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix index 0e0871a000..d76a0eda4c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ jordanisaacs ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; # build timeout + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # build timeout }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index 91c406cad1..f0eb0492f3 100644 --- a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20240304"; + version = "20240920"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-vXG9aa6Zdv5R7q62tpFaUIw4MVnT/jWwZ+jw1S9K7MM="; + sha256 = "sha256-u+buByJ7w1VHs4fGWNRy2EDFYheztbzpFga3tS6PnKk="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix b/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix index 4bfe201beb..53988a728d 100644 --- a/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; - buildInputs = lib.optional (!stdenv.isLinux) libiconv; + buildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index 9e034d6824..e5507075bc 100644 --- a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -5,7 +5,6 @@ , ninja , pkg-config , gettext -, itstool , libxml2 , glib , shared-mime-info diff --git a/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix b/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix index fd73f1cf4d..65043d8a24 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DpJLX9PJX1Q8dDOx7YOXQzgNECsKp5uGiCVTX6iSlbI="; + sha256 = "sha256-FwODgA3BK5O1WoNNbn27H18Epuqwcsnoc3hZUB59+Wg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix index 7a7f151c38..90069dc48c 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ] ++ lib.optionals (!useQt6) [ qt5.qtx11extras diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 9af8a60088..096a353224 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -4,48 +4,43 @@ fetchFromGitHub, cmake, pkg-config, - qttools, - wrapQtAppsHook, dtkwidget, qt5integration, qt5platform-plugins, - qtbase, - qtsvg, dde-qt-dbus-factory, - kcodecs, - syntax-highlighting, libchardet, libuchardet, libiconv, + libsForQt5, }: stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.5.0"; + version = "6.5.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8="; + hash = "sha256-Z3fsnjo4Pcu1e8lKvWdWBhpoOFFy0dSrI2HehRYKJ0k="; }; nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ dtkwidget qt5integration qt5platform-plugins - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg dde-qt-dbus-factory - kcodecs - syntax-highlighting + libsForQt5.kcodecs + libsForQt5.syntax-highlighting libchardet libuchardet libiconv diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 31ce23124c..fa5c20c8f5 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -8,15 +8,10 @@ qttools, wrapQtAppsHook, qt5platform-plugins, - qtbase, dtkwidget, dtkdeclarative, deepin-ocr-plugin-manager, - gio-qt, - udisks2-qt5, - image-editor, libraw, - libexif, freeimage, }: diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix index 41555483cc..16dc198310 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -18,7 +18,6 @@ libvlc, taglib, SDL2, - qtbase, gst_all_1, }: diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix index 2bae6bf3e7..f2ad2569b2 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -17,7 +17,6 @@ libspectre, openjpeg, djvulibre, - qtbase, gtest, }: diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-appearance/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-appearance/default.nix index 89315e2bd8..5a2648d690 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-appearance/default.nix @@ -5,7 +5,6 @@ cmake, pkg-config, wrapQtAppsHook, - qtbase, dtkgui, gsettings-qt, gtk3, diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix index a3a3b52c23..6600df5b79 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -4,35 +4,28 @@ fetchFromGitHub, cmake, pkg-config, - qttools, doxygen, - wrapQtAppsHook, - wrapGAppsHook3, wayland-scanner, + wayland, dtkwidget, qt5integration, qt5platform-plugins, + libsForQt5, deepin-pw-check, - qtbase, - qtx11extras, - qtmultimedia, - polkit-qt, libxcrypt, - librsvg, gtest, runtimeShell, - dbus, }: stdenv.mkDerivation rec { pname = "dde-control-center"; - version = "6.0.59"; + version = "6.0.65"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-OniY/B/9319AYYFFPnsUMNrnc0yVGG3rfCLPjgNFyag="; + hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0="; }; postPatch = '' @@ -43,24 +36,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools + libsForQt5.qttools doxygen - wrapQtAppsHook - wrapGAppsHook3 + libsForQt5.wrapQtAppsHook wayland-scanner ]; - dontWrapGApps = true; buildInputs = [ + wayland dtkwidget qt5platform-plugins + qt5integration deepin-pw-check - qtbase - qtx11extras - qtmultimedia - polkit-qt + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.polkit-qt libxcrypt - librsvg gtest ]; @@ -79,17 +70,7 @@ stdenv.mkDerivation rec { preConfigure = '' # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} - ''; - - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}" - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; outputs = [ @@ -97,12 +78,12 @@ stdenv.mkDerivation rec { "dev" ]; - meta = with lib; { + meta = { description = "Control panel of Deepin Desktop Environment"; mainProgram = "dde-control-center"; homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 11f2d4d403..92109c2d97 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -18,7 +18,6 @@ pcre, lucenepp, boost, - dbus, }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index 0581339c25..cb6b0acded 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -2,7 +2,6 @@ lib, runCommand, glib, - gtk3, dde-grand-search, startdde, dde-session-shell, diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 44d46a0c9f..1a7b2cb510 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.8.4"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-MPOzKAgwhJa7pMO6EZ6vYyYgZSD/SbU/L0L1dkN9/po="; + hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM="; }; nativeBuildInputs = [ @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - meta = with lib; { + meta = { description = "'launcher' or 'start menu' component for DDE"; mainProgram = "dde-launchpad"; homepage = "https://github.com/linuxdeepin/dde-launchpad"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix index 422b239edf..9d5272df72 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -3,44 +3,40 @@ lib, fetchFromGitHub, cmake, - qttools, pkg-config, - wrapQtAppsHook, - qtbase, - qtsvg, dtkwidget, dde-control-center, dde-session-shell, - networkmanager-qt, + libsForQt5, glib, gtest, }: stdenv.mkDerivation rec { pname = "dde-network-core"; - version = "2.0.32"; + version = "2.0.34"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-dXLvBCNitlV07dH/rPatsbP6DFf8SZQ7hcDUYtqt2FA="; + hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI="; }; nativeBuildInputs = [ cmake - qttools + libsForQt5.qttools pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg dtkwidget dde-control-center dde-session-shell - networkmanager-qt + libsForQt5.networkmanager-qt glib gtest ]; @@ -49,11 +45,11 @@ stdenv.mkDerivation rec { strictDeps = true; - meta = with lib; { + meta = { description = "DDE network library framework"; homepage = "https://github.com/linuxdeepin/dde-network-core"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix index 4f4a3f0f71..a27406db98 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, extra-cmake-modules, pkg-config, @@ -23,22 +22,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-shell"; - version = "0.0.43"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-shell"; rev = finalAttrs.version; - hash = "sha256-wSk1gEJbTxKUPZ6DiTeVw2qyX+CwANA37ZP0tXnz0J0="; + hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo="; }; patches = [ ./fix-path-for-nixos.diff - (fetchpatch { - name = "fix-libdock-plugin_so-contains-a-forbidden-reference.diff"; - url = "https://github.com/linuxdeepin/dde-shell/commit/bf9a0472bc44748a3c389d796d144dad6b13617b.patch"; - hash = "sha256-cP5zMsfPyi4FIR1OIbVSnn+Z+KqRuIK7a214VjVb/7w="; - }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-tray-loader/default.nix index c1e2fde90e..06d76e0398 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -18,20 +18,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-tray-loader"; - version = "0.0.11"; + version = "1.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-tray-loader"; rev = finalAttrs.version; - hash = "sha256-kz8+essf6O3ckeY5/5a/Z6539qNcfOnGbGTqSo5swhc="; + hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE="; }; patches = [ (fetchpatch { - name = "set-version-for-dde-dock_pc.patch"; - url = "https://github.com/linuxdeepin/dde-tray-loader/commit/0f9b90a9aa8096a92c21c8f01d29b4785aaf04e5.patch"; - hash = "sha256-A6k8XjyIDbA+XuUxYWd5yxFJ8yOWMOtUH5Vg10o//YM="; + name = "remove-useless-function.patch"; + url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch"; + hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY="; }) ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix index d65299696e..fc8137cac8 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, config, libsForQt5, }: diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 563057ddeb..bbc43448b0 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -24,9 +24,6 @@ tzdata, xkeyboard_config, runtimeShell, - xorg, - xdotool, - getconf, dbus, util-linux, dde-session-ui, diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix index 34c7b83f81..f5da5c8fee 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix @@ -6,7 +6,6 @@ cmake, qttools, wrapQtAppsHook, - libisoburn, ncnn, opencv, vulkan-headers, diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix index 31bf59583c..2e8b53dfa7 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-zyhqkxxWB5U37eBxINNxcbnF5NpImg+E7H1VhfJDz60="; + hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix index 83d3140db7..ed54eb321c 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-/bQGb87UbnIRWwR6Of67VrRUkrNk6dmY7bjgwDXc30Y"; + hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix index 524a4bbb1c..e6dddb9358 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-w8tyc06v/juTP0YSsyWai1ONl4Aa7dzREIc5wLnI/vw="; + hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix index 7e47a4c92c..b76a189b27 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-6H3Dtdyq/adb3jz9lGaKmOguXqvhvZn1/G7+YajyF2k="; + hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6integration/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6integration/default.nix index 07b93c85f7..19f6d5f936 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "qt6integration"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7FGOnAAcwOonpMDDukj88s1b4WmLJNu7MZSW7f7P44g="; + hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 09bd21a248..93ac45236b 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, mtdev, @@ -13,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qt6platform-plugins"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-O2wylkNKqN0JxKffwFNSfv7S1hPIFrVKwSsppSGTp6I="; + hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ="; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix index 009150c8a3..ce6f775378 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix @@ -44,7 +44,6 @@ , openjpeg , openssl , poppler -, python3Packages , systemd , udev , util-linux diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix index 25faa26687..198dae282d 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -16,7 +16,7 @@ , udisks2 , waylandSupport ? false, wayland-protocols, xwayland , bluetoothSupport ? true, bluez5 -, pulseSupport ? !stdenv.isDarwin, libpulseaudio +, pulseSupport ? !stdenv.hostPlatform.isDarwin, libpulseaudio , directoryListingUpdater }: diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix index 3f8d7c6340..67af761d3a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix @@ -5,7 +5,7 @@ lib.makeScope pkgs.newScope (self: with self; { #### PLATFORM libIDL = callPackage ./platform/libIDL { - gettext = if stdenv.isDarwin then pkgs.gettext else null; + gettext = if stdenv.hostPlatform.isDarwin then pkgs.gettext else null; }; ORBit2 = callPackage ./platform/ORBit2 { }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 902178d167..94c3d49a97 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { name = "change-igemacintegration-to-gtkosxapplication.patch"; url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch"; @@ -28,16 +28,16 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoreconfHook ]; buildInputs = [ atk cairo glib gtk2 pango libxml2Python perl gettext - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gnome-common gtk-mac-integration-gtk2 ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' intltoolize --force ''; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix index 33430f453a..ea6730f88e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ORBit2 libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin - ++ lib.optional (!stdenv.isDarwin) polkit; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) polkit; propagatedBuildInputs = [ glib dbus-glib ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin - lib.optionals stdenv.isDarwin [ "--enable-static" ]; + lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-static" ]; postPatch = '' 2to3 --write --nobackup gsettings/gsettings-schema-convert diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix b/third_party/nixpkgs/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix index 22359e9a58..398e9144e2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix @@ -1,6 +1,5 @@ { runCommand, - pkg-config, gdk-pixbuf, lib, stdenv, diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix index ce83250fe6..ccbbdec13a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Objective-C runtime for use with GNUstep"; homepage = "https://gnustep.github.io/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix index 2618553236..165987ef18 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix @@ -9,7 +9,6 @@ cmake, content-hub, gettext, - libreoffice, libreoffice-unwrapped, lomiri-ui-toolkit, pkg-config, diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix index 21da8a635d..960fb2794c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -12,7 +12,6 @@ lomiri, makeWrapper, pkg-config, - runtimeShell, systemd, }: diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix index be6d593b41..2403975b48 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/lxqt/compton-conf"; description = "GUI configuration tool for compton X composite manager"; mainProgram = "compton-conf"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix index 9a49c10a1b..62504bb33b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qt implementation of the DBusMenu protocol"; homepage = "https://github.com/lxqt/libdbusmenu-lxqt"; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix index 6f809629ea..daaad022ed 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Library used to query system info and statistics"; homepage = "https://github.com/lxqt/libsysstat"; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix index 51b9cef886..30fe20ebee 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/lxqt/qtermwidget"; description = "Terminal emulator widget for Qt, used by QTerminal"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix index ebdd3eb07d..25b9958442 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix @@ -5,7 +5,7 @@ , pkg-config , gettext , glib -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib , udev , pulseaudioSupport ? config.pulseaudio or true diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix index 9328147e64..31854538fb 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 9da4e8c292..12746579c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -13,7 +13,6 @@ , libgee , gettext , gtk3 -, gnome-menus , json-glib , elementary-dock , bamf diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index c9e8de572e..a413498447 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -16,7 +16,6 @@ , libhandy , libxml2 , libsoup -, libgdata , elementary-calendar }: diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index dcb30a6a2d..5b66bc1de6 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll , pkg-config , meson , ninja diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix index 0de704176e..5d0efd28bf 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix @@ -125,8 +125,6 @@ makeScopeWithSplicing' { xfce4-docklike-plugin = callPackage ./panel-plugins/xfce4-docklike-plugin { }; - xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; - xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; @@ -174,6 +172,8 @@ makeScopeWithSplicing' { thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 + xfce4-embed-plugin = throw "xfce4-embed-plugin has been removed, as it was broken"; # Added 2024-07-15 + xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 xfce4-namebar-plugin = throw "xfce.xfce4-namebar-plugin has been removed: abandoned by upstream and does not build"; # added 2024-05-08 }); diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix deleted file mode 100644 index 6d8e1199b9..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, intltool -, libxfce4util -, xfce4-panel -, libxfce4ui -, gtk2 -, gitUpdater -}: - -let - category = "panel-plugins"; -in stdenv.mkDerivation rec { - pname = "xfce4-embed-plugin"; - version = "1.6.0"; - - src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-x2ffY2DoGUsyvCSCPdAAl17boMr+Ulwj14VAKTWe4ig="; - }; - - nativeBuildInputs = [ - pkg-config - intltool - ]; - - buildInputs = [ - libxfce4util - libxfce4ui - xfce4-panel - gtk2 - ]; - - passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; - }; - - meta = with lib;{ - homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; - description = "Embed arbitrary app windows on Xfce panel"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 - maintainers = with maintainers; [ ] ++ teams.xfce.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ada-modules/gnatcoll/bindings.nix b/third_party/nixpkgs/pkgs/development/ada-modules/gnatcoll/bindings.nix index 0b7efb60de..32d490c1e1 100644 --- a/third_party/nixpkgs/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/third_party/nixpkgs/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/development/ada-modules/gprbuild/default.nix b/third_party/nixpkgs/pkgs/development/ada-modules/gprbuild/default.nix index f1cf28f00a..3965789d74 100644 --- a/third_party/nixpkgs/pkgs/development/ada-modules/gprbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/ada-modules/gprbuild/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { "LIBRARY_TYPE=relocatable" ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Ensure that there is enough space for the `fixDarwinDylibNames` hook to # update the install names of the output dylibs. NIX_LDFLAGS = "-headerpad_max_install_names"; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix index a2ea7c8bd4..e3a189adf2 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -45,7 +45,7 @@ rebar3Relx { HOME=. rebar3 proper --constraint_tries 100 ''; # tests seem to be a bit flaky on darwin, skip them for now - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "https://github.com/erlang-ls/erlang_ls"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bfc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bfc/default.nix index 83710df4c1..660f130225 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bfc/default.nix @@ -38,6 +38,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://bfc.wilfred.me.uk"; license = licenses.gpl2Plus; maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix index 9bf22ba6dc..b52d3fa6a3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices libunistring ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = # For libuv on darwin - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export LIBTOOLIZE=libtoolize '' + # Help libgc's configure. @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault during build + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault during build longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling diff --git a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix index d6c1442a8b..7d78c1d659 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # "binaryenjs" "binaryenjs_wasm" # not building this "lit" "gtest" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; meta = with lib; { homepage = "https://github.com/WebAssembly/binaryen"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix b/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix index 5c1aa1b2a2..95903e2e76 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # requires xvfb-run - doCheck = !stdenv.isDarwin + doCheck = !stdenv.hostPlatform.isDarwin && false; # tests time out checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix b/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix index 4c3f5ba201..8dbb1627db 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --replace '`../get_version.sh`' '${version}' \ --replace '`date`' '1970-01-01T00:00:00Z' \ --replace '`hostname`' 'nixpkgs' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in cc0/compiler/bin/coin-o0-support cc0/compiler/bin/cc0-o0-support; do substituteInPlace $f --replace '$(brew --prefix gnu-getopt)' '${getopt}' done @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { getopt mlton pkg-config - ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; buildInputs = [ boehmgc @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # line 1: ../../bin/wrappergen: cannot execute: required file not found # make[2]: *** [../../lib.mk:83: - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix index 01cc7fa28c..9058e1af26 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix @@ -35,7 +35,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { curl libxml2 libffi - ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ xar ]; + ] ++ lib.optionals llvmPackages.stdenv.hostPlatform.isDarwin [ xar ]; nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix index 10dc215065..0749175f08 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.8.0"; + version = "2.8.2"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-zQ+kc4c8YI9vURUEQNqX55mTJBcc2NLp4K8kab3ZjEs="; + hash = "sha256-vBdIGkdQa/csqsu4DbgIYitVbDLDUAFmIUytZ7IcxNk="; }; - cargoHash = "sha256-3ah6cHyCppkLJ2e73aGhVemyMRBl9R5a6ufWHmrJHSk="; + cargoHash = "sha256-w3kzEM34HYQ6KgILaDpmZbCgAh8Ql24DRe12woUAhVI="; # openssl crate requires perl during build process nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix index c52c93c5e6..48e3e9efa5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' substituteInPlace src/ModuleManager.cpp \ --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic' substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic' substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic' @@ -50,6 +50,6 @@ stdenv.mkDerivation { platforms = platforms.darwin ++ platforms.linux; maintainers = [ maintainers.sbond75 ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ccl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ccl/default.nix index 9fe1a8aa8e..ae82b0ccfd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ccl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ccl/default.nix @@ -40,12 +40,12 @@ in stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - postPatch = if stdenv.isDarwin then '' + postPatch = if stdenv.hostPlatform.isDarwin then '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "M4 = gm4" "M4 = m4" \ --replace "dtrace" "/usr/sbin/dtrace" \ @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = attrNames options; # assembler failures during build, x86_64-darwin broken since 2020-10-14 - broken = (stdenv.isDarwin && stdenv.isx86_64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix b/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix index b9368dd4eb..e9a9e42346 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (args // { export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)" ''; - nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]); + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]); buildInputs = [ libiconv libX11 lz4 ncurses zlib ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix b/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix index 9002db42ab..de998e550b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; buildInputs = [ ncurses libiconv libX11 libuuid ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix index b96a1d459d..a36ef4569e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # There is not enough space in the load command to accomodate a full path to the store, # so use `@executable_path` to specify a relative path to chicken’s lib folder. sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ @@ -30,12 +30,12 @@ stdenv.mkDerivation { setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin ["strictoverflow"]; makeFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" @@ -49,7 +49,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index 2f0b8316ae..53b4cc9024 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { bootstrap-chicken ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix index b132036bba..0aaf24b86e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix @@ -19,7 +19,7 @@ let addToPropagatedBuildInputsWithPkgConfig = pkg: old: (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); broken = addMetaAttrs { broken = true; }; - brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; }; + brokenOnDarwin = addMetaAttrs { broken = stdenv.hostPlatform.isDarwin; }; addToCscOptions = opt: old: { CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt); }; @@ -27,8 +27,8 @@ in { allegro = old: ((addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd pkgs.libGLU ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] - ++ lib.optionals stdenv.isLinux [ pkgs.xorg.libX11 ])) old) // { + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkgs.xorg.libX11 ])) old) // { # depends on 'chicken' egg, which doesn't exist, # so we specify all the deps here propagatedBuildInputs = [ @@ -72,12 +72,12 @@ in gl-utils = addPkgConfig; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; glls = addPkgConfig; - iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv); + iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; inotify = old: - (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old) - // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old); + (addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue) old) + // lib.optionalAttrs stdenv.hostPlatform.isDarwin (addToCscOptions "-L -linotify" old); leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; mdh = old: @@ -94,7 +94,7 @@ in nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; @@ -154,8 +154,8 @@ in }; opengl = old: (addToBuildInputsWithPkgConfig - (lib.optionals (!stdenv.isDarwin) [ pkgs.libGL pkgs.libGLU ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) + (lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkgs.libGL pkgs.libGLU ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) old) // { postPatch = '' @@ -164,7 +164,7 @@ in ''; }; posix-shm = old: { - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build.scm \ --replace "-lrt" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix index 29e1032260..c68b5fe065 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ suhr ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix index 0043702fd8..8375ccc22f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix @@ -34,7 +34,7 @@ # Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev # in circt) so that we only have to remove the one fixed rpath. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace llvm/llvm/cmake/modules/AddLLVM.cmake \ --replace-fail 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' \ 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}")' @@ -69,7 +69,7 @@ # it hasn't been populated yet. # # Inspired by fixDarwinDylibNames. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' local flags=(-delete_rpath @loader_path/../lib) for file in "$lib"/lib/*.dylib; do flags+=(-change @rpath/"$(basename "$file")" "$file") diff --git a/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix index d5d56546b5..4613357ded 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux" "x86_64-darwin"]; # Upstream claims support, but breaks with: # error: use of undeclared identifier 'aligned_alloc' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/clasp-developers/clasp"; mainProgram = "clasp"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix index a6b6833289..5199d457f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlags = [ "build" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "arch=${stdenv.hostPlatform.darwinArch}" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/codon/default.nix b/third_party/nixpkgs/pkgs/development/compilers/codon/default.nix index 520c638649..88d3c01d71 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/codon/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/codon/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation { "-DLLVM_USE_LINKER=lld" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codon/*.dylib $out/lib/ ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix b/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix index 1059935ce2..37ac900651 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix @@ -53,7 +53,7 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { # The Linux installer is placed at linux/universal/tar whereas the MacOS # one is at mac/tar. gradleBuildTask = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then ":installers:mac:tar:build" else ":installers:linux:universal:tar:packageBuildResults"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index c95298cbfe..0907c1c4d6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -144,7 +144,7 @@ let substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 substituteInPlace spec/compiler/loader/unix_spec.cr \ --replace 'it "parses file paths"' 'pending "parses file paths"' @@ -175,7 +175,7 @@ let libxml2 openssl ] ++ extraBuildInputs - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix index 9a08b3d517..d6d538d5c8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out cp -R * $out/ echo $libPath - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { testCompile = runCommand "dart-test-compile" { nativeBuildInputs = [ finalAttrs.finalPackage ] - ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.sigtool ]; } '' HELLO_MESSAGE="Hello, world!" echo "void main() => print('$HELLO_MESSAGE');" > hello.dart diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix index 9246628d01..7f2054e3e0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.5.2"; in +let version = "3.5.3"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0k1h7kbcagm7s0n8696lzws814rabz3491khd7z78mb3ivahxw35"; + sha256 = "1z6hl6pqsg2l7pfchzr5dk90b2dchidhwnnnc4q5dzz0xjikqrvx"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "036jw4qq3wicyfpamy7v6qsbrj0m7dyny45yzdgil4snvfagvfsv"; + sha256 = "12rzl1nm1y0q5ff9p8gslki4cz37y3bdn8p2s3x2nc81bdda4gn7"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "1wm1157hbsms872pp1fkn0i3khz3h4r909bdvpk2rhag2l928f0a"; + sha256 = "1rp54g8di8j715n955wdr6i0pcrx2dn73qmvmrisyahi0qjrk0py"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "160dk1dpdzdh0pphmvdw7agavpyxniw8zf5w30yamkdi7r9g0l0b"; + sha256 = "001mpb3fniamlmnqmhxdpbvp8crdvnf6sam13vvfmnr6na1fpxil"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0nrgjdzc2skqc2b52pzw78056jqrqmiwzwwd9wh699dwwfnrjcf4"; + sha256 = "0z9qjx2b2rmiqyqww0a5slj0pi1k8sn4fjihkn53im65rhhqra2y"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix index b58d868713..fedf3deed6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch b/third_party/nixpkgs/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch new file mode 100644 index 0000000000..089b8b0fca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch @@ -0,0 +1,30 @@ +From 93137ea040472f4042dd186427699ad249e7251b Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 22 Sep 2024 16:41:07 -0300 +Subject: [PATCH] UpdateNuGetConfigPackageSourcesMappings: don't add empty + mappings + +--- + .../UpdateNuGetConfigPackageSourcesMappings.cs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +index 3b188c1801..9b7050ef46 100644 +--- a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs ++++ b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +@@ -115,7 +115,11 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks + // Skip sources with zero package patterns + if (allSourcesPackages[packageSource]?.Count > 0) + { +- pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource)); ++ var pkgSrc = GetPackageMappingsElementForSource(packageSource); ++ if (pkgSrc.Elements().Any()) ++ { ++ pkgSrcMappingClearElement.AddAfterSelf(pkgSrc); ++ } + } + } + +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix index 0c9de3f05c..e9ae30070d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,33 +1,45 @@ -{ type -, version -, srcs -, packages ? null +{ + type, + version, + srcs, + commonPackages ? null, + hostPackages ? null, + targetPackages ? null, }: -assert builtins.elem type [ "aspnetcore" "runtime" "sdk" ]; -assert if type == "sdk" then packages != null else true; +assert builtins.elem type [ + "aspnetcore" + "runtime" + "sdk" +]; +assert + if type == "sdk" then + commonPackages != null && hostPackages != null && targetPackages != null + else + true; -{ lib -, stdenv -, fetchurl -, writeText -, autoPatchelfHook -, makeWrapper -, libunwind -, icu -, libuuid -, zlib -, libkrb5 -, openssl -, curl -, lttng-ust_2_12 -, testers -, runCommand -, writeShellScript -, mkNugetDeps -, callPackage -, dotnetCorePackages -, xmlstarlet +{ + lib, + stdenv, + fetchurl, + writeText, + autoPatchelfHook, + makeWrapper, + libunwind, + icu, + libuuid, + zlib, + libkrb5, + openssl, + curl, + lttng-ust_2_12, + testers, + runCommand, + writeShellScript, + mkNugetDeps, + callPackage, + systemToDotnetRid, + xmlstarlet, }: let @@ -45,40 +57,53 @@ let sdk = ".NET SDK ${version}"; }; - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; - targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + hostRid = systemToDotnetRid stdenv.hostPlatform.system; + targetRid = systemToDotnetRid stdenv.targetPlatform.system; - sigtool = callPackage ./sigtool.nix {}; - signAppHost = callPackage ./sign-apphost.nix {}; + sigtool = callPackage ./sigtool.nix { }; + signAppHost = callPackage ./sign-apphost.nix { }; - hasILCompiler = - lib.versionAtLeast version (if targetRid == "osx-arm64" then "8" else "7"); + hasILCompiler = lib.versionAtLeast version (if hostRid == "osx-arm64" then "8" else "7"); - extraTargets = writeText "extra.targets" ('' - - '' + lib.optionalString hasILCompiler '' + extraTargets = writeText "extra.targets" ( + '' + + '' + + lib.optionalString hasILCompiler '' - + - '' + lib.optionalString stdenv.isDarwin '' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' - '' + '' - - ''); + '' + + '' + + '' + ); in mkCommon type rec { inherit pname version; # Some of these dependencies are `dlopen()`ed. - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optional stdenv.isLinux autoPatchelfHook - ++ lib.optionals (type == "sdk" && stdenv.isDarwin) [ - xmlstarlet - sigtool - ]; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [ + xmlstarlet + sigtool + ]; buildInputs = [ stdenv.cc.cc @@ -87,24 +112,30 @@ mkCommon type rec { libkrb5 curl xmlstarlet - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; + ] ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12; src = fetchurl ( - srcs."${stdenv.hostPlatform.system}" or (throw - "Missing source (url and hash) for host system: ${stdenv.hostPlatform.system}") + srcs.${hostRid} or (throw "Missing source (url and hash) for host RID: ${hostRid}") ); sourceRoot = "."; - postPatch = if type == "sdk" then ('' - xmlstarlet ed \ - --inplace \ - -s //_:Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${extraTargets}" \ - sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets - '' + lib.optionalString stdenv.isDarwin '' - codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} - '') else null; + postPatch = + if type == "sdk" then + ( + '' + xmlstarlet ed \ + --inplace \ + -s //_:Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${extraTargets}" \ + sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} + '' + ) + else + null; dontPatchELF = true; noDumpEnvVars = true; @@ -132,49 +163,62 @@ mkCommon type rec { --add-needed libicuuc.so \ $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \ $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libgssapi_krb5.so \ $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libssl.so \ $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host ''; # fixes: Could not load ICU data. UErrorCode: 2 - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/icu")) (allow file-read* (subpath "/private/var/db/mds/system")) (allow mach-lookup (global-name "com.apple.SecurityServer") (global-name "com.apple.system.opendirectoryd.membership")) ''; - passthru = { - inherit icu hasILCompiler; - } // lib.optionalAttrs (type == "sdk") { - packages = mkNugetDeps { - name = "${pname}-${version}-deps"; - nugetDeps = packages; - }; + passthru = + { + inherit icu hasILCompiler; + } + // lib.optionalAttrs (type == "sdk") { + packages = commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}; + inherit targetPackages; - updateScript = - let - majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); - in - writeShellScript "update-dotnet-${majorVersion}" '' - pushd pkgs/development/compilers/dotnet - exec ${./update.sh} "${majorVersion}" - ''; - }; + updateScript = + let + majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + in + writeShellScript "update-dotnet-${majorVersion}" '' + pushd pkgs/development/compilers/dotnet + exec ${./update.sh} "${majorVersion}" + ''; + }; meta = with lib; { description = builtins.getAttr type descriptions; homepage = "https://dotnet.github.io/"; license = licenses.mit; - maintainers = with maintainers; [ kuznero mdarocha ]; + maintainers = with maintainers; [ + kuznero + mdarocha + ]; mainProgram = "dotnet"; - platforms = attrNames srcs; + platforms = lib.filter ( + platform: + let + e = builtins.tryEval (systemToDotnetRid platform); + in + e.success && srcs ? "${e.value}" + ) lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-deps.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-deps.nix index af21c3aa24..188c26cf27 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-deps.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-deps.nix @@ -2,7 +2,7 @@ list, baseRid, otherRids, - pkgs ? import ../../../.. {} + pkgs ? import ../../../.. { }, }: let inherit (pkgs) writeText; @@ -20,31 +20,36 @@ let fns = map (file: import file) list; - packages = unique - (concatMap (fn: fn { fetchNuGet = package: package; }) fns); + packages = unique (concatMap (fn: fn { fetchNuGet = package: package; }) fns); - changePackageRid = package: rid: - let replace = replaceStrings [".${baseRid}"] [".${rid}"]; - in rec { + changePackageRid = + package: rid: + let + replace = replaceStrings [ ".${baseRid}" ] [ ".${rid}" ]; + in + rec { pname = replace package.pname; inherit (package) version; url = replace package.url; sha256 = builtins.hashFile "sha256" (builtins.fetchurl url); }; - expandPackage = package: - [ package ] ++ - optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) - (map (changePackageRid package) otherRids); + expandPackage = + package: + [ package ] + ++ optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) ( + map (changePackageRid package) otherRids + ); - allPackages = - sortOn (package: [ package.pname package.version ]) - (concatMap expandPackage packages); + allPackages = sortOn (package: [ + package.pname + package.version + ]) (concatMap expandPackage packages); - fetchExpr = package: - " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; + fetchExpr = package: " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; -in writeText "deps.nix" '' +in +writeText "deps.nix" '' { fetchNuGet }: [ ${concatMapStringsSep "\n" fetchExpr allPackages} ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix index 303e5eaba8..661f9c482a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix @@ -1,37 +1,50 @@ dotnetPackages: -{ buildEnv, makeWrapper, lib, symlinkJoin }: +{ + buildEnv, + makeWrapper, + lib, + symlinkJoin, +}: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: # 1. A separate argument for the CLI (as suggested by IvarWithoutBones # 2. Use the highest version SDK for the CLI (as suggested by GGG) # 3. Something else? -let cli = builtins.head dotnetPackages; +let + cli = builtins.head dotnetPackages; in -assert lib.assertMsg ((builtins.length dotnetPackages) > 0) - ''You must include at least one package, e.g - `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 - ];`'' ; - buildEnv { - name = "dotnet-core-combined"; - paths = dotnetPackages; - pathsToLink = [ "/host" "/packs" "/sdk" "/sdk-manifests" "/shared" "/templates" ]; - ignoreCollisions = true; - postBuild = '' - cp -R ${cli}/{dotnet,share,nix-support} $out/ +assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' + You must include at least one package, e.g + `with dotnetCorePackages; combinePackages [ + sdk_6_0 aspnetcore_7_0 + ];`''; +buildEnv { + name = "dotnet-core-combined"; + paths = dotnetPackages; + pathsToLink = [ + "/host" + "/packs" + "/sdk" + "/sdk-manifests" + "/shared" + "/templates" + ]; + ignoreCollisions = true; + postBuild = '' + cp -R ${cli}/{dotnet,share,nix-support} $out/ - mkdir $out/bin - ln -s $out/dotnet $out/bin/dotnet - ''; - passthru = { - inherit (cli) icu; + mkdir $out/bin + ln -s $out/dotnet $out/bin/dotnet + ''; + passthru = { + inherit (cli) icu; - versions = lib.catAttrs "version" dotnetPackages; - packages = symlinkJoin { - name = "combined-packages"; - paths = lib.remove null (lib.catAttrs "packages" dotnetPackages); - }; - }; + versions = lib.catAttrs "version" dotnetPackages; + packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); + targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( + lib.catAttrs "targetPackages" dotnetPackages + ); + }; - inherit (cli) meta; - } + inherit (cli) meta; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix index 491b8c0ff2..426eb848d8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix @@ -1,204 +1,241 @@ # TODO: switch to stdenvNoCC -{ stdenv -, stdenvNoCC -, lib -, writeText -, testers -, runCommand -, runCommandWith -, expect -, curl -, installShellFiles -, callPackage -, zlib -, swiftPackages -, darwin -, icu -, lndir -, substituteAll -, nugetPackageHook -, xmlstarlet -}: type: args: stdenv.mkDerivation (finalAttrs: args // { - doInstallCheck = true; +{ + stdenv, + stdenvNoCC, + lib, + writeText, + testers, + runCommand, + runCommandWith, + expect, + curl, + installShellFiles, + callPackage, + zlib, + swiftPackages, + darwin, + icu, + lndir, + substituteAll, + nugetPackageHook, + xmlstarlet, +}: +type: args: +stdenv.mkDerivation ( + finalAttrs: + args + // { + doInstallCheck = true; - # TODO: this should probably be postInstallCheck - # TODO: send output to /dev/null - installCheckPhase = args.installCheckPhase or "" + '' - $out/bin/dotnet --info - ''; - - setupHooks = args.setupHooks or [] ++ [ - ./dotnet-setup-hook.sh - ] ++ lib.optional (type == "sdk") (substituteAll { - src = ./dotnet-sdk-setup-hook.sh; - inherit lndir xmlstarlet; - }); - - propagatedBuildInputs = - (args.propagatedBuildInputs or []) - ++ [ nugetPackageHook ]; - - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ installShellFiles ]; - - postInstall = '' - # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete - installShellCompletion --cmd dotnet \ - --bash ${./completions/dotnet.bash} \ - --zsh ${./completions/dotnet.zsh} \ - --fish ${./completions/dotnet.fish} - ''; - - passthru = { - tests = let - mkDotnetTest = - { - name, - stdenv ? stdenvNoCC, - template, - usePackageSource ? false, - build, - buildInputs ? [], - # TODO: use correct runtimes instead of sdk - runtime ? finalAttrs.finalPackage, - runInputs ? [], - run ? null, - runAllowNetworking ? false, - }: - let - sdk = finalAttrs.finalPackage; - built = stdenv.mkDerivation { - name = "dotnet-test-${name}"; - buildInputs = - [ sdk ] - ++ buildInputs - ++ lib.optional (usePackageSource) sdk.packages; - # make sure ICU works in a sandbox - propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; - unpackPhase = '' - mkdir test - cd test - dotnet new ${template} -o . - ''; - buildPhase = build; - dontPatchELF = true; - }; - in - if run == null - then built - else - runCommand "${built.name}-run" ({ - src = built; - nativeBuildInputs = [ built ] ++ runInputs; - passthru = { inherit built; }; - } // lib.optionalAttrs (stdenv.isDarwin && runAllowNetworking) { - sandboxProfile = '' - (allow network-inbound (local ip)) - (allow mach-lookup (global-name "com.apple.FSEvents")) - ''; - __darwinAllowLocalNetworking = true; - }) (lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime} - '' + run); - - # Setting LANG to something other than 'C' forces the runtime to search - # for ICU, which will be required in most user environments. - checkConsoleOutput = command: '' - output="$(LANG=C.UTF-8 ${command})" - # yes, older SDKs omit the comma - [[ "$output" =~ Hello,?\ World! ]] && touch "$out" + # TODO: this should probably be postInstallCheck + # TODO: send output to /dev/null + installCheckPhase = + args.installCheckPhase or "" + + '' + $out/bin/dotnet --info ''; - in { - version = testers.testVersion ({ - package = finalAttrs.finalPackage; - } // lib.optionalAttrs (type != "sdk") { - command = "dotnet --info"; + + setupHooks = + args.setupHooks or [ ] + ++ [ + ./dotnet-setup-hook.sh + ] + ++ lib.optional (type == "sdk") (substituteAll { + src = ./dotnet-sdk-setup-hook.sh; + inherit lndir xmlstarlet; }); - } - // lib.optionalAttrs (type == "sdk") ({ - console = mkDotnetTest { - name = "console"; - template = "console"; - build = checkConsoleOutput "dotnet run"; - }; - publish = mkDotnetTest { - name = "publish"; - template = "console"; - build = "dotnet publish -o $out/bin"; - run = checkConsoleOutput "$src/bin/test"; - }; + propagatedBuildInputs = + (args.propagatedBuildInputs or [ ]) + ++ lib.optional (type == "sdk") nugetPackageHook; - self-contained = mkDotnetTest { - name = "self-contained"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime --sc -o $out"; - runtime = null; - run = checkConsoleOutput "$src/test"; - }; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ installShellFiles ]; - single-file = mkDotnetTest { - name = "single-file"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; - runtime = null; - run = checkConsoleOutput "$src/bin/test"; - }; + postInstall = '' + # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete + installShellCompletion --cmd dotnet \ + --bash ${./completions/dotnet.bash} \ + --zsh ${./completions/dotnet.zsh} \ + --fish ${./completions/dotnet.fish} + ''; - web = mkDotnetTest { - name = "web"; - template = "web"; - build = "dotnet publish -o $out/bin"; - runInputs = [ expect curl ]; - run = '' - expect <<"EOF" - set status 1 - spawn $env(src)/bin/test - proc abort { } { exit 2 } - expect_before default abort - expect -re {Now listening on: ([^\r]+)\r} { - set url $expect_out(1,string) + passthru = { + tests = + let + mkDotnetTest = + { + name, + stdenv ? stdenvNoCC, + template, + usePackageSource ? false, + build, + buildInputs ? [ ], + # TODO: use correct runtimes instead of sdk + runtime ? finalAttrs.finalPackage, + runInputs ? [ ], + run ? null, + runAllowNetworking ? false, + }: + let + sdk = finalAttrs.finalPackage; + built = stdenv.mkDerivation { + name = "dotnet-test-${name}"; + buildInputs = [ sdk ] ++ buildInputs ++ lib.optional (usePackageSource) sdk.packages; + # make sure ICU works in a sandbox + propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; + unpackPhase = '' + mkdir test + cd test + dotnet new ${template} -o . --no-restore + ''; + buildPhase = build; + dontPatchELF = true; + }; + in + if run == null then + built + else + runCommand "${built.name}-run" + ( + { + src = built; + nativeBuildInputs = [ built ] ++ runInputs; + passthru = { + inherit built; + }; + } + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && runAllowNetworking) { + sandboxProfile = '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + __darwinAllowLocalNetworking = true; + } + ) + ( + lib.optionalString (runtime != null) '' + # TODO: use runtime here + export DOTNET_ROOT=${runtime} + '' + + run + ); + + # Setting LANG to something other than 'C' forces the runtime to search + # for ICU, which will be required in most user environments. + checkConsoleOutput = command: '' + output="$(LANG=C.UTF-8 ${command})" + # yes, older SDKs omit the comma + [[ "$output" =~ Hello,?\ World! ]] && touch "$out" + ''; + in + { + version = testers.testVersion ( + { + package = finalAttrs.finalPackage; } - expect "Application started. Press Ctrl+C to shut down." - set output [exec curl -sSf $url] - if {$output != "Hello World!"} { - send_error "Unexpected output: $output\n" - exit 1 + // lib.optionalAttrs (type != "sdk") { + command = "dotnet --info"; } - send \x03 - expect_before timeout abort - expect eof - catch wait result - exit [lindex $result 3] - EOF - touch $out - ''; - runAllowNetworking = true; - }; - } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { - aot = mkDotnetTest { - name = "aot"; - stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; - template = "console"; - usePackageSource = true; - buildInputs = - [ zlib - ] ++ lib.optional stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ - swiftPackages.swift - Foundation - CryptoKit - GSS - ICU - ]); - build = '' - dotnet restore -p:PublishAot=true - dotnet publish -p:PublishAot=true -o $out/bin - ''; - runtime = null; - run = checkConsoleOutput "$src/bin/test"; - }; - }) // args.passthru.tests or {}; - } // args.passthru or {}; -}) + ); + } + // lib.optionalAttrs (type == "sdk") ( + { + console = mkDotnetTest { + name = "console"; + template = "console"; + build = checkConsoleOutput "dotnet run"; + }; + + publish = mkDotnetTest { + name = "publish"; + template = "console"; + build = "dotnet publish -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; + + self-contained = mkDotnetTest { + name = "self-contained"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime --sc -o $out"; + runtime = null; + run = checkConsoleOutput "$src/test"; + }; + + single-file = mkDotnetTest { + name = "single-file"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; + + web = mkDotnetTest { + name = "web"; + template = "web"; + build = "dotnet publish -o $out/bin"; + runInputs = [ + expect + curl + ]; + run = '' + expect <<"EOF" + set status 1 + spawn $env(src)/bin/test + proc abort { } { exit 2 } + expect_before default abort + expect -re {Now listening on: ([^\r]+)\r} { + set url $expect_out(1,string) + } + expect "Application started. Press Ctrl+C to shut down." + set output [exec curl -sSf $url] + if {$output != "Hello World!"} { + send_error "Unexpected output: $output\n" + exit 1 + } + send \x03 + expect_before timeout abort + expect eof + catch wait result + exit [lindex $result 3] + EOF + touch $out + ''; + runAllowNetworking = true; + }; + } + // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { + aot = mkDotnetTest { + name = "aot"; + stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv; + template = "console"; + usePackageSource = true; + buildInputs = + [ + zlib + ] + ++ lib.optional stdenv.hostPlatform.isDarwin ( + with darwin; + with apple_sdk.frameworks; + [ + swiftPackages.swift + Foundation + CryptoKit + GSS + ICU + ] + ); + build = '' + dotnet restore -p:PublishAot=true + dotnet publish -p:PublishAot=true -o $out/bin + ''; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; + } + ) + // args.passthru.tests or { }; + } // args.passthru or { }; + } +) diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix index 0c6999471c..69cd17ec62 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -1,25 +1,30 @@ /* -How to combine packages for use in development: -dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + How to combine packages for use in development: + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; -Hashes and urls are retrieved from: -https://dotnet.microsoft.com/download/dotnet + Hashes and urls are retrieved from: + https://dotnet.microsoft.com/download/dotnet */ -{ lib -, config -, recurseIntoAttrs -, generateSplicesForMkScope -, makeScopeWithSplicing' +{ + lib, + config, + recurseIntoAttrs, + generateSplicesForMkScope, + makeScopeWithSplicing', }: makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "dotnetCorePackages"; - f = (self: + f = ( + self: let callPackage = self.callPackage; - buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; + fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; + + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; buildAttrs = { + inherit fetchNupkg; buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); @@ -40,16 +45,18 @@ makeScopeWithSplicing' { "i686-windows" = "win-x86"; }; - in { - inherit callPackage; + in + { + inherit callPackage fetchNupkg; # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + systemToDotnetRid = + system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; - patchNupkgs = callPackage ./patch-nupkgs.nix {}; - nugetPackageHook = callPackage ./nuget-package-hook.nix {}; + patchNupkgs = callPackage ./patch-nupkgs.nix { }; + nugetPackageHook = callPackage ./nuget-package-hook.nix { }; buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; @@ -57,16 +64,21 @@ makeScopeWithSplicing' { mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 {}); - } // lib.optionalAttrs config.allowAliases { + dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + } + // lib.optionalAttrs config.allowAliases { # EOL sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; - } // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 // dotnet_9_0); + } + // dotnet_6_0 + // dotnet_7_0 + // dotnet_8_0 + // dotnet_9_0 + ); } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh index b36f3dfd70..1e7908b049 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh @@ -135,7 +135,7 @@ configureNuget() { -s '/configuration/packageSourceMapping/packageSource[@key="_nix"]' -t elem -n package -i \$prev -t attr -n pattern -v "$id") done - cd - < /dev/null + cd - > /dev/null else xmlConfigArgs+=( "${xmlSourceConfigArgs[@]}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix index 7e629383ab..7e94f3432f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/dotnet.nix @@ -1,11 +1,14 @@ -{ callPackage -, lib -, releaseManifestFile -, releaseInfoFile -, allowPrerelease ? false -, depsFile -, bootstrapSdk -, pkgsBuildHost +{ + stdenvNoCC, + callPackage, + lib, + fetchurl, + releaseManifestFile, + releaseInfoFile, + allowPrerelease ? false, + depsFile, + bootstrapSdk, + pkgsBuildHost, }: let @@ -13,33 +16,31 @@ let pkgs = callPackage ./stage1.nix { inherit releaseManifestFile tarballHash depsFile; - bootstrapSdk = - { stdenvNoCC - , dotnetCorePackages - , fetchurl - }: bootstrapSdk.overrideAttrs (old: { - passthru = old.passthru or {} // { - artifacts = stdenvNoCC.mkDerivation rec { - name = lib.nameFromURL artifactsUrl ".tar.gz"; + bootstrapSdk = bootstrapSdk.overrideAttrs (old: { + passthru = old.passthru or { } // { + artifacts = stdenvNoCC.mkDerivation rec { + name = lib.nameFromURL artifactsUrl ".tar.gz"; - src = fetchurl { - url = artifactsUrl; - hash = artifactsHash; - }; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out - cp -r * $out/ - ''; + src = fetchurl { + url = artifactsUrl; + hash = artifactsHash; }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; }; - }); + }; + }); }; -in pkgs // { - vmr = pkgs.vmr.overrideAttrs(old: { +in +pkgs +// { + vmr = pkgs.vmr.overrideAttrs (old: { passthru = old.passthru // { updateScript = pkgsBuildHost.callPackage ./update.nix { inherit releaseManifestFile releaseInfoFile allowPrerelease; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix index 801896f386..f9a5190d15 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/packages.nix @@ -1,17 +1,97 @@ -{ stdenv -, callPackage -, vmr -, xmlstarlet -, strip-nondeterminism -, zip +{ + stdenvNoCC, + lib, + callPackage, + vmr, + xmlstarlet, + strip-nondeterminism, + zip, + nugetPackageHook, + fallbackTargetPackages ? { }, }: let - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; inherit (vmr) targetRid releaseManifest; -in { - inherit vmr; + # TODO: do this properly + hostRid = targetRid; + + mkPackage = + pname: version: + stdenvNoCC.mkDerivation { + inherit pname version; + + src = vmr; + dontUnpack = true; + + nativeBuildInputs = [ + xmlstarlet + nugetPackageHook + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + + pushd "$src"/Private.SourceBuilt.Artifacts.*.${targetRid} + pushd ${pname}.${version}.nupkg + + xmlstarlet \ + sel -t \ + -m /_:package/_:metadata \ + -v _:id -nl \ + -v _:version -nl \ + *.nuspec | ( + read id + read version + id=''${id,,} + version=''${version,,} + mkdir -p "$out"/share/nuget/packages/"$id" + cp -r . "$out"/share/nuget/packages/"$id"/"$version" + chmod +w "$out"/share/nuget/packages/"$id"/"$version" + echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + ) + + popd + popd + + runHook postInstall + ''; + }; + + packages = + [ + (mkPackage "Microsoft.AspNetCore.App.Ref" aspnetcore.version) + (mkPackage "Microsoft.NETCore.DotNetAppHost" runtime.version) + (mkPackage "Microsoft.NETCore.App.Ref" runtime.version) + (mkPackage "Microsoft.DotNet.ILCompiler" runtime.version) + (mkPackage "Microsoft.NET.ILLink.Tasks" runtime.version) + (mkPackage "Microsoft.NETCore.App.Crossgen2.${hostRid}" runtime.version) + (mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + + targetPackages = fallbackTargetPackages // { + ${targetRid} = + [ + (mkPackage "Microsoft.AspNetCore.App.Runtime.${targetRid}" aspnetcore.version) + (mkPackage "Microsoft.NETCore.App.Host.${targetRid}" runtime.version) + (mkPackage "Microsoft.NETCore.App.Runtime.${targetRid}" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetAppHost" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + }; + sdk = mkCommon "sdk" rec { pname = "dotnet-sdk"; version = releaseManifest.sdkVersion; @@ -25,7 +105,10 @@ in { zip ]; - outputs = [ "out" "packages" "artifacts" ]; + outputs = [ + "out" + "artifacts" + ]; installPhase = '' runHook preInstall @@ -35,42 +118,12 @@ in { mkdir "$out"/bin ln -s "$out"/dotnet "$out"/bin/dotnet - mkdir -p "$packages" "$artifacts" + mkdir -p "$artifacts" cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}/* "$artifacts"/ chmod +w -R "$artifacts" local package - for package in "$artifacts"/*.nupkg; do - local copy - case "$(basename "$package")" in - *Microsoft.NET.* | \ - *Microsoft.ILLink.* | \ - *Microsoft.Tasks.* | \ - *Microsoft.NETCore.* | \ - *Microsoft.DotNet.* | \ - *Microsoft.AspNetCore.*) copy=1 ;; - *) copy= ;; - esac - if [[ -n $copy ]]; then - echo copying "$package" to packages - xmlstarlet \ - sel -t \ - -m /_:package/_:metadata \ - -v _:id -nl \ - -v _:version -nl \ - "$package"/*.nuspec | ( - read id - read version - id=''${id,,} - version=''${version,,} - mkdir -p "$packages"/share/nuget/packages/"$id" - cp -r "$package" "$packages"/share/nuget/packages/"$id"/"$version" - echo {} > "$packages"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata - ) - fi - done - for package in "$artifacts"/{,SourceBuildReferencePackages/}*.nupkg; do echo packing "$package" to artifacts (cd "$package" && zip -rq0 "$package.tmp" .) @@ -84,6 +137,8 @@ in { passthru = { inherit (vmr) icu targetRid hasILCompiler; + + inherit packages targetPackages; }; meta = vmr.meta // { @@ -143,4 +198,13 @@ in { mainProgram = "dotnet"; }; }; +in +{ + inherit + vmr + sdk + runtime + aspnetcore + ; + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/patch-nupkgs.nix index c351ea7b32..6885d8df71 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/patch-nupkgs.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/patch-nupkgs.nix @@ -1,83 +1,92 @@ -{ stdenv -, lib -, zlib -, curl -, icu -, libunwind -, libuuid -, openssl -, lttng-ust_2_12 -, patchelf -, writeShellScriptBin +{ + stdenv, + lib, + zlib, + curl, + icu, + libunwind, + libuuid, + openssl, + lttng-ust_2_12, + patchelf, + writeShellScriptBin, }: let - binaryRPath = lib.makeLibraryPath ([ - stdenv.cc.cc - zlib - curl - icu - libunwind - libuuid - openssl - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); + binaryRPath = lib.makeLibraryPath ( + [ + stdenv.cc.cc + zlib + curl + icu + libunwind + libuuid + openssl + ] + ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12 + ); -in writeShellScriptBin "patch-nupkgs" ('' - set -euo pipefail - shopt -s nullglob - isELF() { - local fn="$1" - local fd - local magic - exec {fd}< "$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi - } - cd "$1" -'' + lib.optionalString stdenv.isLinux '' - for x in */* */*; do - # .nupkg.metadata is written last, so we know the packages is complete - [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ - && [[ ! -f "$x"/.nix-patched ]] || continue - echo "Patching package $x" - find "$x" -type f -print0 | while IFS= read -rd "" p; do - if [[ "$p" != *.nix-patched ]] \ - && isELF "$p" \ - && ${patchelf}/bin/patchelf --print-interpreter "$p" &>/dev/null; then - tmp="$p".$$.nix-patched - # if this fails to copy then another process must have patched it - cp --reflink=auto "$p" "$tmp" || continue - echo "Patchelfing $p as $tmp" - ${patchelf}/bin/patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - "$tmp" ||: - # This makes sure that if the binary requires some specific runtime dependencies, it can find it. - # This fixes dotnet-built binaries like crossgen2 - ${patchelf}/bin/patchelf \ - --add-needed libicui18n.so \ - --add-needed libicuuc.so \ - --add-needed libz.so \ - --add-needed libssl.so \ - "$tmp" - ${patchelf}/bin/patchelf \ - --add-rpath "${binaryRPath}" \ - "$tmp" ||: - mv "$tmp" "$p" - fi +in +writeShellScriptBin "patch-nupkgs" ( + '' + set -euo pipefail + shopt -s nullglob + isELF() { + local fn="$1" + local fd + local magic + exec {fd}< "$fn" + read -r -n 4 -u "$fd" magic + exec {fd}<&- + if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi + } + cd "$1" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + for x in */* */*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched ]] || continue + echo "Patching package $x" + find "$x" -type f -print0 | while IFS= read -rd "" p; do + if [[ "$p" != *.nix-patched ]] \ + && isELF "$p" \ + && ${patchelf}/bin/patchelf --print-interpreter "$p" &>/dev/null; then + tmp="$p".$$.nix-patched + # if this fails to copy then another process must have patched it + cp --reflink=auto "$p" "$tmp" || continue + echo "Patchelfing $p as $tmp" + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + "$tmp" ||: + # This makes sure that if the binary requires some specific runtime dependencies, it can find it. + # This fixes dotnet-built binaries like crossgen2 + ${patchelf}/bin/patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + --add-needed libz.so \ + --add-needed libssl.so \ + "$tmp" + ${patchelf}/bin/patchelf \ + --add-rpath "${binaryRPath}" \ + "$tmp" ||: + mv "$tmp" "$p" + fi + done + touch "$x"/.nix-patched done - touch "$x"/.nix-patched - done -'' + lib.optionalString stdenv.isDarwin '' - for x in microsoft.dotnet.ilcompiler/*; do - # .nupkg.metadata is written last, so we know the packages is complete - [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ - && [[ ! -f "$x"/.nix-patched-ilcompiler ]] || continue - echo "Patching package $x" - pushd "$x" - sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets - sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets - touch .nix-patched-ilcompiler - popd - done -'') + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + for x in microsoft.dotnet.ilcompiler/*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched-ilcompiler ]] || continue + echo "Patching package $x" + pushd "$x" + sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets + sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets + touch .nix-patched-ilcompiler + popd + done + '' +) diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/sign-apphost.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/sign-apphost.nix index f804ab79d3..021d9ef61a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/sign-apphost.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/sign-apphost.nix @@ -1,10 +1,12 @@ -{ substituteAll -, callPackage +{ + substituteAll, + callPackage, }: let - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; -in substituteAll { +in +substituteAll { src = ./sign-apphost.proj; codesign = "${sigtool}/bin/codesign"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix index fe5d1ebc68..04e0d52150 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix @@ -1,7 +1,8 @@ -{ cctools -, darwin -, fetchFromGitHub -, makeWrapper +{ + cctools, + darwin, + fetchFromGitHub, + makeWrapper, }: darwin.sigtool.overrideAttrs (old: { @@ -14,13 +15,15 @@ darwin.sigtool.overrideAttrs (old: { sha256 = "sha256-EVM5ZG3sAHrIXuWrnqA9/4pDkJOpWCeBUl5fh0mkK4k="; }; - nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ makeWrapper ]; - postInstall = old.postInstall or "" + '' - wrapProgram $out/bin/codesign \ - --set-default CODESIGN_ALLOCATE \ - "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" - ''; + postInstall = + old.postInstall or "" + + '' + wrapProgram $out/bin/codesign \ + --set-default CODESIGN_ALLOCATE \ + "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" + ''; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix index 7e2717aba1..b10f0ac2cc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix @@ -1,130 +1,141 @@ -{ stdenv -, callPackage -, lib -, writeShellScript -, mkNugetDeps -, nix -, cacert -, nuget-to-nix -, dotnetCorePackages -, xmlstarlet -, patchNupkgs +{ + stdenv, + callPackage, + lib, + writeShellScript, + mkNugetDeps, + nix, + cacert, + nuget-to-nix, + dotnetCorePackages, + xmlstarlet, + patchNupkgs, + symlinkJoin, -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }: let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - dotnetSdk = callPackage bootstrapSdk {}; - - deps = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; + sdkPackages = symlinkJoin { + name = "${bootstrapSdk.name}-packages"; + paths = map ( + p: + p.override { + installable = true; + } + ) bootstrapSdk.packages; }; - sdkPackages = dotnetSdk.packages.override { - installable = true; - }; + vmr = + (mkVMR { + inherit releaseManifestFile tarballHash bootstrapSdk; + }).overrideAttrs + (old: rec { + prebuiltPackages = mkNugetDeps { + name = "dotnet-vmr-deps"; + sourceFile = depsFile; + installable = true; + }; - vmr = (mkVMR { - inherit releaseManifestFile tarballHash dotnetSdk; - }).overrideAttrs (old: rec { - prebuiltPackages = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; - installable = true; - }; + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + xmlstarlet + patchNupkgs + ]; - nativeBuildInputs = - old.nativeBuildInputs or [] - ++ [ xmlstarlet patchNupkgs ]; - - postPatch = old.postPatch or "" + '' - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ - src/*/Directory.Build.targets - ''; - - postConfigure = old.postConfigure or "" + '' - [[ ! -v prebuiltPackages ]] || \ - ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ''; - - buildFlags = - old.buildFlags - ++ lib.optionals (lib.versionAtLeast old.version "9") [ - # We need to set this as long as we have something in deps.nix. Currently - # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt - # artifacts. - "-p:SkipErrorOnPrebuilts=true" - ]; - - passthru = old.passthru or {} // { fetch-deps = - let - inherit (vmr) targetRid updateScript; - otherRids = - lib.remove targetRid ( - map (system: dotnetCorePackages.systemToDotnetRid system) - vmr.meta.platforms); - - pkg = vmr.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - nix - cacert - nuget-to-nix - ]; - postPatch = old.postPatch or "" + '' + postPatch = + old.postPatch or "" + + '' xmlstarlet ed \ --inplace \ -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ - repo-projects/Directory.Build.targets - # make nuget-client use the standard arcade package-cache dir, which - # is where we scan for dependencies - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n ItemGroup \ - -s \$prev -t elem -n EnvironmentVariables \ - -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ - repo-projects/nuget-client.proj + -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ + src/*/Directory.Build.targets ''; - buildFlags = [ "--online" ] ++ old.buildFlags; - prebuiltPackages = null; - }); - drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; - in - writeShellScript "fetch-dotnet-sdk-deps" '' - ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' - set -e + postConfigure = + old.postConfigure or "" + + '' + [[ ! -v prebuiltPackages ]] || \ + ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ''; - tmp=$(mktemp -d) - trap 'rm -fr "$tmp"' EXIT + buildFlags = + old.buildFlags + ++ lib.optionals (lib.versionAtLeast old.version "9") [ + # We need to set this as long as we have something in deps.nix. Currently + # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt + # artifacts. + "-p:SkipErrorOnPrebuilts=true" + ]; - HOME=$tmp/.home - cd "$tmp" + passthru = old.passthru or { } // { + fetch-deps = + let + inherit (vmr) targetRid updateScript; + otherRids = lib.remove targetRid ( + map (system: dotnetCorePackages.systemToDotnetRid system) vmr.meta.platforms + ); - phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ - configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ - genericBuild + pkg = vmr.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + nix + cacert + nuget-to-nix + ]; + postPatch = + old.postPatch or "" + + '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ + repo-projects/Directory.Build.targets + # make nuget-client use the standard arcade package-cache dir, which + # is where we scan for dependencies + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n ItemGroup \ + -s \$prev -t elem -n EnvironmentVariables \ + -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ + repo-projects/nuget-client.proj + ''; + buildFlags = [ "--online" ] ++ old.buildFlags; + prebuiltPackages = null; + }); - depsFiles=(./src/*/deps.nix) + drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; + in + writeShellScript "fetch-dotnet-sdk-deps" '' + ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' + set -e - cat $(nix-build ${toString ./combine-deps.nix} \ - --arg list "[ ''${depsFiles[*]} ]" \ - --argstr baseRid ${targetRid} \ - --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ - ) > "${toString prebuiltPackages.sourceFile}" - EOF - ''; - }; - }); -in mkPackages { inherit vmr; } + tmp=$(mktemp -d) + trap 'rm -fr "$tmp"' EXIT + + HOME=$tmp/.home + cd "$tmp" + + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ + configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ + genericBuild + + depsFiles=(./src/*/deps.nix) + + cat $(nix-build ${toString ./combine-deps.nix} \ + --arg list "[ ''${depsFiles[*]} ]" \ + --argstr baseRid ${targetRid} \ + --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ + ) > "${toString prebuiltPackages.sourceFile}" + EOF + ''; + }; + }); +in +mkPackages { inherit vmr; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix index 9014e60b4e..94fb0fa24c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage1.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, callPackage +{ + stdenv, + lib, + callPackage, -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }@args: let @@ -14,13 +15,22 @@ let stage0 = callPackage ./stage0.nix args; - vmr = (mkVMR { - inherit releaseManifestFile tarballHash; - dotnetSdk = stage0.sdk; - }).overrideAttrs (old: { - passthru = old.passthru or {} // { - inherit (stage0.vmr) fetch-deps; - }; - }); + vmr = + (mkVMR { + inherit releaseManifestFile tarballHash; + bootstrapSdk = stage0.sdk; + }).overrideAttrs + (old: { + passthru = old.passthru or { } // { + inherit (stage0.vmr) fetch-deps; + }; + }); -in mkPackages { inherit vmr; } // { stage0 = lib.dontRecurseIntoAttrs stage0; } +in +mkPackages { + inherit vmr; + fallbackTargetPackages = bootstrapSdk.targetPackages; +} +// { + stage0 = lib.dontRecurseIntoAttrs stage0; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix index 58304188af..cb482d7658 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.nix @@ -1,18 +1,19 @@ -{ stdenvNoCC -, lib -, fetchurl -, writeScript -, nix -, runtimeShell -, curl -, cacert -, jq -, yq -, gnupg +{ + stdenvNoCC, + lib, + fetchurl, + writeScript, + nix, + runtimeShell, + curl, + cacert, + jq, + yq, + gnupg, -, releaseManifestFile -, releaseInfoFile -, allowPrerelease + releaseManifestFile, + releaseInfoFile, + allowPrerelease, }: let @@ -38,7 +39,8 @@ let drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; -in writeScript "update-dotnet-vmr.sh" '' +in +writeScript "update-dotnet-vmr.sh" '' #! ${nix}/bin/nix-shell #! nix-shell -i ${runtimeShell} --pure ${drv} set -euo pipefail diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh index 3c5f29d8f0..58c307c0a4 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh @@ -6,6 +6,8 @@ set -Eeuo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" +rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) + release () { local content="$1" local version="$2" @@ -30,285 +32,171 @@ release_platform_attr () { platform_sources () { local release_files="$1" - local platforms=( - "x86_64-linux linux-x64" - "aarch64-linux linux-arm64" - "x86_64-darwin osx-x64" - "aarch64-darwin osx-arm64" - ) echo "srcs = {" - local kv - for kv in "${platforms[@]}"; do - local nix_platform=${kv%% *} - local ms_platform=${kv##* } + for rid in "${rids[@]}"; do local url hash - url=$(release_platform_attr "$release_files" "$ms_platform" url) - hash=$(release_platform_attr "$release_files" "$ms_platform" hash) + url=$(release_platform_attr "$release_files" "$rid" url) + hash=$(release_platform_attr "$release_files" "$rid" hash) [[ -z "$url" || -z "$hash" ]] && continue - echo " $nix_platform = { - url = \"$url\"; - sha512 = \"$hash\"; + + hash=$(nix-hash --to-sri --type sha512 "$hash") + + echo " $rid = { + url = \"$url\"; + hash = \"$hash\"; };" done echo " };" } -generate_package_list() { - local version="$1" - shift - local pkgs=( "$@" ) nuget_url pkg url hash +nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" - nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" +generate_package_list() { + local version="$1" indent="$2" + shift 2 + local pkgs=( "$@" ) pkg url hash for pkg in "${pkgs[@]}"; do - url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" - hash="$(nix-prefetch-url "$url")" - if [[ -z "$hash" ]]; then + url=${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg + if ! hash=$(nix-prefetch-url "$url"); then echo "Failed to fetch hash for $url" >&2 exit 1 fi + hash=$(nix-hash --to-sri --type sha256 "$hash") - echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" + echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" done } -version_older () { - local cur_version=$1 - local max_version=$2 - local result - - result=$(nix-instantiate -I ../../../../. \ - --eval -E "(import ../../../../. {}).lib.versionOlder \"$cur_version\" \"$max_version\"") - if [[ "$result" == "true" ]]; then - return 0 - else - return 1 - fi +versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC } +# These packages are implicitly references by the build process, +# based on the specific project configurations (RIDs, used features, etc.) +# They are always referenced with the same version as the SDK used for building. +# Since we lock nuget dependencies, when these packages are included in the generated +# lock files (deps.nix), every update of SDK required those lock files to be +# updated to reflect the new versions of these packages - otherwise, the build +# would fail due to missing dependencies. +# +# Moving them to a separate list stored alongside the SDK package definitions, +# and implicitly including them along in buildDotnetModule allows us +# to make updating .NET SDK packages a lot easier - we now just update +# the versions of these packages in one place, and all packages that +# use buildDotnetModule continue building with the new .NET version without changes. +# +# Keep in mind that there is no canonical list of these implicitly +# referenced packages - this list was created based on looking into +# the deps.nix files of existing packages, and which dependencies required +# updating after a SDK version bump. +# +# Due to this, make sure to check if new SDK versions introduce any new packages. +# This should not happend in minor or bugfix updates, but probably happens +# with every new major .NET release. aspnetcore_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new packages. - # This should not happend in minor or bugfix updates, but probably happens - # with every new major .NET release. local pkgs=( - "Microsoft.AspNetCore.App.Runtime.linux-arm" - "Microsoft.AspNetCore.App.Runtime.linux-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" - "Microsoft.AspNetCore.App.Runtime.linux-x64" - "Microsoft.AspNetCore.App.Runtime.osx-x64" - "Microsoft.AspNetCore.App.Runtime.win-arm64" - "Microsoft.AspNetCore.App.Runtime.win-x64" - "Microsoft.AspNetCore.App.Runtime.win-x86" + Microsoft.AspNetCore.App.Ref ) - # These packages are currently broken on .NET 8 - if version_older "$version" "8"; then - pkgs+=( - "Microsoft.AspNetCore.App.Runtime.win-arm" - ) - fi - - # Packages that only apply to .NET 6 and up - if ! version_older "$version" "6"; then - pkgs+=( - "Microsoft.AspNetCore.App.Ref" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" - "Microsoft.AspNetCore.App.Runtime.osx-arm64" - ) - fi - - - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } -sdk_packages () { +aspnetcore_target_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new packages. - # This should not happend in minor or bugfix updates, but probably happens - # with every new major .NET release. + local rid=$2 local pkgs=( - "Microsoft.NETCore.App.Host.linux-arm" - "Microsoft.NETCore.App.Host.linux-arm64" - "Microsoft.NETCore.App.Host.linux-musl-arm64" - "Microsoft.NETCore.App.Host.linux-musl-x64" - "Microsoft.NETCore.App.Host.linux-x64" - "Microsoft.NETCore.App.Host.osx-x64" - "Microsoft.NETCore.App.Host.win-arm64" - "Microsoft.NETCore.App.Host.win-x64" - "Microsoft.NETCore.App.Host.win-x86" - "Microsoft.NETCore.App.Runtime.linux-arm" - "Microsoft.NETCore.App.Runtime.linux-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.linux-x64" - "Microsoft.NETCore.App.Runtime.osx-x64" - "Microsoft.NETCore.App.Runtime.win-arm64" - "Microsoft.NETCore.App.Runtime.win-x64" - "Microsoft.NETCore.App.Runtime.win-x86" - "Microsoft.NETCore.DotNetAppHost" - "Microsoft.NETCore.DotNetHost" - "Microsoft.NETCore.DotNetHostPolicy" - "Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Host.linux-musl-arm" - "Microsoft.NETCore.App.Host.osx-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm" - "Microsoft.NETCore.App.Runtime.osx-arm64" - "Microsoft.NETCore.App.Ref" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" - "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.Mono.linux-x64" - "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" - "Microsoft.NETCore.App.Runtime.Mono.osx-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x86" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" - "Microsoft.NETCore.App.Crossgen2.linux-arm" - "Microsoft.NETCore.App.Crossgen2.linux-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-x64" - "Microsoft.NETCore.App.Crossgen2.osx-x64" - "Microsoft.NETCore.App.Crossgen2.osx-arm64" + "Microsoft.AspNetCore.App.Runtime.$rid" ) - # These packages were removed on .NET 9 - if ! version_older "$version" "9"; then - local newpkgs=() - local pkg - for pkg in "${pkgs[@]}"; do - case "$pkg" in - *Microsoft.NETCore.DotNetHost*);; - Microsoft.NETCore.App.Runtime.Mono.*);; - *) newpkgs+=("$pkg");; - esac - done - pkgs=("${newpkgs[@]}") - fi + generate_package_list "$version" ' ' "${pkgs[@]}" +} - # These packages were removed on .NET 8 - if version_older "$version" "8"; then +netcore_packages () { + local version=$1 + local pkgs=( + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref + ) + + if ! versionAtLeast "$version" 9; then pkgs+=( - "Microsoft.NETCore.App.Host.win-arm" - "Microsoft.NETCore.App.Runtime.win-arm" - "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Composite" + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver ) fi - # Packages that only apply to .NET 7 and up - if ! version_older "$version" "7"; then + if versionAtLeast "$version" 7; then pkgs+=( - "Microsoft.DotNet.ILCompiler" - "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" - "runtime.linux-x64.Microsoft.DotNet.ILCompiler" - "runtime.osx-x64.Microsoft.DotNet.ILCompiler" - "runtime.win-arm64.Microsoft.DotNet.ILCompiler" - "runtime.win-x64.Microsoft.DotNet.ILCompiler" + Microsoft.DotNet.ILCompiler ) fi - # These packges were added on .NET 8 - if ! version_older "$version" "8"; then + if versionAtLeast "$version" 8; then pkgs+=( - "Microsoft.NET.ILLink.Tasks" - "runtime.osx-arm64.Microsoft.DotNet.ILCompiler" + Microsoft.NET.ILLink.Tasks ) fi - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +netcore_host_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Crossgen2.$rid" + ) + + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac + + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then + pkgs+=( + "runtime.$rid.Microsoft.DotNet.ILCompiler" + ) + fi + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +netcore_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + ) + + if ! versionAtLeast "$version" 9; then + pkgs+=( + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" + ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac + fi + + generate_package_list "$version" ' ' "${pkgs[@]}" } main () { @@ -361,6 +249,7 @@ Examples: buildAspNetCore = { ... }: {}; \ buildNetSdk = { ... }: {}; \ buildNetRuntime = { ... }: {}; \ + fetchNupkg = { ... }: {}; \ }).release_${major_minor_underscore}" | jq -r) if [[ "$current_version" == "$major_minor_patch" ]]; then @@ -381,22 +270,37 @@ Examples: aspnetcore_sources="$(platform_sources "$aspnetcore_files")" runtime_sources="$(platform_sources "$runtime_files")" - local sdk_packages aspnetcore_packages - sdk_packages="$(sdk_packages "${runtime_version}")" - aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" - result=$(mktemp) trap "rm -f $result" TERM INT EXIT - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: + ( + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v$channel_version ($support_phase) let - packages = { fetchNuGet }: [ -$aspnetcore_packages -$sdk_packages - ]; + commonPackages = [" + aspnetcore_packages "${aspnetcore_version}" + netcore_packages "${runtime_version}" + echo " ]; + + hostPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + netcore_host_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + + targetPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + aspnetcore_target_packages "${aspnetcore_version}" "$rid" + netcore_target_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + in rec { release_$major_minor_underscore = \"$major_minor_patch\"; @@ -408,34 +312,35 @@ in rec { runtime_$major_minor_underscore = buildNetRuntime { version = \"${runtime_version}\"; $runtime_sources - };" > "${result}" + };" - local -A feature_bands - unset latest_sdk + local -A feature_bands + unset latest_sdk - for sdk_version in "${sdk_versions[@]}"; do - local sdk_base_version=${sdk_version%-*} - local feature_band=${sdk_base_version:0:-2}xx - # sometimes one release has e.g. both 8.0.202 and 8.0.203 - [[ ! ${feature_bands[$feature_band]+true} ]] || continue - feature_bands[$feature_band]=$sdk_version - local sdk_files sdk_sources - sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" - sdk_sources="$(platform_sources "$sdk_files")" - local sdk_attrname=sdk_${feature_band//./_} - [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname + for sdk_version in "${sdk_versions[@]}"; do + local sdk_base_version=${sdk_version%-*} + local feature_band=${sdk_base_version:0:-2}xx + # sometimes one release has e.g. both 8.0.202 and 8.0.203 + [[ ! ${feature_bands[$feature_band]+true} ]] || continue + feature_bands[$feature_band]=$sdk_version + local sdk_files sdk_sources + sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" + sdk_sources="$(platform_sources "$sdk_files")" + local sdk_attrname=sdk_${feature_band//./_} + [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname - echo " + echo " $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources - inherit packages; - };" >> "${result}" - done + inherit commonPackages hostPackages targetPackages; + };" + done - echo " + echo " sdk_$major_minor_underscore = $latest_sdk; -}" >> "${result}" +}" + )> "${result}" cp "${result}" "./versions/${sem_version}.nix" echo "Generated ./versions/${sem_version}.nix" diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix index e2a7924579..4018790882 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -1,138 +1,200 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v6.0 (maintenance) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0xpki5wnl629zcih2d70vr1cgrhwr10mf4r89dyfm4hmwfpjz0pl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0d26nch9v7aaxb6m8xjbwbbag88j8r7igbg512p242g7a03xp743"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "06mdbp3z8pvj6q15agzdgxiqdvk057k0ld0q6q2bcy5i39x9744m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "1gyxvfaigp8i7x7yf24xzk4z5p638zxfa0pmahcyly0afl8s0i2v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1q5aigywyx1jcm0ws2gql8y2ns6lrs9q6h85k3l8kamrbjls51jf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "1m1qac3mpnhdz3xpjn3a659nis10v687aacjrgrlbmjffibh0wz7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "0rks3lj4vwxlv1w6bk2v0z7lm5i22hzf46qcmc3qxndwmlp1frr3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "101ibi2xfy9wnll7qbm257ifsmn4plqfa5649i331481m6hjscjj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "14fgl7m0r9q3j0ab2v2g0jkby28d6c7386n0dx4zd1j516kcrzpg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "00ky4jnrpq5zcpmrkjny74j2k466kw7sj4sbh361wql3q0ma9nm2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.33"; sha256 = "0fx2zh5266inw8c2a353gl6sfcssnc4l952sc83rpl48x0xy5hqr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0iwxzkdlmhd4ks6ivrfp5hgwgxmr2cbx8jvz7vzj01v3zbv8m8hd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "0r1knq9hzvx4qibrlvq8809r6pf3j3inq6aiw94dyrrkl1vfz3rr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.33"; sha256 = "03rxxv7vlaf7pbdcbyv2q93f5d0w7v9mhi2qy2nyiwscx1b1rrj5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.33"; sha256 = "1qazlv2aczbrzv5l4l0p94ix7q321i3j3jn6fcw0yxlgznjqw1dg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.33"; sha256 = "01kqcqjp2f5bx7nwx7ma90r7pjnc9vdb16k3fs1v3lvdb83mlwjn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.33"; sha256 = "04vrmd5blrqv2immaw4xlwcc8krlpnckdlxl5jg9mr7azq657z9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.33"; sha256 = "15ki8y9607dw4ldixy041v3s6ld36j7r8gdhn31y6ffp0ij0s9p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.33"; sha256 = "153hdch33nxbs4lwd799rvbac8kvbg1jbkkq440fmmy7001zdvmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.33"; sha256 = "0v86zfpln81b7r5yxjf676xx372kmwn0fcciwnnx6xks3i9qdzy0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.33"; sha256 = "0rcg68qj84584v6vij6kqk2jrmgci26rc40cmf9ibc2h65cm3hjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.33"; sha256 = "1605avj9l3f6vxghkwzvqhyx5n2ipyb9y7d0n32777pg0kjc29iv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0f92sp9120a4bqcws53migvpbv6iixfqb43jp38s3sgdv0dx3i1l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0xn1ckjg0zha3wib7pin29i0b3390xmanfrivm29x98mj644md51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "0yn9cczgh2clmxl92jca176dkvqn33jc4jyl25s41z9y58gbc9nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "18b8pf3dkbgav63yb2szdi96v6s1brn6yhbragzsw9iiwhvqxw8n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1c4j03a7dcxvb0lajllnkyi7jdjzvvfd739mnhpcy5dcfaz625yv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "09hbn47rn8yn5646p12xzw60ijhshrwav5jsha2hn27d4i57ls5j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "1x1b6hc4jg3l3fypdll6rqq29021v2p8y5piclyhsqwwhlzjb2cl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "01pvlmwhdhp6ny3h5m0rm5mahkj33xgmrbcldvh1qsilwb4vqvsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "1yl8gy6abj4c7n2mkzs6v9mjzv2bhwdny7za6pclay4m1a4kijlf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "16ij3bf9kil06kh0ca1csqcg3x5ang46z9pd17y6f08im1l0xfj9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "122aw6hy2xws6wi00g3swcp7ria1qwzrz4ywakwbqjac0winshmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "186r14nlx93g053yhxcq9lfai2j9w7nrjiff1y2q5bmnkfnbd38j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12mxxvzi9rf53lj3vz2q8fpar915ghdhixpkm9q29kz8ly3hbv1c"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "0zjpj744gld18fni5gwr94yp5bmf7hk8k7mcpg5s34pyyzp3zd0q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0yzs527173v46x77if2ark872sjx0a1spz08xsm9d3bpkx0ncyd1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1hf30pxgpc1kcmfpcnd4v69xrav99npsv7apzj55fy9z83a2djgy"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "13vpx6vayxqk7g975bgvdslcfwaxvs3rj7ikn7ir3k0kivsp7dlq"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1i60ry18padghnnwlyxcij0hc8361mh4mnsx4wy1y8ys45s5garc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k4h0j73sjd1w1zkcq1qdz2kdmrjnssr5w9g7xx2l1djkvw93lkv"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "09kzlvz9ddzj4x8p9qnjvb2xkzbhwn2phs4sxwa8305janbhypy7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12sjcxxg0l2q3ks4s8lac2l5yb7xn691idww895jkxar7d47vjy4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "119szgcdrbxqqmmz59phw83b7kv0vmfl2pafhnmx63wvyda1717x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "15fmfgl0ga7fkz4bw74552ljs2l0iw6sm6xk0v90k6qdihy4z9ay"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1a0dvvsivcsr6r2ln8r0g7d08swh2pa5fnzcabif833x7rxlriqz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0kv445lsj1kkp2mgayp211i5q28j808v54z4fxifda3cynjpsyv1"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "090v3q7d7i1h4a8zafhhh4h4qgws7i4vr20px4x3sq2lcigqky28"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1s9ia1hh82pnzj0w6szjyg56vb9w9h1rlnqj1nb6nk6vj3a6ihiq"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1n5j69z3pvmas6a6p5c45qn6mzdmb8ns4yl2if1cc69n3fs6axmw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1zbdbainvfx8m1228ql3zs2zs2dincl1fwgfivbwg0pb578l70ab"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "08aqnwzvxhvk9dlxra5f022hjgcsqgcs1kpdm09yy6yma3xd8v6y"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "04asl4lwf3wlrghccip463fri9sgarbgijky8052c1caj68bmscv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0x38bnmilkkc2c3i62jkn3vj3visjx87drsj3m3k0x6psn6h3qmr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1hkfp1p8z6ada8z5ilbn2j1pw6mqxw69r6719rcv8ggngpwwd21y"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "099s3fcqjl2sjp3fsn1xb3yq3qjv5nwsmy40ipr2wrf17lasjz2w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1wbzabbc7br7my9f453n8jds29ry2mx3l3b03b4bc3zl1ri6spzn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0jwyfcw085svfr1f3y5xbpap3mhszpax95l7rw6g77fp15qfdzf0"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0yk7j0d8hgkb9dkgkxrp19cjg09sl3vycpz9ff16md8jjakd2ywz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "06156xl3wia310qcfjahs5ni58j42pg8s0gjy7yzz7m7ixkig1kp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1sydbax1kcg8nbcry6h4ik54gk2q5swbw5cay2w5xl985p6dwkjg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "00pcsz4vd9mscrwbpwlqqnlacw2xihxgvlp6xw0ycjsdrkq4621z"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0l9j0fqpi22b791xs1vik98gr4zz004gxni85zmss64pqj7zabkb"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1zpciqzf5g7sygj1iw3r575msfmr8bs56j68rx7jl90hzrdf14mr"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1qwbplriqj5b720lnl4h9848pixxagqqa7k73fa11x2r8yqn399b"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nyffsb8lvj23x2xg38ngcbg8bh3apv9px1n9slf8jf9qlb6hnhc"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1ynzpwx6mmj3w5x37ivqjjk5is9hmgwwlb8p50rjhidhc99avlwj"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "00if84zqqkrl7gdak1hx8l93ixidj4sgxj5d6wjji93iiph4m9md"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0vd5xvmxvlqc6k1c86ib0fk582899vvkfnsnnfmw7f6s8271jcs3"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0lkv19rqhvykdvs3lnbv0lda66s6wz52ad244yirmmr6gx54a7jg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0g4aqyz0685mh4b2w3d96q0m7138w3j5w9ds9yli51gdlv0xpy13"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.33"; sha256 = "11qqd4vkjmypah5lg9y37ma374a7kwvrrqi14knc9rzi038xdzc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.33"; sha256 = "0ghxb55azggk0cs8aasv57w7n1ag7wb981dfrqrag5cfi6gdwwlk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0vglrj3yx5ykxy6lbpb6frsxcp3109rpl6zl859vy6vdmjskpdn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "1cnm270drlfq1f839r5frljfg8q4xqn0fqicf97bd2cwd1nyx8gl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.33"; sha256 = "0vrg6xbzhi8mbp6nas6admh6pja3akc9synlcpjh859mg9qr8886"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.33"; sha256 = "0vdabiysl8hjaza06yfmk2x45i2qhr092izx820qv8clfdggmb8k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.33"; sha256 = "0zlsdg3bn5i1s09p9lw7xfdcfrm0ii9a1zbfqhvqgvs4zwcvk17n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.33"; sha256 = "0jgmmy5y2ci29izn0w1dh73xvrmvmypbyxjiq1kxjq1si5j465mv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.33"; sha256 = "0l7bh7mfha16dbpmlvgfpkgblw0p00x52bcki96pkjldgqnf2fwr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.33"; sha256 = "03bk8c7shd8sfvlw8k58aq95yc094247722fs2s2456j1gsirqqj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.33"; sha256 = "0qzdhg82sxa1srjh5lpnjyyz6lww00j1b4sgm0581ya1cjz8b38c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.33"; sha256 = "1sn5q5q0qwnj5majqsfbzgirv0kgxs538ri9cbrp52sdz017c3a1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.33"; sha256 = "1ddmaapazmsvwmry58x117hjl2l3q7r52l8wk45h820q46v8m26v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "13l2xvm9zlb2b8xmznjj341nrknhaqcz7hlg4ccs9rmw32p0zvdy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1fiqsm2nwz45gxrakbkvfcsp3g8l0nl678df0k52ql4inn77f7p3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nrnwgpgqrjr1pipjld74h1nk2m1gfk83f6lid4hvznyvi4181ph"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0n8hm8dhl1k70iag7n6pkzi9nfc56xkz4y4xsn6hy792nw17haz2"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "02cjzf07kp8k2vb8hmf72rz6fx2y29biqvdhdva2jj2j1768a9gd"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k0cc1swhcrf6ydw0qkx52ikc8mnjv9i0v963yp61n6dhsa5cv2z"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0ascpl1c8a710ggmxvkxw63rgp1gwkjdr03mmvwlwiwgxks5z4d0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0ra2v9l3w9sid1hg21ss7lawp8mgdhv1g04napa4nrv84bcz7kkh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.33"; sha256 = "10hswinnzm4mvhaqj1kr352lx7a7m2c6dc96q7p5dizlsg2rsh54"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.33"; sha256 = "0h990mf442c2s9k3vfis7r1nhf36bm2xsmz8472vlhdgym3bvr9h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.33"; sha256 = "15s3ihn50jwh3wdswy2563fl8rjdn5lxwhfcsd8xsjp9j5ixpm27"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.33"; sha256 = "1vcq2m5bcrkvqdphjcx7lz780rgddi4h2sbwhw5ysxmns5nkpim4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.33"; sha256 = "1jh4xm42mzrd7xqp96qvvinhz7rs9qfal7243nfiznl4y9az4k85"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.33"; sha256 = "0zfqp5axbl5066655wsd4435194xfnfbs2k8hb1dp82a74fwz2p1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.33"; sha256 = "0kkqj31kxdsd8jzna25lh6f1kqlwpx5pfwgdn02qr7dzln8c25vw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.33"; sha256 = "04gc5p591kmn3divsqqn8s29x1l3klcysj4zskcidp1dkclx1dq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.33"; sha256 = "1aik89f8pjg5vrz1lx6g0ccsbkcf38mw0591dbryqjwfdzp08g2f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "171qj7ajbc3fhld7dbqm04xrqmqmhbfmh9vpsl6sqkgp58b8vg11"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1pf31zyfxd68cs6pklhg5g8izp8r5jzkcxgq85px62ym6xp83r0w"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0in7gk5bi69gmm992cs4apj2kaxdjsdmfxcrl291822mi2ai3d2r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "18m6qi5hjlscd8lkmc8a513zycfhm64mqyd7g032j02vrrz1d20y"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1jq2mc722g8xc7wggyxayfvhan9dplvk4rbp9pjkpiby25mlhj8g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.33"; sha256 = "1ighzhn8ngjnv53nn98b8n8krwh6k764r2kkxwfccajwhpn9sb23"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.33"; hash = "sha256-GcPiO+iI0JsHYlqURAmzWjOnDX2jDCUY4jYaIwr8ojs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-SboOaKgRAWf8Ce2mb8izqvTxGNYsKAbgNIDGmdwaMpo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.33"; hash = "sha256-BiGUcXo1FQTlZdR6ndhUQ8lrYG3KaGXNXRVF+Fc3L28="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-tkJtIwdMSbz4VNyTnz/HQcV8LuN6PAAiN5p34aHhSog="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-Eo22rJu2roKFD85Fme3hSYqoHE2YdehHAW+kTi0J2aA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-LOwFh6fozyRwqvP2CBt8JaSsrkNY/D0kHcXlFP/uvYo="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.33"; hash = "sha256-pMY7bdG2du0Lh3xpAUls7WWAzqenMwlvw3tmtkoVmO0="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.33"; hash = "sha256-BU3yVfKE2h+dHUQcqhxOOp8Pbdwbm3RxPy3/KkjtBMo="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.33"; hash = "sha256-4YrPHTlKoNvCgmgKvZx1naRQBiFN81KMMaDQ1VW52H0="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.33"; hash = "sha256-pECdxdP0x1buwSaxZpioR51ORRl5BokV3JXUb23kGoI="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-MOW9RvWvQbrFIehX3UVdZjhoQz46uj1m0oIJQlwFKUE="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.33"; hash = "sha256-R9TbY5HpSt1R08xB3mmxTWZE3TBFeK4bH5BLUCyMQ5c="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.33"; hash = "sha256-ArfQKZst3BbZ1J9I7Rmdg4aehEYWY71jG7bOkMot7BE="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.33"; hash = "sha256-fBfBkKW/nYwFsO1xd0u/nOIZnIG0CGW/RE23PsOQeE4="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "6.0.33"; hash = "sha256-c+3lplcEkrMapHA+nQPt4v2IkeiAvif6u2Ux32V5Iy0="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "6.0.33"; hash = "sha256-qHleUXickhYB1CIWGWzsMB/BX61fuJXcVchkuKAOwLw="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "6.0.33"; hash = "sha256-wxAzeoLe47TV5GWXXVWRyC+AKqBuTJ79RqS0DwqJpGk="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.33"; hash = "sha256-9IIvr+MVkup8SygTV0HIHObHQt7gNAEj+0kYanmJ83Y="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.33"; hash = "sha256-ReYcVuhM8+it8FhEWNM+HLTiRsJi+8Xauscpus/uPQ8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.33"; hash = "sha256-NMTRG9jt6aHRuHKQhV2P0ex194t1FM0ZXkQBEdLVIjk="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-LKtXdCHaIx88J13bSmANZiAGgYyse8qtha+pi4LPwMQ="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-e9KR+J6yBSp6Py/xkrW2Mtc2xW84YDZ/4KFJPY4EkEw="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-x18Pl1WygIEU75poeIXlcP3ZxdrS4nRRJ/K3lv6mfyY="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-xMt9SDtZ9SlLQpy3GJKx/SxfqGCKIk30HFhQ8HpnUos="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.33"; hash = "sha256-E636XnOUoY2BQP1HkUCGWMRCupjVeQPUVxIiqn1cqm0="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.33"; hash = "sha256-g5zbB1DnCSKuCOWtF09GEqGn1uJLdlTN6kqdnSCzRjQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.33"; hash = "sha256-rwWOpf2Pdg84c8bKIUcMYuDTI0kXUELL/nl9psSmX+E="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.33"; hash = "sha256-obRKiJEVpZ5E3TE7q2oHaYwFYhI23rMiHwp+8ORkwXY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-GLQ/7vf+kqHLu6yeiSY8rq5yPUmZvxKtQ6HRR8iRV34="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-oXlmQZ93jZaq7gj8q4MCXWpx0MxKuHhON2SPE44o+ns="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-/skm1EA/eVeK/Fedra9Naavck9mkWXZdZTOw+/oFw8E="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-mLZz9Y4TzJHjsTMemYfeXXHHqG77rXLSOxN3r7bpd48="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.33"; hash = "sha256-9oS5Gf9E74c3xG79oFKMoGbHmuuH03QT0CEWu8Zrmn4="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.33"; hash = "sha256-ToaiqVy5qonomAVBg5PO1GgrPKL4Cc1BZTJ0z/2LquA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.33"; hash = "sha256-5iYNZATXOePDsLA9lI80o1Gjxw4E+B4bJbwdYJJHcZY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.33"; hash = "sha256-2xdhvnKsFc8utDWN09zeXzZ5op+WUqkoWLuzdtQAkrA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-3mzU+lDVG+8TqO3OoNnDmj0JhQCuqNxpS3PDvj+3WCE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-m+m6kJGKBSYKQH7K+FZWT6eY3TDkRsbgy5QPxymhWhE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-ueIBjdXXdDBHHVLndlCXOu4h97BTChMHE2xOGqtdaHQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-PojG+X32PbRZTuGYnAzvuBp+gxR20Vg+Uk2Zj264bsI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.33"; hash = "sha256-mTvhLH6NynlNipMtUToAF3C63rzubVrvaiYo6OqB61A="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; hash = "sha256-DaKK9vpjByD/Pn9L1BcTufbHHyzX5R2NnqTBStv8nUc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.33"; hash = "sha256-g/3W0QDx58TsJCHinDefR5EzVD3Dp0cLVNdXOTdpGIc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; hash = "sha256-wrY7taxtG79TQfQbenMCYVzWdXZm3UWN79OX7ofM9G0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-vu0Prhi85qQZI4/C8xlW0M5sAxlS2l87WmLRn+rugo4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-4x53jrWRUCzKBK6hY6gFFL1xNXN7rqlyf4V8bkXVOLo="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-8AYUSNze/g1Ji9S4gaZ7oYppAySnUXnjDVlm/O7jNts="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-4it4ArciHQ+N1Z148mc3hTmb4p/X2PNUBGcGChuqEFk="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-lZCTehqxeLYENhg0CuYpYO6GY3/tP1UCNnJf9MddrRo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-VnJaB1pt07GDdmOasNpOzMp7Mkiqns7t6as4cSVmeAY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-3ya2Hio+/UB0EdRLwuQYFu/ZzAmKSZFor5QJ+D5jyXo="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-/YQTVPObD9OrhU5dQV3dYM+zBuLwpvJrxbiv3Nj7OoU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-XqVPPIwNmwnSBrObqg2PgAotqSiFHL7In+6oB+hz1ZU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-H8dMez59DOTiUuxbV9QVkGsE2nkgI0tFNlmzHfXeDag="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-YXt9pfVsqOZid+STshFAEglcYgjievWquHMGqWkhZE8="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; hash = "sha256-W0SgEXUKeOoZVPUC5fpHw9zyyfydCOdPPxHdF5Xb3b8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.33"; hash = "sha256-Lf1TDP7q5JqeLLTTNpm9NE/EGKedcFVrFBtnukqreRM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; hash = "sha256-FvGON+QxJq7/U3lBb2xeQZttUmxfi+WH2eqt2Ya7aKE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-SPiJX2RUYD066ReIvEk8mj9MIIEQOvWRIjDE0w4eGyQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-OMJo1JDbTGuWDRJbmgNMPK1tyvPya8OB/PYKBGFQMek="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-vHZltBs2GcaCi4J6oi1atf1qLC6ElWuU0aruO34ystg="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-S4FD0SnrgsfXju5xFyizsQn9hf6DYiREqKi7baNabf0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.33"; hash = "sha256-uxZDZIk6YNlnwFF2v66vu+bdx4EtcGB/TCIy4Yuv9Uk="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.33"; hash = "sha256-OY/vdqAzZ99I4lEZbOOQw12TE0AIb5pXxKTvDxO2M2Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.33"; hash = "sha256-k3LenomOlacyzq4FlBY/TwV7+ClbK4U0A/O9r0pZHT4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.33"; hash = "sha256-9KHubWicibZOcixiByzuBKPnJM2u5DSQC9jR3MAR1bI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-7SWFzAlSSCnUbrBtHFcSXnRnfhbHVYjWFhPdeYD7kgk="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-X2xWlIbN2GCuHyZtENOWtiI2oyh9YsCbNy4zyHVgDEw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-oJFf9OyPR075rnWA3OTkL9yXh+F97l7fA+EoxAK9TCs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-cM7z2SJoZ0vUVZaAFzZsr6LLFT1aB/FgaFEnPmjaQmU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.33"; hash = "sha256-EuMc9QvSFCK00E6Ic4ggCTBfElaoTMTpdho1qA9Dcw0="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.33"; hash = "sha256-53MAV3RO1kXzy5IpdZDZIOhoUzFqWHn7+A3aWwdTONQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.33"; hash = "sha256-tu72AwDH1+oAIXjOJcNbeyKm1s4pncYp0avbMSBrcJQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.33"; hash = "sha256-smh6SiTtCAuFglqWrXiGGsoIDP9dhGuIKdYjmw+xCyY="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-XHypFT3BZS7yjYD4qrktW+KB/Vg9WO3GlVpQiZkbOiU="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-9l9tYg70D7bIGmANOnoVPiehm0R2FOKSryevw9ZSf/E="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-wP3mcAnXnfMMz4eW1NX9GtZx1V29+OFCdlsXBDhznks="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-n3vRppIStWqCc+lf5vegOoEnWQo39/lmS2s+iBqQZ3o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.33"; hash = "sha256-DI2FvmRB+YAKqE+TFSQAnFPzvZf20gJl1kF1LdCD7WM="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.33"; hash = "sha256-I2cXLq282Y4Hqwwb4j4UIpZKzwdbzGV42LTzTSQdemY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.33"; hash = "sha256-wP+GUxx6dtOt5ZExByyvU5zRuznGye5LPisgS6/7Bm0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.33"; hash = "sha256-lIklP4WcYw09ZfEWj67YQYAkMM6G0na9G3Q8SRg0K/Q="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-d4YXZ4+nnv/98fIBjd4VRKISbdFQSccwCENFPmg3JRg="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-T07ezC0o0V648IoVvrguWMxHyowEGp/ZsuixGbpazes="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-PwhD8MxNS+YB7+bS/TqMXXCmqMWY8rt4ZrqmtsnX7AI="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-ay71j8SXGK3rLyja/ggA/5P8UJpxB91DOkuIeLEDMlE="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.33"; hash = "sha256-UjItoakBkTBGTMQU5TC9xFbt4imiLnwotTx510VcMYA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.33"; hash = "sha256-XcJRWTFQsBWTqwwQlo2I7NUsxcTTyLjNJqgQJDEyj2U="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.33"; hash = "sha256-S2+8yeI0ahzgbpStXF8fQ06oaqkZ1AKHt+bCBnml+wY="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-uZLgWv4QJCpPz8hIU/RCuTpdyyl58Bjk8/q84j6O7P4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-K6VhsUdZ9BCUG2cehfFTvceLCEqQUEuBOKtIHDO9i+M="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-DFpoFsXJSeSoTjb0m/ZVAy70FnsWjddFH0JuipZ2zts="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-ktOtUmKwRSgzKBctyvmrMOlYppR4xzN64UPWajq/3/o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.33"; hash = "sha256-QQ12AvhNi3LzYilmNIrub4Kd4/vLaSxVLdJyDHDBxeo="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.33"; hash = "sha256-7/7MpglFhvZJb8AaNA4zDQm/pgRPbLEUkAOnDOqhz5E="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.33"; hash = "sha256-OybB5ATvnnPEsKAdn5a/UdjSPcT78wlf38YNmuRWBZg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.33"; hash = "sha256-jso4iQqVeEXZNeofbxuHS+wva9pG/1mFPYzIpYx/iPo="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-raZK4I1xpCglN63I/jSRLfY4EkUdhqnaOzRPjD9BLgI="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-QzMZjkDauMOrs1ZbN/dOCQlUpgMrGsTCNAzT3evupW0="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-Tx5FSn8m15qjJ0Q0JcrnRhujGgV7WTr0btNviHMKe1I="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-I/jbwabthRKpT7olXuTgaIRTATapDS4WgbUgA77Hijw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.33"; hash = "sha256-24iKtiEYCAQLmRxRUfLBgwoq4Qmho+Jz5VvXr65StbU="; }) + ]; + }; + in rec { release_6_0 = "6.0.33"; aspnetcore_6_0 = buildAspNetCore { version = "6.0.33"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "12b34fe1d0a679ff63db4bf002a2988194d9e64d0e107d128c247821dd939a86eced0fe453c0638d3742dac3a32e533792c26299400fb4fd5566b75177e66875"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4ac9397f-3f4a-4cd0-aba2-35e7f1b47396/9823f50c32028899f430bc3ae87251b1/aspnetcore-runtime-6.0.33-linux-arm.tar.gz"; + hash = "sha512-f6jM4xyaoMg9/RZ7ehFsi0o00hsRVO/HgbwqOMFNNQ54tbnub7jjgU5k3sbJLg8r9cXMmvkMc+o4zLZlQGBBdg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "7a60a77a306070a3b94db1acfa73938b6880cd079bdac3e5cab174a47af467b9208e9f41d8e12e080831d528151cdaa5b660bea5aa6fe537ec144543c0fffd95"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"; + hash = "sha512-emCnejBgcKO5TbGs+nOTi2iAzQeb2sPlyrF0pHr0Z7kgjp9B2OEuCAgx1SgVHNqltmC+papv5TfsFEVDwP/9lQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4641b35-5b85-4250-9913-0f6a2c276888/bd8483d09a767f6c19f9274da2819624/aspnetcore-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "f8dcf3d6de7a34d7fb402fd1ddf55bd810cccb95831d12312bc7607c6c7de8a46200c66d7e753250103961ba2e97fa6a85206b49442e1aeab1e290ec69bb55c5"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"; + hash = "sha512-ErNP4dCmef9j20vwAqKYgZTZ5k0OEH0SjCR4Id2Tmobs7Q/kU8BjjTdC2sOjLlM3ksJimUAPtP1VZrdRd+ZodQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/74fa4afa-a6d6-4c32-8ef7-fe88148f10cd/c887bff014d198532ba942988cba124b/aspnetcore-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "26a2f1d6cb3ef9df5b6abc16e025fc2e9aeda386b5da53428abae67d76ff007bc921aec60cff9675dbb7291db7b75c5a7bcaadb54e8c04de59308b02dde924cc"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/e9b663a7-2199-4111-b18e-5ec1f2f2f87e/1746ce0319914f58806f523c6f6ed24d/aspnetcore-runtime-6.0.33-linux-musl-arm.tar.gz"; + hash = "sha512-V0q861fybhX04s60g3Zh4ZLECJhoSIDgeLitTPyPUG4lpQ883HJ24XqVVuleK5LrxtQadKZWJEGA0nNBSFqc6w=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a4b5cbf6-85d9-46a0-b698-aaf3cde78d34/e1d46fec4ac226e170ccbacbf111d911/aspnetcore-runtime-6.0.33-linux-musl-arm64.tar.gz"; + hash = "sha512-PaV7PeE02zjxcJRRjRZlM1ZJHPXWciKyw31yDsEAZE3suPs62NymRRNO+6e1e/Faol/oS5oScRqoDH3gxghhtA=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/94348e55-d279-4667-abf6-00a70cfa4773/67a06176a4ac8fbab11013cd728ed823/aspnetcore-runtime-6.0.33-linux-musl-x64.tar.gz"; + hash = "sha512-9aQ7C8HIMv1wzfpP4JhJYCdggxEzokEvX30llJbM0NxlmZunek6NSwanYUuFHUeX+S1cfFwcJvOWQrde3P8Twg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/74fa4afa-a6d6-4c32-8ef7-fe88148f10cd/c887bff014d198532ba942988cba124b/aspnetcore-runtime-6.0.33-osx-arm64.tar.gz"; + hash = "sha512-JqLx1ss++d9barwW4CX8Lprto4a12lNCirrmfXb/AHvJIa7GDP+Wddu3KR23t1xae8qttU6MBN5ZMIsC3ekkzA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d4641b35-5b85-4250-9913-0f6a2c276888/bd8483d09a767f6c19f9274da2819624/aspnetcore-runtime-6.0.33-osx-x64.tar.gz"; + hash = "sha512-+Nzz1t56NNf7QC/R3fVb2BDMy5WDHRIxK8dgfGx96KRiAMZtfnUyUBA5Yboul/pqhSBrSUQuGuqx4pDsabtVxQ=="; }; }; }; @@ -140,21 +202,37 @@ in rec { runtime_6_0 = buildNetRuntime { version = "6.0.33"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/250c78ac-a53f-4679-ad2a-cc31fa4c4001/204b39eb9634a8dd9f39cbcaf56030f2/dotnet-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "0892015544d8903999f8e0fadab6b4b91eb180e495fa5e36c1a755b1d42e134858b7bdbfd60d1880650d9c528d07e31b9ccfc73e650e5d890a955902a89139cf"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/19a5a6e5-87bf-44b2-b7ed-ac44e9a253b8/00fca686dc0139022528dbe5f6e0f0b3/dotnet-runtime-6.0.33-linux-arm.tar.gz"; + hash = "sha512-wzSbHJi/jQt50NPeXBJ5L73UrvHAS20MEV1aplHP0uhkJSEXCzEtsMtvrNBXlYs4fGDrauW4KOIlAwDvvW8xlQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/694cd8af-7e9f-4161-8c1d-1c9a7b1d074f/d3a8dc90d971ec4f135f6452c176dc93/dotnet-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "c700d4ae3e361fa2a390a8fcf294a2277931b0ea60bd4a2f0ec2bb982bb6c618ba002e5955c3ee96807207b256e10289cf1cfa372029b758aefa6bf1268d45fb"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/694cd8af-7e9f-4161-8c1d-1c9a7b1d074f/d3a8dc90d971ec4f135f6452c176dc93/dotnet-runtime-6.0.33-linux-arm64.tar.gz"; + hash = "sha512-xwDUrj42H6KjkKj88pSiJ3kxsOpgvUovDsK7mCu2xhi6AC5ZVcPuloByB7JW4QKJzxz6NyApt1iu+mvxJo1F+w=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/82217487-71ef-43cb-8678-d293b802b5a6/cfe49dd7b7e0e3040d4fdc9258c61dde/dotnet-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "a0ad81d4bb361d91edc7b42142828fb5ac5b75376e6ad0137f7f28bba5c0d0b68c67af708bc85c15ebb7aac5f98df20bd83a56144a1bf9ac5aeaf5caf84e4128"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/250c78ac-a53f-4679-ad2a-cc31fa4c4001/204b39eb9634a8dd9f39cbcaf56030f2/dotnet-runtime-6.0.33-linux-x64.tar.gz"; + hash = "sha512-CJIBVUTYkDmZ+OD62ra0uR6xgOSV+l42wadVsdQuE0hYt72/1g0YgGUNnFKNB+MbnM/HPmUOXYkKlVkCqJE5zw=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/aad5df88-c193-4579-b847-633186659a2f/1688cb1838ae0f0b67d16f3ed808f566/dotnet-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "95d0e646f688e6f46545625dfae46d8325c7aee4661d3f0e59044acced9c6192ff51524355696e8f868ebd112e9a036d01c951f7249d863c300d07c1a0913d1a"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/e311cc4b-e2a4-46ef-8f0f-5996ac64e6d2/0a423f3d95284288d08250ce9e34ba06/dotnet-runtime-6.0.33-linux-musl-arm.tar.gz"; + hash = "sha512-qVlKSJ+GNK8B58YKyrX37grFRLmM5z7mcTWb7Nb2sp9NnmTf4xZoIsBQYVdzHsRPptsCqL4bF6J5r2GmZ5z9OA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6c147b46-cd90-4412-9df3-ca84fe040261/d026454e65fe16a83590bd75f139fbf4/dotnet-runtime-6.0.33-linux-musl-arm64.tar.gz"; + hash = "sha512-5XB5cLKoUrgLH9d6OIPlDeySXZHriQEsFm5KRekXBkwkBApuREsFR2cDPLm56DFLa1EX/62m0kirf5DI5A/lVQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/28d86acf-06f5-4bff-919b-28a26264591b/452ad01a142981b4ee4fd55b97117cf7/dotnet-runtime-6.0.33-linux-musl-x64.tar.gz"; + hash = "sha512-O/5Pnd4Cva812wcnHPVoc7UIwyKTGLvn1Hju2FVBftOUHZ2ajt4v0cxc5fe3PE5a5GZtLMR/4q4J1fhiXEbpgg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/aad5df88-c193-4579-b847-633186659a2f/1688cb1838ae0f0b67d16f3ed808f566/dotnet-runtime-6.0.33-osx-arm64.tar.gz"; + hash = "sha512-ldDmRvaI5vRlRWJd+uRtgyXHruRmHT8OWQRKzO2cYZL/UVJDVWluj4aOvREumgNtAclR9ySdhjwwDQfBoJE9Gg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/82217487-71ef-43cb-8678-d293b802b5a6/cfe49dd7b7e0e3040d4fdc9258c61dde/dotnet-runtime-6.0.33-osx-x64.tar.gz"; + hash = "sha512-oK2B1Ls2HZHtx7QhQoKPtaxbdTduatATf38ou6XA0LaMZ69wi8hcFeu3qsX5jfIL2DpWFEob+axa6vXK+E5BKA=="; }; }; }; @@ -162,47 +240,79 @@ in rec { sdk_6_0_4xx = buildNetSdk { version = "6.0.425"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f57cd7db-7781-4ee0-9285-010a6435ef4f/ebc5bb7e43d2a288a8efcc6401ce3f85/dotnet-sdk-6.0.425-linux-x64.tar.gz"; - sha512 = "a04b75af7c5850238a8d99a6f60b37753467db615831bb3833c14aec86faa2d6ee9b8643885798924a01e28acff44ac9ed39c89f7cbe53c5cb8753c802e85039"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2ff9a08a-9a84-498d-83e2-82e3e3c3d03d/64b283f30bb7df0260c8a7596dfcdff4/dotnet-sdk-6.0.425-linux-arm.tar.gz"; + hash = "sha512-4Muzo4dP7HYCbVzhGs2uB6cg6wK1AMh4gqrrpI5uwpDWI3PlG1M2fsqqG9S9dw8soaquw6hJm90cEUiU2qpNrw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ec8e29f5-2fbe-47d8-b0c5-81f11434c00f/ba4bd30be448d649e5ddf1991bf76252/dotnet-sdk-6.0.425-linux-arm64.tar.gz"; - sha512 = "c15f95664fd0570d5b0cb94c7af6bba5fe830470004f0e958e49d53764714cbf8ddd620b38d487b60a27dbfd467a955856aab3df9c958cde17c942079fdaa55a"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ec8e29f5-2fbe-47d8-b0c5-81f11434c00f/ba4bd30be448d649e5ddf1991bf76252/dotnet-sdk-6.0.425-linux-arm64.tar.gz"; + hash = "sha512-wV+VZk/QVw1bDLlMeva7pf6DBHAATw6VjknVN2RxTL+N3WILONSHtgon2/1GepVYVqqz35yVjN4XyUIHn9qlWg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ce410b9f-c7f6-4180-a373-bcb6528a0778/448c9df07432b5dc62d08868ccfef62a/dotnet-sdk-6.0.425-osx-x64.tar.gz"; - sha512 = "5757c661d82408680a6e45efbca260bb9da145bd83f8275280e9ba756a2827ce35c7ae77cb248e9ee6c6cf46730c6e50152b98c0a082c0de764f5e522dfb6ca2"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f57cd7db-7781-4ee0-9285-010a6435ef4f/ebc5bb7e43d2a288a8efcc6401ce3f85/dotnet-sdk-6.0.425-linux-x64.tar.gz"; + hash = "sha512-oEt1r3xYUCOKjZmm9gs3dTRn22FYMbs4M8FK7Ib6otbum4ZDiFeYkkoB4orP9ErJ7TnIn3y+U8XLh1PIAuhQOQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/24192716-57e3-4e69-9950-7840e05053d1/79398f054d34fb3e424c029e6d41a551/dotnet-sdk-6.0.425-osx-arm64.tar.gz"; - sha512 = "7383b188c8500ab8625cd34f69f7ec5a4d9ff4ca715f95ee020f2bd082d5023697b021ca4b3b1e6a0782fae2ff89586e541e454fedacdf1c49b42f6e47d12011"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/04bfd229-7d52-40dc-a5eb-d31fe15fbf44/639e3b8aa8616ad25515bfe36faeb2c0/dotnet-sdk-6.0.425-linux-musl-arm.tar.gz"; + hash = "sha512-xZ6g72yA+AkHrqIj3Hqa1pQxseZyNN7k/uD5EJ7nzovVivaxAq0ReIn04syO98zu+absgLEFeMbqS4RBLyseBg=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b5f55496-6494-45bc-9ba3-7aefdefb4518/61f15988a48d429bec81f5c5307f01d9/dotnet-sdk-6.0.425-linux-musl-arm64.tar.gz"; + hash = "sha512-1Yqs5bAh/HMKDaIjPoXjrkcyVqfekzS4kyzC4NBQVDwesbFtzTR193fN9Z5ClxyF0n3vSX/lzwamtgRs6NI+xA=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c94a92f9-153a-4620-844c-f964dcc7eb8e/ad7baee9c9ed782a5c9ad34509ff47a5/dotnet-sdk-6.0.425-linux-musl-x64.tar.gz"; + hash = "sha512-zZVyNYECuCFIdP81O76Casm6Dw0m1JST8xKoo7x8D6ui/IK9Xft0AonTJC3N94s0GZbThiNyPGkb5Gk3WnLfng=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/24192716-57e3-4e69-9950-7840e05053d1/79398f054d34fb3e424c029e6d41a551/dotnet-sdk-6.0.425-osx-arm64.tar.gz"; + hash = "sha512-c4OxiMhQCrhiXNNPaffsWk2f9MpxX5XuAg8r0ILVAjaXsCHKSzseageC+uL/iVhuVB5FT+2s3xxJtC9uR9EgEQ=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ce410b9f-c7f6-4180-a373-bcb6528a0778/448c9df07432b5dc62d08868ccfef62a/dotnet-sdk-6.0.425-osx-x64.tar.gz"; + hash = "sha512-V1fGYdgkCGgKbkXvvKJgu52hRb2D+CdSgOm6dWooJ841x653yySOnubGz0ZzDG5QFSuYwKCCwN52T15SLftsog=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0_1xx = buildNetSdk { version = "6.0.133"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3fd189c1-072f-4193-8f1c-663b68b9b06f/bf63007e0f0ba0b3d07f1af06c1dee6a/dotnet-sdk-6.0.133-linux-x64.tar.gz"; - sha512 = "7b4fe0095bc6d3ea43fc3b32f2fc2ccc8fec83b0c50ff74b9e9a019ed40721f46c60d7b3ac08841a5f89d0802d8c347b14a445032a00f3d9a8661558b9c74794"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/af2b3ac2-cf96-4087-809b-60192e8564d0/952e49c2581e6c73d6229c2ce14e994d/dotnet-sdk-6.0.133-linux-arm.tar.gz"; + hash = "sha512-6Ua3XNGqu1M5mqv6RBCC2cwPMk2zcdlgeSvPWrZkRaFjAvEfkea6NMaZpr7WRe5PF87FXZtxGXJvABEADixuNw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/759c84b7-4d67-4eb4-94c6-0214d150db31/aea9ac1878560278c50174ee213d88c6/dotnet-sdk-6.0.133-linux-arm64.tar.gz"; - sha512 = "6820d62ced6d9770ebd3667a64a74e2249471ee5920e4ce4101f21e55950f8d44ebe4ffbf20bc66260fd5d1edc5e534a6f0b70522fc41a5e48e75b0bb00e6ea1"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/759c84b7-4d67-4eb4-94c6-0214d150db31/aea9ac1878560278c50174ee213d88c6/dotnet-sdk-6.0.133-linux-arm64.tar.gz"; + hash = "sha512-aCDWLO1tl3Dr02Z6ZKdOIklHHuWSDkzkEB8h5VlQ+NROvk/78gvGYmD9XR7cXlNKbwtwUi/EGl5I51sLsA5uoQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8f09b91-04fe-4d0a-8d01-0556c53f2a5d/cbfe49b3182a2c4ebc7aecd22b6ac881/dotnet-sdk-6.0.133-osx-x64.tar.gz"; - sha512 = "e142785256b731abd6f7bda79b1422ba6eb9135f61526d6f687be67146253403cbec85d3ee66f49e577e7f296b32f94fa705ccf048292b1c00f981d2ef4fd52e"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3fd189c1-072f-4193-8f1c-663b68b9b06f/bf63007e0f0ba0b3d07f1af06c1dee6a/dotnet-sdk-6.0.133-linux-x64.tar.gz"; + hash = "sha512-e0/gCVvG0+pD/Dsy8vwszI/sg7DFD/dLnpoBntQHIfRsYNezrAiEGl+J0IAtjDR7FKRFAyoA89moZhVYucdHlA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fee562a1-baa6-4e8f-a3dd-2c49eae8a891/564d31d1daea39179782c413f99c6160/dotnet-sdk-6.0.133-osx-arm64.tar.gz"; - sha512 = "c0193152166cefbe60a7cbdb4af7e2df365c9e67a0ce0ff5cc1aa06a46d4ffd6cccda3bf026a47116f02e4c52875fdd704aa380817dbc3eab653d30f4f5ffe20"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/b700d687-929e-4e81-be67-1f7f39cd01da/f9d75264cbf2786cae51edfd57c72208/dotnet-sdk-6.0.133-linux-musl-arm.tar.gz"; + hash = "sha512-xmabIp3sZGchla/XoY6qwwpROoanAAbqtXDtr4qWfoUpvtMQ9OkQdvxM7H8LULSya7Gp1hcJqvPqSH7dMuF2QA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f92a7e79-c792-48bb-8d07-4a6ee24b62d6/26bc7013753251407efd71eaf6ad8a3a/dotnet-sdk-6.0.133-linux-musl-arm64.tar.gz"; + hash = "sha512-Tkz5HhzprAV2OLKjI2N1KMiYZtqPiPbHD/yI1UtrcoF4GtF+Ys3wP19oRHrk7O5IsV+5fJCLyaVcOMdb8HXCTg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/31aa43a2-5537-4423-8994-564c25089f9e/872a4380086a5a174025e2835a2fe043/dotnet-sdk-6.0.133-linux-musl-x64.tar.gz"; + hash = "sha512-9Sur8vgIZ1NZN0aN925x7322UKWGEzMJoQtNigTKIFPN+OekJvb/NKPmc0N/c81RabGhw3a8CZNfyjSozyEjNw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fee562a1-baa6-4e8f-a3dd-2c49eae8a891/564d31d1daea39179782c413f99c6160/dotnet-sdk-6.0.133-osx-arm64.tar.gz"; + hash = "sha512-wBkxUhZs775gp8vbSvfi3zZcnmegzg/1zBqgakbU/9bMzaO/AmpHEW8C5MUodf3XBKo4CBfbw+q2U9MPT1/+IA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c8f09b91-04fe-4d0a-8d01-0556c53f2a5d/cbfe49b3182a2c4ebc7aecd22b6ac881/dotnet-sdk-6.0.133-osx-x64.tar.gz"; + hash = "sha512-4UJ4Ula3MavW972nmxQium65E19hUm1vaHvmcUYlNAPL7IXT7mb0nld+fylrMvlPpwXM8EgpKxwA+YHS70/VLg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0 = sdk_6_0_4xx; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix index 159d9cc239..21fa129c33 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -1,146 +1,208 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v7.0 (eol) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0ab1l6r77a11sk450jhhi9flvsn8gp4fz2il2a0vk1lw5rw23047"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "050wdpwp7hjk5c9xyx0vj1cmslcdl9acldhxs6al3nx83vssa1kv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "0wi679cxlfx8s5nl3iqgma9nmxzbi73wamxshgpaaj2dg3z5xrqz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "0bgi8rx7dam9727v936h5ap81fx4k9n708002raw9v69p8yva5v6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0h6f18k05w66797yyj7yqbf6jv5k3c5r089mkw43y4gbqz27vbmy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "1xlqjar4j0g1a7wf8ixjpnn6i19zxr3c7pwr6jdn06yzbi20ri7q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "0l2md2g657arlf703vf9y8x1k0zx50zf4wy4f96m6qgs9jx8s6py"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1r2nxc0nm2n5dc7laf65yqbjv23g9fzwcvv8vhrnvir6j3lgxfcl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "1n0dz6k338wmadkgb7x0jywz2qxf3427wkjw8xn2zdz4m1fcj58c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "05srdy7bvgasr0yx1mxkilbkls14k0dmp4mzc7jiqv7xspc4jwwn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; sha256 = "00npza90sgnvls4k1k95mhgiw5fpxcrxf60fi17k871m6igdfh1q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "1q86xz3v8p24728bl7sw0flhzk042ygxa23k0qyhxdn0qwzzq6bw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "1jjb4jsnm0f1q0s8199nympm9vifaa129l0bj4j1z94i1g85nw1w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; sha256 = "0cn8j76jbbp6vpf00kr1wwr4z1ij0sgdymawff32qvj44wfmhpnl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; sha256 = "0cbk7shnry75p95zyg14pszf396pgpyjwzhraqbds5mmncqisvgz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; sha256 = "02fz22di6ax1819spb4v22nb89glp3h08kk88am6rx3vgb440sbm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; sha256 = "0wvg2rfp4v8cnqkfjv4ifj9q0bd3vljqnbnf719nf1h0ilmcxcjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; sha256 = "1mq59gpd6p46zl2nl5ijjncghx6fms9nig9zqhxazjd15bqy0l33"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; sha256 = "01xpgbphknkjqgsbcngvckg3a8q0y74g409v7hmxsh7rjcradnqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; sha256 = "155z494bpri732h1yba6ggmalgwxw68qjpyrbzfj9mi4whwy6p47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; sha256 = "021mg80b9x25jpdm2rc6m91wib15bb5arkxjjfa0cp509i5hnshi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; sha256 = "0jpxs82ndrbs3r28951v0p31ngfkhcs0k7plgywyvd1lpkvdm2nh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0bcnw653m7w7if6z84rf4k3mr7hdmvnlv4icflk0kc5jd98bkvhc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "03107bdy4i9sckpwnk9s497sfq1prl4mccbc3mak43vbnfyqrsad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "1lhlaj2ra25jjr6f6rq5rw4wg981h9js7amld10ccyg2vfrswv9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "1w5r2nv27h3csd5qd3sx2zmf5drrp3ygb519m4hvn5lazyfah5p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0r002hclq07y275qwj5pq0nxmb6k8h8yglcynpvw8m0pz8d9mr9g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "0msncsn0lz0dvc6clvc4blq8a1bv5qap7qx27fdibdx24i5lsjya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "13x37m9mdg8pvq1rzcrr4bp5yqaayz7173p39s623n8zjxrh60ww"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1cv1zmkiz114vk0b0spnnczagbcks5k1fb198lc88pi3c9dpfm0d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "0wpf2p1476ns8xd5qvih5llswag133q4s6mj62yzbba890lg5y78"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02iri99mhfq9awdymsqhg86pg6qfgfig2r2w96jm9lbx4gkg1rgm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0g24nr6v86nikikfvg2b3d8im9cp1hib3xiccklbhkpbym3y98dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1dldykby8yfvq7r7kmlg5wi6spy1ngsxbs18ng34lcqjfxjjdnpb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "07ip7aflkg89gsbfm1w7sgidn4lvc3csrirzkbdv2jhm876bxz2y"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "13pvjwqlacls6hz719lwc6rz0ghs29gxywisldwnwwbm9i6wdnga"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "15qwwdf3c03gs916r3k49wwg411cmrf5xldydkxjjab8pavdlq0s"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mjwlxy5gy7k2iil1jcrssqspn3hrpm2dqwghzx9dr61wvpl6sq6"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dwpzaasn5044aqm2xix3czfgrwx0y0jwis6p0x8n8jdqyskpim2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0ai75b700v76rmqlblxpkwsd97jidfd5kn3jl0y52yq0ylvc4zyf"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1jkh7kjhaghslhlx6x7w03kdxi1xbrgxwdj9qav0ci7nvf5j00v6"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0k5skgnss5hknr4r15gxph54zhk65cnglp117gih8qxyzn0245m7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1kllpbyldix05ab1pb775ykxwh9lrcji9vqbyp964b8m68r9yf1h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0a5gajmkchf2ad3zwmjaa6mw72snf6hrf3xz581mn8qnjjv68whj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xsyd8jvj39z99ga9x26g1fi4zi39pf3ym87fr9102bg5rllj8m6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18jp8cykpj40r61ji5fpvfj7yw6cw041l6r4q30am9sj80sgq73m"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "086cn7jilskr7q2hfy810f4hshzhm9r6kvd2kjzvjwf93s0qfgya"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11y8c16m63kb1masa0x7ympwjg93ffyp4yfycd0fcf0zhzyw00bx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "175qh1czpm8vs0ifbg3iwgz2cn3v0rvd51g1k81k6j00z9gmhrsm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "098177bqda2viwzcabsxrpj1p45jqi5fnyfg9xnnw198gh0iskvj"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "180bkmdr4h14a8l2gs9khm835037pw8aqgjz4snx6wxhq7jbdypr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0jdvi1pcb3fxqa01633asixs93rg1lfq98vnba018nbqdifqyvf1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "09can99m6psr9v93awwkahyxq899sg1l6p8gpp4qscqwpil22r4c"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0idzsi16ny8bjhii6fwjwqn8wmy8x4q2y0zx4d1vmxfx51ym634f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1k5yigh196dn961bbvbyy8jfvw8ghmk4da313a304b4m9rf6q5c6"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "1rnpmqmgdw2y9snjj3kp2irg1aggkq2lccd7v4q53ghnl55jdil8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xibpawi6nahdbrdcb71panhx4w5zlmbfxspwmljn2a77sy9caw7"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "07qrpww6nd67xjj3jin97jwiymyxgpm9mdg4raxs9ss0pc05l5xv"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dskgn19yhsq28hvzqs422bq64y5gx5cx33m1m3zq8mfycvscnsv"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0k70cb1lh6j9qg4pjy6r58z0n5xip3l6i6vkgrdx2rqqvpmq2ky8"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1qr458jrmsb9nijll88hp56msjmvnk20q73x7qypvqlydsn2ap3y"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1503pddh5klr3z9kpmbxnr4w472v1w8ggh37iqi79z3b0x72zzi6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09ddji35a92iq9f4rm5xmz1vi3bki75xskq3iypjbc52ar7wkfl1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "03338hfl2sb8ca9v3a42b4fgr7qyv3r2khc0ydhif45r0xjx6zrx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0lnm29n2z4r7kjwyfa5gbl8qc5nbbc5qkl9kg8vj2xb9mlk5zsmz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "15ah793265ikivb5iqblcl4x86g4bqgwmhdlhikgv6a18bq32sjz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1jnz72f7m292863wvpmm12gwdnqwbvm45br1958f0gkgp0zmhyjs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "18k3qs54a4x342ypc0p54ch6xwx9wpfgb5f6iyw0i0f8jjxspbay"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0nyk8x3myh6b0jfka8mvxbhlzl38qiljky8acfkyvw4dzw0y63rb"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0541ykf9hhc56jin59lg5iw96apcg740wg1hrj0m8dagjll2c599"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09dlmiqcscdrvjrg9w5mjlz59ly0la4as4hkadz6j4mqvv2k7j6y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; sha256 = "11bcpf986m4wzrln9v4frh63arrg9r3vmv2lq7x338xnrwxadz8q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; sha256 = "0i07x8kwsifhzkbx1j8argx31g9dxppqwaysn21cd623d16r2g1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "0aq01ld9k4064bgki4q4g4fl08i82pnh5xgxaqk3k48nbsbrzvwc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "18an54s6jldf330ckigig6s1xnadm7zygrlb35qrhawvygbqayal"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; sha256 = "1fv6p9idx6g58y0khw7jl23lkwj01l8246mv045i9q6sp3fm9m2v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; sha256 = "0qfv5w1s5pj3c46jx2g75parx12p40rywacvb7v0fbllj2nvm89r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; sha256 = "10d13b4vl5nhk3iqcpbhdhqgwmymzx875w4yq3pwjkcc2vyhg3j5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; sha256 = "1rbl46pfwh1hkbf5djy1khqyiv2fivkgxs0gcnpx0kpx4lncf73a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; sha256 = "03760jw9bbhcg5gmx5z5xjyccl0sv1lzznk3hx2ynwrwg6dhbkyi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; sha256 = "1gw4wlraqbr5m5w62wyfx7gsvyj92a8h7i04n9jgc6sfs4yfrsz4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; sha256 = "0fcph5pd0myyzzl3ihnvp6wii4vl09ayri5ba12xgixb3qidskgp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; sha256 = "1zxpbwc52xsylc6kwk0sqf24cgyv9b2cz9l3icpl1hnkqims9xy4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; sha256 = "1jhw9f2mzx8a1bqdiq7ylk8nccwcqa57sd31ykd7lzq1wbhy2r45"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11l84kx7v6y10kzlsr74kwvvz44wzj476m5mkm2xv2b8pv1z0i7z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "11xxvyals3q16bzjd7a4gg0nzidsm822aa92yd752jzcxchdn6z0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0dg1m80mxvabdkqjgynnws6vlzj9469d5nrjnk5x2zqcsw9kjj08"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0rdq3z66azlwsak8n8j9jz8pj0lwsvz9f7n6k7x6mlz20wcw4qs6"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02ymh38rj3pwak3g9qhviv64kqpclcp40paijg7m184y5bli68b3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0s9bca6p8j96as25r22vbcmyyhbavkczdk68ypd7qn4g1s44l34w"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mi25ilkzw9375lybrmi78g24xzmcz7mnqgjf8y9qvivwsf7ysgn"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "15jfwa5fva8qz6g2gnbxnppd9cfs7r8fspc9xb7n9zgxl7w5n6gd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; sha256 = "1xvhyafgxaraf97s364a3jk5dad4hsssqqvzx4i8qwg36fdijcq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; sha256 = "1r27bm12x9gwzv0cid1fdzx9hv9bdy6p6a65lypjzvgwfdgnyksv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; sha256 = "039l3qdsz3ima2jgvp8nqby68cr9mvj8q2xd0lmx37drxvck7bx4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; sha256 = "05zybhb8dc22f934gj3f55xvsfvqizq0nf4d29ns3z9d370jklp3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; sha256 = "01rrnbwjpy138pra53ypixk3cr528fazjsl3vsrvf6jnymgxlb4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; sha256 = "0g09yyi0a00q9xa51p1k9hvdj20jmy1ss2r2l28zk9s7lwyih7kl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; sha256 = "09kb949p1qc6rz6mf736id8qfsj6dq8azbrpzx19xzpnylqjch47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; sha256 = "0l76v2w34igvh6i2hgvhfwmkcch1574ylwl1159649pg7c95kj7c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.20"; sha256 = "1jj2mzcn1dd66fic37wnyrvd07fplrsdj4azrvi0qz3qyykc8wmj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "0q8i69qc58kyxzxfz0cqjlbjcz1n3p130nz2q852rvvcxa4644zc"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "09xk16nb9wrsgjr531dhd7mvpqa7b50akmkqrlndyspma7cbvrzn"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0l82bqvqw5qqhkgrxfscc4dw197b5sh7ic63pymdhixvx0d3fi1h"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18sarln3kbkqc1ab9jnadcqqxs8iicf7jqldxzbjzhdpmf96vwna"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1vh3ymhv33qysc4vj4gb3g1rgajy4jr4kxfjcsq2myn96aan84i1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.20"; sha256 = "12w9hlq70ynkrgqbr555lnqmbf67iz3kaci2vi07zsn3mmak3z6j"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0c966243j6m22hy3n922rl64vi6y1l7ljn69bwydm5clyh7zvn0a"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "11c31fzq4qfxcsz3p6vzdfnaqs29saf1dnmzq7l90p6ylwsblc7f"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "087q3p57snmvvzzqpxp3vwvi2q21kzlk8qh1w6axrcjdci31xmji"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1nc8m38jsqai934nn26f6dkl3c0r4sabssjiizcixdyypzlv3hcf"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0iyn0rkf9vf7vbd58xs24209557dzq1dppjb5d35g39z2kh06k1c"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1b0ys3g3bg9kxxvs1h1kj79b9n9nl2g6hjhmb3c2cpp4slzlsd3d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "14nq8b869k43chsn4ba3b3ww9w25fip39ik8rfxa1z8l5k4k6xb0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1gajqvzf18p0jppvcwky0shkmw4nzwz8hzx4kwblrs41d8xmw39a"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; hash = "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-9eXw5iN90VSlSVxk8aJ7Dpt3DXoQ6+obVwk7WFOKOQo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; hash = "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-sqHkR/XrTrjoZCz2sSIMl6UaURtLvO1mnNEatE22RDw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-69omZXcSM0rGsyjo1fWzwV9tIi+P1nnywdt55Nf0jbY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-Xvy+zEEVSrHbmj/HrNlgmxLb4tOHh+qWfgm9SZ06Nx4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Ctj9D/SUldo8X8lYSQ8N3sRNDM1CJDs8FKIaOYgwJjE="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; hash = "sha256-49IpwRkt/aFtEo04C/CPeDu9eyluyEdGckKwhhZc/hc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; hash = "sha256-nizaX/VWGrez3oNq+ZVDomQ2Zo/Xj6LyRSP4K/myOQc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-7jC6NKfeXJDowb/aFpzSSWisrGt/mzu+Zt1hgr8Lg4U="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; hash = "sha256-dB4YPadHp/mRoCILrYOvEgjZNkwz3FBUTxgABaL3CTw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-LEwD4BQ/jVdGK0ve2wL+7ZSSgCBCd1Ta2sft5GYG1kc="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; hash = "sha256-AjMZmzPjcYwi6X9jrLWGpKlWphyKmKFPciqr/pzycPc="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-W09vX3P87S+vp8Uoc41vK22Y+m8utMjA/vylLkJdR+Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-UdYeRmRNstyV4QFiNOmfQWARN9/j9ov/37tafcod+CA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; hash = "sha256-pK8z2e65ndErBa0LjOSuKTNk/MIW3f2kUDWOrxseNA0="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-jsGx6b/etx7Zj1FqvZQmGbBBZzPOCGvJSFFhLdGoiNk="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; hash = "sha256-7MhZEjvvJmJSCYFy6skpATI2K3dwPyiigftFMrjY5lA="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; hash = "sha256-h0AmMfX2/p5C/zevrxBuRmqHUYtmHFfNz4bhcBNJayY="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-bTRNP9XkXibYWBVKaJ6gNtm00pEzwKB37zO9Nd7QHqw="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "7.0.20"; hash = "sha256-dXex6q5gQcBJ5Xccf27GxrTAvTlJyTC5i9Ln0IWBjJA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-YHUzySwU/aC6y2jGNG50RfDE+VhDLWI1ZIPMZNBC2JI="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "7.0.20"; hash = "sha256-5nZu1DgEqIy5HufEOE/4wyXuVyUWSozmpMh/+kqt95A="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Kg1eO2qB6EwXn6R/iD7/lvA6oQZ+crbvleCi4P7GUr0="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "7.0.20"; hash = "sha256-T6M4ND0K6i9CI5g08rgaPpECR2968YsJ2+2N2FsKYz4="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-h4AheC6chrmBEjSK78h9yOpNXYoQSlDI1CGoc7KhYSk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; hash = "sha256-1F5YHSdEbiyGc1xV354GMoZPMuchTwDc3eauJc2RyDI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-DO65UGqysAkmdSySTe2uDZ5cxyQuE/SNi4efOorhli0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-zn/CNvUAe1E8oHLYWZprUZ7UNJ+300VxzeZsAM4qJyo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-ZgMgi9v2RAa2wkk23l9ePcTe5gD8dNMppBo+BeU8cMo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-pxYigP2+YwTjOyFc+iwrZsJPCrz9lZBJthMWre2bukw="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-MDifMjIVLWLS9QvvFCXLNEHepy/nrBuWKqDHRv26lM4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; hash = "sha256-OaG6rZCULgf2WZsp7jMgV4Se1S3niS4NYUPeogMv22E="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-ewal9R6o20GV0R02ylSijVFdWZAbdN8TK1PCc/ltHBQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; hash = "sha256-/20dMbO1Ft0WVhl+Lv1916Thvr4kPP9LuuX4bKE+czE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-TemMvbNrDzJVHWwxVgnNN2CnTyI6TcvvZDpF4ts6IAw="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-6tnGTUx1cW55ozpy318SGj7ws2GcpnA+NJoyRTGX+44="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-GmDatrpoKSn7bL7RXlyuLATyOE9kjmxC0m8ANlzjHJc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-BmtD7+bB5Jb6h4/jJurNcNirsdaZyUBjFPP4V3ynXNY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-osY7tcdNIos6uEZHLoEHnefnPhs9dlGxIgQUq5X6lzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; hash = "sha256-RY4H/RaMTcnvwJ7wclD/1Vf+MGxwXYbjmNAWuskaoYE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; hash = "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-wW2PXWx4WRSAWnajhB0NL4+ke9RqDBOAwt2NxW6Iu0k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-jGQhaLwcM43JvQ9dQ8PTKSHcPVSTczXSTllfU1OyiiU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-jgxTfSjd9bpDI/0DLzDpyFeOLOaSOxMjlAt5a0LUv0U="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-hhVsXE6VLAKGGmGoRmaFD/HtJPJ+7bWCSbaZFOCLvsw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; hash = "sha256-0c8Fm3k8c+tFh2Pa/2nYGlDGvOzll15feQyulbgE5gw="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-fBn8P8fAtg49BnMI1Z8XBMwPqQNcH7qQOERctMfvBuE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; hash = "sha256-GP2mOs+2ozH6wVTsukdOL2c1DMyO7GRp/pxUg5K7bIU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-jO+fl14WkTkmVv31Au0VKCJAHXkEkzjfIgaQmRoNACs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-/0Tww75oid1FnbVUc4j8nJC/N5/kZE3/BMGbffokiIY="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-4BvbIOvsS1FO8yIpJQSqusVvwXtEnSb/MgEPTZXfvYc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-CEg5E9cMf9HLtDLb0pIhSX66jebW+ifxbEvtXgGq4TU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-RmPCGQfi02r6mcYel/7WnAJ50ZdJIoum0px+ZcwfuGU="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-H+de/nhNSKXug7pXxceJ6/dqk6oPx0Ft0ag72lk6JnI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-dWlAyHp79GyqQmhOBOC49CW0rBCbrKtTQKErE5sQ3wk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-LW2us9viecZAaLSqo2WCAaXHCc8FZ+NMlrIIlYVUFNI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-EnJktpQWI1sDKr8Pl6FxVovDq1FKVv5HU8JBNqtUryg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-piJJaS5vCRBSdgdVP9xNI34SXXhG9KReSj8NuSVqXnc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-dRz8NEBSp6rAwCQbGgjgzHB/pNvXlSiDyYDIOz1DV6I="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-yj+HgR7Jcbm/nKLtaXKq8EMNiQMBeQcFPnlqGuWxzCA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-Zhe1PbrJ7MRVFgAgcGyapLuArirQjLSPOKmqdnpG8S0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; hash = "sha256-XbLOKo0ABmdTOM4uiyXdoy2Ak3SRbOkmtgxtcl0Wb3M="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-5haonP+KFrshqSmU9fy4Obfi6hddj4ZL02zAI7YVufA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-fQHA/YcfOOZAY955cr1zIz3Jb/WnA6VVDWsOU01gyIc="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-VWdYX/oASDMDmuGF0nYGe1gm/uNxvOUi0BvV+1mAuJw="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-ck8dAXwoBW5tT89560rEspAb5M1dL8U+j1uohtc5ASU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-+fq25MGwc9OtJl8+rBC/Z4AyUIUz6ScoUiRAkludC6A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; hash = "sha256-ahzHLCX9TtCvZQ/o/uaOTuzoMZzBy1bcmjBA7q4hdOU="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-PHBb0AuRpB8kkQvQJIJSLu5Ub/U2pYA0wMGBarUkS8o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; hash = "sha256-MTyRTWhDmMaCsNorju/tLb0w+ssKydDX/NBFzSfqB0Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-VHmF1/ObK5hxGYvm5/+pTdketHnxxcnAGK5RaTQpVqE="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-YyET6SqeoFDPk1FdQC6j7OJJzI4b4vTGVPwOmdGA1Qs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-nAxKiA6PWHza9cjM9tncakHvK1tbiFyEViZJdI1iK2k="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-9ml/nOY7bpw8cvJhW89n9XciHjqx5uVpOSPxP2ksItY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-7Rlb+KH9/WTP6old7VA+2rHU7rV92See+Rip7YriTpY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; hash = "sha256-5OvsPNFOG/ZksgTEA5ESSfqt3+nOc2F4qSUvrDLlhL8="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-+MQMRFzfG2CbNJnfw0buP4VorL2yR+T4UeEBSbKSmPY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; hash = "sha256-DdumMpP5QN0rPDsB8sjxACM13mT7Wbb0w3LaCe96twc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-yktNSySitxWbO6LjcxUuewWFMF2EbcoM2w18CqxmVlc="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-iMYmS6EWvlEw2acxRgWe76nwchR3DimtTl7w9iqu1+Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-hyuWvD5HCStp5Vd3tyr9hZMOrbrhLNbyalBZE7m6K3Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-uxdaALtA66S7yuS1mup93VcfuTzJRjmk7Mc0azi/GR8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-W1umN/OuIvxHDXWMzkp/xRODlxBE478hElhDn4J9Uzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; hash = "sha256-903dIh6rx9dFUKvE7FUCdJMYubnbwjjo/95X0G6Blzk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-/hqNukz6YVNNcsRz4j4o/YMZOvLJ7QGOo1mdYp5oVVA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; hash = "sha256-h1zjOeQk1iTdX9lfiZHhnT+q6ntGLR+gGCfmu0giv5Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-nAMDc5cf2SGMTuOOE873SmFf7iI5s58D3he9VlM9o48="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-yE+B690YZ9FbfnObaOi4sRcLPirZeHnJw0kaSMNi4Ew="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-flwlrG6e4n09Pn0cDMS0u0pdTbkQIUpltGnpmiUqJOM="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-Jv4vTgdr/HQijmfA9xAPWxzCSbZ91TvTH5nOAlu7A5Q="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-gbrJT1aisCWvjwNP3cuJc424w6+91ExcwlEkVUaUrSU="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-lLn+6JAmx20z3Ghvxr9Lb4gtF/bFOEUPa8WKagHrVuQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; hash = "sha256-EWoLS0ygXAaUk7LPrMpaJazIQ6qGZVHblUX0tAB6NQg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-DVR3W2IjXoQYRSksF2bRk62nPrP2arDA3CSEH2f9YbM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-PX/TZQe5EBdh84DBKfLYHp/8HFmCqLGTYmhpQR1EYww="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-v+pfJq1pdSE3ejPRiQtbyxaGEV2vKOe5nCeTL2wS1VI="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-X2ox8EJBmf1mhLTByh9e5BnUCWV04VjWjjMWI0Y6UJU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-WnpYP7hvPuBQSSGvQupeHNvGnwi13s2HQSKJepw438o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; hash = "sha256-xPeka8TTwkAvi4Omz8RK2z9GhMMaTD4No153URhft/8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-DBXJXKjkty9sR1xOfgQZrmPxuZegn/VmU5WjMab5Ddg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; hash = "sha256-0Ira9rw0tO25f/SeCTSD0z0bxgU7lIREHnrlZgXS/Uo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-6PjyKEhIrfW9MLIaTfAY4SmuKS0wblxaR9qaQ8IV7nI="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-Xq2ru5TIgQi4j8aV9dzlqfNuICPlAna9IKMTRYrGY6I="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-Kw/jAf+N8O2nYwr5KWnEaNBP4eq7IjWdBMtAX0dH01s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-KRUmKJVPNVSBzDA8Dsh57CqTeCyPpmKjNIVBmNz0gRQ="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-3sgzxd64Eml+UxMSrYiiwNNUPpW18PSy3LkxzXCstCU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; hash = "sha256-hWTh4eIBf3ra9GE0fYrCjDNm0aT+4NjwCgr1X4VLHMo="; }) + ]; + }; + in rec { release_7_0 = "7.0.20"; aspnetcore_7_0 = buildAspNetCore { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "62ed9743972043a72e48d5aa2f7fdf3483cf684a32b051315004d1c778e9712bf66e5e7a97a5a53993fa8e92daf5bacaf2cdb3eae44bb9a9e25532b9a80f4f70"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e8680cf-0baa-4957-99b7-81395b8ff60d/5a9c578ff9aaefc7ed77e63b6a90dc03/aspnetcore-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-6Cuw8dUtkf6mvtQZoYVhKC7Q6d425WTmQeKWyRf39l/HVVzMBG/tZ1rWe058UKcPD0joVZ/08qm7rSvGLc9qsw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "dfb1c1bef4d826defd3d995599a5c03e1bf1a64c65d98b675d6c05dbb7380d98233953e68d53fc5ebec60ad4ef75417073fb1fb3256a0176bb964f0e01161f6c"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-37HBvvTYJt79PZlVmaXAPhvxpkxl2YtnXWwF27c4DZgjOVPmjVP8Xr7GCtTvdUFwc/sfsyVqAXa7lk8OARYfbA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "00677819450d14d9adc2b65f25b9a069bc2b43f72e4db651e77fe0e48320be8eb7c555277281de968e75d0fb19bef960d4dcb27161b8c57bce076ee18bb5ca98"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-Yu2XQ5cgQ6cuSNWqL3/fNIPPaEoysFExUATRx3jpcSv2bl56l6WlOZP6jpLa9brK8s2z6uRLuaniVTK5qA9PcA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "7de161ea45faef7693d78ca44b585ab73fc183232d3f8d229fde3d05d696818d8d6402ac7ac86ce239a0a6cdae8fc2eafbb445e99443d0c7a4aab3781df35be6"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/40131679-906c-4afd-90f0-576fbed036b1/85a0c856077ad82c29350486ebdb912d/aspnetcore-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-yoTg7/BS1Ft/qa/Ypo8dViZBVbUHiBEF0gaWmSIFe/MyiVo8OioXAmSORnEvAiV02Trhh8j9JhD4OSkJVoq/Vg=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6ef9e16e-9a83-401e-8ef5-905ef374b768/725507d68a8bc4a4297e2c82bb1d06db/aspnetcore-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-ZUBuFxSjEX2qNCs/0NvNXDIUMVYR6su9hYCCf2mgepSAUwMgukBpKj1tv/gy2SmhQgB58dswyj/Wem/QNRSdBA=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a3f5953c-68f8-48e1-91bb-0ca62199e6db/b3d7a2de0488fd63fa286c3fc371d68f/aspnetcore-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-qA8xGTr3DVVujQJtOdeYY8g4mwZf4HeOe0Ng99H202UDulJzbEDnSnFsPDBQCxhYFu1g15sGrilXVLZzdKH6RQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-feFh6kX673aT14ykS1hatz/BgyMtP40in949BdaWgY2NZAKseshs4jmgps2uj8Lq+7RF6ZRD0MekqrN4HfNb5g=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-AGd4GUUNFNmtwrZfJbmgabwrQ/cuTbZR53/g5IMgvo63xVUncoHelo510PsZvvlg1NyycWG4xXvOB27hi7XKmA=="; }; }; }; @@ -148,21 +210,37 @@ in rec { runtime_7_0 = buildNetRuntime { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "87855297338555a7b577d7e314e5dbf2c2350f8c867a489cd1e535634bad5c123a1871464d37fc9421837ff5d426c2eadecbe0f60bbf3fd32bc2461f47790a40"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/06e8869b-e332-411b-aea2-7e29daae6953/6b8f60cbb630acd5d94219faa15faf6f/dotnet-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-okqnr+R45ir052xA5j5eXoMkqwHZrZz/MYMkXN63CGH/wRjJq9qfLy/tQjc1yieqwVvsjMX8NS8FvVtyYmWEmg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "c245125ee2708252119a1544556e1aa9e00aa18b2303de69877da10c6c17e3f25024b749ca93b53be76ee0e8e4a75d403f7019b8bc2e50ed1278f656cb2f7e06"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-wkUSXuJwglIRmhVEVW4aqeAKoYsjA95ph32hDGwX4/JQJLdJypO1O+du4Ojkp11AP3AZuLwuUO0SePZWyy9+Bg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "acdcde92f2f2e43584ee59be447f778f4a152c308975c7bdc5c2372b5bbd3092eb9d2233aec3b82756ba1e352a0877ffc17e4c8cfb20a9de91ca6db54d79b591"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-h4VSlzOFVae1d9fjFOXb8sI1D4yGekic0eU1Y0utXBI6GHFGTTf8lCGDf/XUJsLq3svg9gu/P9MrwkYfR3kKQA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "af1cb62e29c69648ebe334e651c2703cd5e87fa0bb28c670bacb3b3dd1608aeae35ae53402c5eb4ed8bf34abd831a08ccb5ef84e5ec70617d9f8d9969fe7b8fa"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d1ca778-4415-451e-873a-dc4062d8d9a9/f38f41e5784c0832e24fe18a938ed5e5/dotnet-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-JczDc9HEwOt0HgSMb9SDZjELNqxvBoxQ9rwBNCoABGQUToRX5+G2zPbZlUTUkUAi78uCTnVjZRe79hyUhSzddA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c30b2e10-7c18-447c-b66b-47bf12f88692/0d5fbdecc6b2cc86fd2f43ebfffd7aa2/dotnet-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-VSynNGf4BD01HCDXHflbqWOzLox1cG329dP85SXz798TFN8pbET77a1VdXguN2M5mKebLCP390IPgU7iSI8wog=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3297a5d6-9f41-4098-9597-c1b966c19983/46559d0d813b36264fb414562caca171/dotnet-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-MbnaCNYzzQAo6wjDbuLFw8sb5tPF4BDIWuKRSW/l6Bi1vln11Hr/hu2TnCYPdi5X/waTSk0JVDdpNbGtx5nxvw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-rxy2LinGlkjr4zTmUcJwPNXof6C7KMZwuss7PdFgiurjWuU0AsXrTti/NKvYMaCMy174Tl7HBhfZ+NmWn+e4+g=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-rNzekvLy5DWE7lm+RH93j0oVLDCJdce9xcI3K1u9MJLrnSIzrsO4J1a6HjUqCHf/wX5MjPsgqd6Rym21TXm1kQ=="; }; }; }; @@ -170,70 +248,118 @@ in rec { sdk_7_0_4xx = buildNetSdk { version = "7.0.410"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; - sha512 = "20b8e02979328e4c4a14493f7791ed419aabd0175233db80cd60e2c004b829b3e8301281ea86b27ba818372473accf5a6d553e5354c54917c8e84d25f5855caa"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4b1d565b-7a3d-4e7e-87ad-7c662ec59020/4c6cb8a150efb42f7cea7e0b4c2f61cf/dotnet-sdk-7.0.410-linux-arm.tar.gz"; + hash = "sha512-lbY5oUddm3Y31BoUwMqzmTs6K0vmPb8lH/74QEYcUdnV7NeO8JyFf+KDmRVfekBEngjHozzgiFDE4Y76q6tFrA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; - sha512 = "2db6a3b9a532d2f59a2b459e634206913a9585c821f3f578a421e3bae346a92dd9b85b76ebde343ca3057275f7ec4d0bca71cbb7f2badb6dcdb516244e84da46"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; + hash = "sha512-LbajuaUy0vWaK0WeY0IGkTqVhcgh8/V4pCHjuuNGqS3ZuFt26940PKMFcnX37E0LynHLt/K6223NtRYkToTaRg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; - sha512 = "782e15c19ce20aa8333566f23c2d3cdb8e89c7626de6330ddf670c4426e30cc854e44ff3341578622aecf210fa66ddcb63a7d2ad629ed92cb5582ab670f953d2"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; + hash = "sha512-ILjgKXkyjkxKFEk/d5HtQZqr0BdSM9uAzWDiwAS4KbPoMBKB6oaye6gYNyRzrM9abVU+U1TFSRfI6E0l9YVcqg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; - sha512 = "c0ef1914f2b298504433bca9cdab02dcf324421ece39657b66523f13b7a7166e726783673a602fb462f3db5c53f59a89381b918e7658d49a57763b43cf75cedc"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/fb542b02-38a4-4564-bc66-d7822758cf1c/d18f1e24ef1b3cdb4ef10bc641ce9a5b/dotnet-sdk-7.0.410-linux-musl-arm.tar.gz"; + hash = "sha512-x7Gc3yExJkVv5/IBcf+/XMQXcjBbR9jQbGRhKlCeiRMSZAXKjqW2T5P/TSz+op+hKGcdQO8jrWadi0coIjjfwQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e1f9446-53ee-469e-8dde-cc307306ac61/bce850d1c118b4b6dcf9f808b22a8a54/dotnet-sdk-7.0.410-linux-musl-arm64.tar.gz"; + hash = "sha512-O+6089U2DMm8Fzm2kCj1grZqajhMlmj/EqD9ucKfktx1e3sXs9/MgeVQP5razNe56lSQ+OFinN2Y4bRZKbaS3Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6d16b077-939f-435d-8f2e-11813d76db6b/ba4829249b04d6c818bc175846e694b5/dotnet-sdk-7.0.410-linux-musl-x64.tar.gz"; + hash = "sha512-Y0W6gTmvQteoMwtaXhfHGz4GgGZWEAbGi/4r+1wavSiS8NkD+3rrwqU22Ee8End4DNZR+lMTMMFvowKgdstUFQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; + hash = "sha512-wO8ZFPKymFBEM7ypzasC3PMkQh7OOWV7ZlI/E7enFm5yZ4NnOmAvtGLz21xT9ZqJOBuRjnZY1JpXdjtDz3XO3A=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; + hash = "sha512-eC4VwZziCqgzNWbyPC08246Jx2Jt5jMN32cMRCbjDMhU5E/zNBV4Yirs8hD6Zt3LY6fSrWKe2Sy1WCq2cPlT0g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_3xx = buildNetSdk { version = "7.0.317"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; - sha512 = "906ecbfa31b10ae5e2a8ba713d113ccd83e3a9b9e4d3e322482692891542959e76c51db5dd3825fb4a2cf1e951737006a99be7290f309d6822567d3a533a7a9e"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8aacc3f6-bf06-4cb1-ba10-ea76c29bf550/7c657ce9fbaf35843a30a34a7ba0e3c9/dotnet-sdk-7.0.317-linux-arm.tar.gz"; + hash = "sha512-S1DHTRWHGrRc9/0Bb6BR8Dg/AJX5G07ycQUCgY4vn2kCO00A1YTvd9gYeujpWo0pI7PQPr4qP/cKkQntEvdI/w=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; - sha512 = "22badcdb2cba0f1bedb1fcbdc99269a66a01a232193e00b42823806cee5d46194b8dd008a53e17455072a410f77bd351676f351670be96c13572d8e30cfad180"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; + hash = "sha512-Irrc2yy6Dxvtsfy9yZJppmoBojIZPgC0KCOAbO5dRhlLjdAIpT4XRVBypBD3e9NRZ281FnC+lsE1ctjjDPrRgA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; - sha512 = "d3dbd0fe7cbc62388f150adba5d818abee3986863d757ce63088f4feabf801052c08a608acd5036f97191435fe99224acb12c7365be7f77def28553a231ac3c9"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; + hash = "sha512-kG7L+jGxCuXiqLpxPRE8zYPjqbnk0+MiSCaSiRVClZ52xR213Tgl+0os8elRc3AGqZvnKQ8wnWgiVn06Uzp6ng=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; - sha512 = "b5f367e1e20d728d7167c81e4146358e760f136b9ee0fc410d813c14366e38b09a069031aa8ca6d8df438435b6ab4e2e989be309e097169459365d4befaf9f5a"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/6e895738-571a-4d6f-8519-0d64ad4a95d2/75c8734c8f3dee31dca0591f7634b4f8/dotnet-sdk-7.0.317-linux-musl-arm.tar.gz"; + hash = "sha512-fKoRN8pHJHGrlZ3s634+KCigjbX7Dhxrlz8kcKHLbIv60zLMrDH2bhGYLkc6/4KAmzX6XANkF4J66DcTe+NPOQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2df5854b-e405-4191-a794-8c24ddb9b95b/b0c9ac55d4f324aa81bb5918e115347c/dotnet-sdk-7.0.317-linux-musl-arm64.tar.gz"; + hash = "sha512-7US11MyzefQoaSLiJtGC5eubwS9M7bYALwbleUt5XT6/GajlqOmQxFfff566mUe8HHIQr2qN/yxnItZMnmHwQA=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9141d472-8ae1-46aa-8218-190017c16ed6/7877e0accaa6b6800570f7b46a831c97/dotnet-sdk-7.0.317-linux-musl-x64.tar.gz"; + hash = "sha512-Wn1fIXAQs1QfqdC9tD12lJaFW54RQ4TPZ4jtR3G4NUZqsYeMU3nIkUk7VLh8FHB3j1CTHFpsiZr2E0gZO7lj1A=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; + hash = "sha512-tfNn4eINco1xZ8geQUY1jnYPE2ue4PxBDYE8FDZuOLCaBpAxqoym2N9DhDW2q04umJvjCeCXFpRZNl1L76+fWg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; + hash = "sha512-09vQ/ny8YjiPFQrbpdgYq+45hoY9dXzmMIj0/qv4AQUsCKYIrNUDb5cZFDX+mSJKyxLHNlvn933vKFU6IxrDyQ=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_1xx = buildNetSdk { version = "7.0.120"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; - sha512 = "cb9faba83ab276c935ef35b31f016ca4617f0d967c5b4bf1e993c2159992fb59d1dd25dce09928915b9ff586ead7acf92ec1dd96937c93317a99ca0c92b616c9"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/3ab51fcf-7641-4e33-aa59-53b394ae1e2e/79905a3a4708000a7a50da44a7256ad7/dotnet-sdk-7.0.120-linux-arm.tar.gz"; + hash = "sha512-epZI3jwx+NElfZiYL0rivTusMkQLz8uAQCdShZkJNK7ocZASoso/VkZUblZtKWP2O/idGbVordxNMkzpdOpLxw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; - sha512 = "f530f794afe3c3b9bd87b8ed509a1a13b1c8fe6f2bc6e6cce3e8cd6b56327c0ff27fc138122c2dad68770cc5015737e007ef5706599c189ef0cc7521cbf0b654"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; + hash = "sha512-9TD3lK/jw7m9h7jtUJoaE7HI/m8rxubM4+jNa1YyfA/yf8E4EiwtrWh3DMUBVzfgB+9XBlmcGJ7wzHUhy/C2VA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; - sha512 = "94deb9988509fcbfffc357114d0f5645fc6b6f6156664040cd5643a191bef10ae2fba4168aa689ff7da1a1b6fa779eb4e53a77a7847beceb7f0ba451d2c20d57"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; + hash = "sha512-y5+rqDqydsk17zWzHwFspGF/DZZ8W0vx6ZPCFZmS+1nR3SXc4JkokVuf9Ybq16z5LsHdlpN8kzF6mcoMkrYWyQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; - sha512 = "dc06801d8de34df698f93e3aa872d57131dd3e33ac4f7cddbc96223911e0ff32fdcea78332da7be0013362c90cd24db2d86c1e275297be6dd162948f2bd38cbc"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/202eccdf-4461-42ed-a260-0061216380b1/076bff1764888073337b16ed57dbdbec/dotnet-sdk-7.0.120-linux-musl-arm.tar.gz"; + hash = "sha512-HNomb4ipUPRUT9/M8ezCaBa3XCn0hmv9mFiSkJQtmCp0zhfy9QfGKAsPM3t0OprQHlOjwQAcdHe91K3VO7BhXw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69b2b43d-6e1b-46c8-96b1-6f2e8871dd26/0405b62c3762de24e55635674a37f038/dotnet-sdk-7.0.120-linux-musl-arm64.tar.gz"; + hash = "sha512-XTEkw9rx7RzvDIOOdTY3rx5SAws2Ywu/p9uhdqfsok/p5cTfnv8hcPqWz2PgBV30LwlQs7WQDesoJZDkthLz+w=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0aafc9ee-0ca2-484e-b1ce-5f40458d49ed/06cf3c6a1515f931527e8fd6986e3982/dotnet-sdk-7.0.120-linux-musl-x64.tar.gz"; + hash = "sha512-xQirUxDXQ/V+p4YR/+NUJo/og+fGc+6Ajaqm3eMLpFTV1w+BkcSetSrkqAwGLtZJC6HWt1L8xUGw63g19O7ofw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; + hash = "sha512-3AaAHY3jTfaY+T46qHLVcTHdPjOsT3zdvJYiORHg/zL9zqeDMtp74AEzYskM0k2y2GweJ1KXvm3RYpSPK9OMvA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; + hash = "sha512-lN65mIUJ/L//w1cRTQ9WRfxrb2FWZkBAzVZDoZG+8Qri+6QWiqaJ/32hobb6d5605Tp3p4R77Ot/C6RR0sINVw=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0 = sdk_7_0_4xx; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix index a982f4ab9f..1d787aac0a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -1,140 +1,210 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v8.0 (active) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "04gvqgl6b46dfxqs2m8miwn7z7j5accidm4vl22ddpj17r8yhx8z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "1vi4ccb95bn6zf3pjrgi1nkcmca4s49s4xb5ni12yfbxf5jw5vv2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "1nvp2dhznb8h4pcfyllwcx2vzygjpcqrd32blilylk5g5nqd163s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1mhlrvl7bs28bwfqwxydsmcjb4cm83ps2ahp02d86s6z30inlm6v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "0dnn3zbzj1ijp5kn7zqws4chnwklmdbiglv2dy664b99xspfrlgz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1bclpw8sa5fs8nv33smlkb4zx2ipans7ir67i5cdp2y3qg3afrks"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "0gnhrkbr0r4l6x0165g68m87mhavcpv8hqkipsjq2ww53bp7csli"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1jnr76a8r7sfjvl5p932mm4xn9pqnyv8rkbqddcbr9d396g18srn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "0jkjns3rpl2rzs1x3blsirkxgsz64685my1nl1xzh838y1mk16yg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; sha256 = "1fb7zhy8p247n8jfr69ca8f46b578ffvv0viqxwsa1ssl24a49g6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "0w57jbrf8w2ffs7m78saawniaabasxjkxvmv1lqm6hkb8b3y4rd7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "0lppcnba7jhzr034inxb0pqbywapfin7s9n6lncv6sbwmwcdw7b4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; sha256 = "1l04vb02ddvafbwax79qs5nfg49dg733mnawxjnzfhjszs9872vr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; sha256 = "1s7yas0561jv3ihka8zmhxqhb2zc55lslj451dl16196i3zgla45"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; sha256 = "1h5c5riyj465i8cdl6w4q10ymkfwd6f38nnqdbhs4hz9s3yqnw8c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; sha256 = "025h7ys6n6b4vfp05gsr4vqph9nhi1rg028fpr3g7sxp9s4b694w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; sha256 = "1avn1pwjan2pkiw1knh0gw5dj61ylyahi9nc8mh69z7q97yrpsid"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; sha256 = "1yf1zjx64rjqxaqp31iih6vqfhp09r8hck6fr7xdbq24d1jqxdf7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; sha256 = "1mazrqxr1hfpka0im7h0n8ab73rn2zdf2jbi9fn48panz3ncqgwl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; sha256 = "06j8vp6w3mjqd2qrf6ndmmfc563qd5gsfqwza99vzvwvsyyclix6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; sha256 = "1wia1vgf0ywz4mqz8zqiba8m3wzz4fb5zgk4glwyyf4m646s96ky"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "00rh92hfqmpzb1s3imsc78n24gmbd1hyi8s09ra4z6fzkrz8vi2h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "0mvr8swzpgmm6fp2gh0lr8kbdp90ng6j2m80gk5im8q46ggjwz2m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "0bgsva11n48n9cw2xjfr071x3aq0yqnis191hw8zrgk07gq7q77a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1i0g0jv7vnp7rbagjppldypqx1c6bxsk4zx87w5km1n0aclfmyfy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "01bsp8lj08jvv3bpnb0ngccmgmdfcvqx1038r5ls001ax4l1p4nb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1b2zg6gjjri57v43v4sindbikqlxxgrmp4f89gyz7467rd718qa9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "1g7kwsdj9d9wy67acz3svkcp80aaf3npfsyhgnvslqgwfg53r5y4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1qgj8zhsb4r42zcaw8s66wgs294405d0vkvysvfxjhq0qf4d8k0b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "1ghvz25730jskl3g7mijn80k2pnaddzadlpc5hrbhk1psrziv4cx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0jv18yz2cfrmky3v0mssddisnfraiynj2gp6djsj79i5an8lm86q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0z3aginrqsi7gbcj8rmga35jrw9qabcn6l0sxkysrs4b0qysfsv4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fggfcilvg0icc2zym93wiy2ww3jvzyblrymyrvab5q5n49ni3n7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1vhav8c6fl3kf24i85iq4hvkml1hbl0fn23zcw0il8za0wa96wjh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "07lmlyd36d4qgjn238hdb0rxki9dc367b05a8xfp4p9nf765s68r"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "19cw3h709whiysagdmrbqbd19pwqc9893dy39dkl353zwhcr802l"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1my2f45ikw0kay03d1l6yrdcxc9iwyg8w6qyzyhpvbwybva3szqb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "03zqkvfvgplrk2g0bd95agbly8lilqksp7v9jkfv8xi6fchyz7mk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0lvr6w07wxxs68xc4ki83xgvqbzraapnik8f73k0105vg80n684m"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1pch0b5f4a936ma9l2pf1y8b89swppzc1034yr9c58f92agwm7a5"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0bj9cgambifzjk68fcidfc2qw1jw6pmy40b6kimid8kig3vi8vc9"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "06ag1kj6d606h3vmqz2aap9pq7ca5c2w7qa0135md98nivl8ra2z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "10z3lzn58wv0211fx14xy6nckkpvr7jssnq9gd7jisc40wg47m19"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0cchmg00iabygbqrzrzw4pj461jw15a66bn8niqbv4j2j7fdxc43"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0f2yal46hqa26s7wrilymhlydj74cj705wivajw204pvx9y29nrx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jzya3wa3v5d27yr7cw3rin61xkgyllx5bmnmb3nlx9m7yv7s9mm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1fp73xdqbzbllb4bc942dnrmk00cgrr496svis58w1w1jhas8fg3"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0mb6zr6ly59hlc8i4jqgwxrhrsvw92690s036d2zjq5yqiiszq15"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "185dfmvph0dp0syrya02yq8pmaqx8rpz6an91n14mvjrmp6g2xqi"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1nncg3m5www0vhl7xr0d128a4sm6dngwf9y8shrgpi1c533yff50"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1z5ii7qq6kvhi62dbjg1miwll6z89xi3ndggrjymbq62q26vxk9f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0aqm506ls3nqa1qx9vp8zr96mqsbf1q1ni1jcy0ql39khqcf77lc"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "017jfihz6l7pai2lakj5niwnnmn890xd2lgr9vvzn9lf6m1gsa28"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0g80h08qizf0bmfi19ky90x8sf00x15xbwx6nmm1gmd0wfkcmfrd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1w914cpv0lpvmqi0zhrfxchida2adbllhr6617ix3f7w2g2z4vvc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1zwhsmjclhjawsjz7fwnsdmv14dgrch31spba32bkyqsn0bmfhnh"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "06x7nldwx6cfx2k8j26nhvg4vlflaz3qk3aqjld08jzjhzh9zl5i"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0p3ylipzvd41idbb8d11120rakknr8f8ys15kv5fid765wck8xcc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1vrqkddhi87hsa4agx1akfhvygxqlj3b1pq6g405k1pdxm7x0ngz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1r80l23i677carh93fpkc4qr1wnrkfx8wvdbqj70k29qarjp1zyq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0yf7i13rrjdc9ibqff99cspgnz8qgyx85hv4jvgxz2d3jknv8ck5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jkfh00davbf4ix27ph1p3g85amvrqjix2rapw1375pkv6vnhg1g"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0r9s92nx7lz9alxc2kn67h0x8vl71wh7hv5dqx0fmhafgllw8dd2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "13klkc3iy2lqxlknygfbqgqrpb6q4i3ihsvi9834aw17fiznrj60"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1hxxpl4wzn18gq5zpbr0vz87bs4czmvbibhsf1zznwb2yvlr0sh0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0wzl1naijk3gm879bd6s2975yhsksnq2gl7jg7j1bnwik27nwpl6"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1nvzykpd7d51bqh9lkskfffggd0hfm0hrxrnmp075ibd4v98cc9l"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1j15hhf2hii4fh2nnmr7wmjxcx3v58ckm8lf5nsnz71fjcy6r2j1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fchcm8hpianyj2n7lq4vajxak8ww9hxdh9bl6xpx2vij8rhhh87"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0lj58x7l8f5nj9pyy6d7my611rpw0b9m5x4cb8rhqrx6ywzpjmfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; sha256 = "1g0kyfs8dj9jirc6qym1y93hxkcff1c1z2cws1qsqsrxbnrrn5dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; sha256 = "1p5jgznx61rfanyzvvbkasp13yysjks9driwdm42cc7gw35h2lig"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "1wsaw71mq2d6a2n3hxrb1mablbr8rz7x35ibh41y11nyhldwvn3i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "1z8qvz3k1r699gkk96zrdffbqbb2j949gmh89hafcj9phmrbnvz8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; sha256 = "150rhzlbbg5fr1la67pbyksk6ca8ypqj5j1izc77c9c9xasfa7nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; sha256 = "0lxq6m1b91yc58xqwrw84r90vgviwg97nddilbzsp9bml2y4h8y0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; sha256 = "16n7frb84h0ckkripfm5x698l7b4m9i2brwrsfr7n2ccxkilnfhw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; sha256 = "1rd3fzdd4dwdiwqcrnaacy4kh01w1j3f37ig4bw1zpv2kyb2c6f7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; sha256 = "07a0hi147lag3qm9k7757w7p00l870i9ayhx2slw2g3vsr5fy12g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; sha256 = "0ysqwf6xbrv1c6q2chkr1hnkw407w1gk4ccpkivn697d1pc832hg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; sha256 = "1y9w1xj6hjh0bdcq3ywi98v4mkcpk55x48ac2b157qjpqam906c4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; sha256 = "13s6ymx8vnxiz4ynss7cx1hc5rlwip746y735x4hjqqwqnxlnbc1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; sha256 = "0sh1r13xmphk3zb625h8814s455kx0x0h0p3liaxd0nfh8dy2gmz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1irszs3125nl5d00yyiganqbsdid1sqj289nirvsgzrkmzk0c44k"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0lh81hxx7ai6hn8mfy579rym8zxydphq4nahwy1db56q3n7kbkrk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0a3x5vaqp0a3gm0dkwkai15jyi1qgbqapr7qg2nrv8q2w53vj007"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0z71d2s8nn8pidzdnsvq8gsnl8kkf2limnm5fxvrfxc6kq22b9qk"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0xk8va4vidial13wzc2i315k0w6yh6dgnch5bg53wwz2kkm5b7rv"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1qb75x60bpr9kwp8s938arplym8p1zj7hsxs2mwna9271c254yx3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0wjn5krkprgkz87iqzr10ncs3hfzvg2n9zb1xbcm3f0m5af893il"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "015mg8cyqa6c4q2zqrq68rbmzcnjpm2ay5cwrrg99r2q72k85yff"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; sha256 = "1sh70bdi1fz8zg2lnln2adn2yzjqi3fq8wazjbb8xgz3jbiha8ln"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; sha256 = "1z0h02av5737mlk3y94lyjqhyjc577kx7yzmacl89m32ky4r2wk3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; sha256 = "10qq6jvzg75bzlc0wv8z6wi9zv9f53rxf7ya7175lxjszfzjmrkm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; sha256 = "1kqcb196n8zgcwi4jznlzqx0mv1y2r2gk51wvvv3vhvmfjd6igsl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; sha256 = "0bcdfhqsls04gg93av3rnxmjz9cynli36nmdc9wxgqnr8vma799i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; sha256 = "0zzsb5xkifks23vryy4mpm1xyi69mix2xn657cmgp0nn26c9169h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; sha256 = "0vhx3z0aqnvlmjliqmd3cps5m34w69srwjw1506k2gipd1bhzgcx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; sha256 = "1jfwbyr43z6id96qpplxv8mvxgdwc6spiy327lbx1gdbpf6yvv1i"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "197lnzrfxws1b8pz64kiqjayaidv4rnigdyigpnfjq67w7x80s1a"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1ax2ygccd1wnlcrad0kzv1lkb3z67vpwbmmqfipzbzsdaj81sgqg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "04jwnn2ppdl1h11511df5wljmqx6hdzaw01qi44q5j5yab5ss01c"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "18nk4niv4nmpvhd67jflra7qrlq83mh8h3216p14kdiwmwbbzakb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1px4k16qxasb4vb7w2jcwjfr39mybhrjb120044km2ianz5mqsvn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "194y9hvf4rjshnjvxn8j971byxmd837ax3fwp5j2gj8lr5pmh43v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0gxprpxvd28ci5xshappd200f16vzgph7r4k921sx98ffpl45sz0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1mbd0x4cwzn8284xbk66mr18s7fc37g75yp9r21agfz2vv6yjcn1"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; sha256 = "0kcg2pz794qh3lis9n06c8zmpa2h4q5pp5lfysgm403xzisd9pmj"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0nzhfz87nfr8619pj75hnnq0kcl8w82kv4xr4528sdwbl5953dj3"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; hash = "sha256-5iWiiKBaB6V5x3GDvZ1DpyxDHFIsmewksoeIizz8Z7k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; hash = "sha256-3x7ltOqJJXYO+zHIIvH1SDEz9fTrHqNoyK68teiHGZQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-ZGunPQaL6Kz97BpQY9lSOPEsy1CvZiTZeidqnG18anw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-x45oE7EFl6V29tVnuvzfcnAufOQjVf8FYxG8TSNz77k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-UHKTFAfqIxoBZ38I6wBdMNA6NyQ4FhSJcHNQZxjaCu4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-KmiA+uHHYOnsfdG3F20mu0XllcRxEvMvWkHz7vK39KQ="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; hash = "sha256-st7UdPx9AFKf9o6WewsmUKhbP2IG2KQjHRCTdP4Vj00="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; hash = "sha256-VL9omnR1wz323jyU+UQWPuwKOv7UfkkiZ+8ja1JYDM8="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; hash = "sha256-MaWj6kbZ4td5Yq1aMyK1nqUva7d5bDXSewRoqjF0jS0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Dz8dkFRN//VvdLjWxe8+5o81adh/gqYyo5aHxtjzoqs="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; hash = "sha256-MJmQmBHWgvsqO8XYLnqsyUTfQ72VeJ/3EHq6OHtZ+n8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-dmtcy7cqijoJAUCEJTNcvqaRneRMCn7WJkurjk2YpN8="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; hash = "sha256-liIF45Ljv47Wkl9xhN2IWH4vbFPCUkvF++i7ENsCB+o="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-Y3KRiZ9i1IQoU/X70+c5hUkPsfSUJD8mrWecspUAEPw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-LACty1K+yIIJiTgArn6DpuMqKS+uhVBCgIG2e4W1XBI="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; hash = "sha256-deYqv/tadlpOOMof1/MoLu2fIjcfbQ4Y/auc97c0GIM="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-a6q/Fq88tknCNUEMiGAdCNOMj8rUyWMa3LdasqMl06I="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; hash = "sha256-MeztjburvdAXPWL4eLVhvL2+K9qd3otNatH8QbJf3Mk="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Q7ZRUqGLN41EIbmTPQXiiLIJsLWwHHlTMCg7e9B38Fs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; hash = "sha256-nb0PV2g3PjENKIFLnnUynIxa9GWjVRyprHRbrMAfHW4="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-exBYb8kUySdkudyNrs5ArXa/wkkS2b6lhVpm4jZMnqQ="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.8"; hash = "sha256-b6WidfvMYv6zHy1nd4kGc5oCg5tTDxPlg8CESjurv5E="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-4OtC6HUOpa6DSJPkA+/72wQHgGj3Kqh7iQyJtvvNtz8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.8"; hash = "sha256-bHuEFTwVzaQOEV1w/Jtfe8ZHMOtwHWsSqiiqoun+SkQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-wTLpzd7iu6eCyOn6ct4ZzB2NQq7GzNUJEsh+zkgHbdU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.8"; hash = "sha256-Q6mYxptkYaF0ThyJSX0uUVKK6R6x6Xkfi/40EqiDAQA="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-H3XoUT5B3taEoJvUFhlTRZ5/LI8VVaFxd82QZejD+xE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; hash = "sha256-eYuDkv5aQvet7FzZOsZ5LZHnbNE4na74cmq3JsDaBNA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-UMSNfp7fmU9UTkCj6GFoqz4iLDpM1zh0WP9W7KBIMAM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-lSBjAXq7gADmOA7NaK9S+S+8Xx8oTsI6Mrp3fgA3eVM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-RZ3KnxLJocJS9mSAwP69XCe0kA/uCppUNSMp4soCkN0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-iW0U93hxohZrnGYB4us1XAaOBXMtMofMlN/FVdVjSS4="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-X6iM6I4WpVbLCEDhwwUrih1801VKfFz3gAaYZuQMTxk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; hash = "sha256-wCNIvKB1pav/orE1e9Ljcb8NUiaIZ447KsyHtEI1uFM="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-Yu/CZXF9OS9CtGV1ohPRRLHKpg3xZXmH+8aukhZjJO4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; hash = "sha256-hSj6/ogmBRNoC4VIqmkp7IsFcYf1IzVhHFsGU4BW/ug="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-VXwu3zMEoxrLfABVIc2zIN22JsoUwCeuM7W++7lGeVc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-VACUGeR/lEFnS8O3kVBimN8U2sIr1/aU9hHyBA4cnKU="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-C3891F6er32h/x4bjp7nMbHOWvaGhjaAVxPwGQtxwtc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-s57vIXMmdrTdlGmfqyemkSJP11MltQWemJnet92e+A8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; hash = "sha256-HDpL4+yMCXuy05nnJWKqZB2KkumluhvznAxAglZ2x5o="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-/9Hsru4pLWKMb2LTF1erdHILGdEc/2NnuTIG+dcf1jY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; hash = "sha256-Leqb/Un4/GRgRcymCJWnPhjZCn8A2hl4nFdYJfkNdqs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-y5IbKOkqAKBpyWiA0PFmrtVXGXsWLHvX2FsiICm6egU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-jJ7jGIYzDYqBZzJEG3BwS+NqUv7o7tRxUNgOTQ0oFSs="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-SCj9QjWOJvv3TvlR0TpIyFZrebRFTkVFVPdQ82F08gQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-LbvKpuOg1Rdqtabz1UvoADiNOkh+phBdXcD9iBGAAD0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; hash = "sha256-TwTvStZ7PMGpFh16lSI4iAJwDz/lnJkqHk/RQ0KEQB0="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-p2Xix0JrQlMxDbvuPmXXaikVLVdKo1OPdk5w5PKSp3A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; hash = "sha256-shWbs109a6xx0JyJH1hwjs0OR/KhemxYjjLJhrTzE7w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-cdjNG4XehuADgSuW0c/PKC+6VA0rdzisUKYJXMPhSvM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-kxAG5q8z/6d3jjYhIbEOLTa9sFUveg9AK9QWEYb+Osc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-M881jx3YlNWC51BZguFtvn9UfU6neFeRhSaq0zsMCFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-BwC5R+ECo52tePjkq/B6OEQvS4hq8tlAfUOBi9UufSg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-E6clBJ6GdZd3d6XaGqlwcyJq9UN4a9t+ixdZi7Ro4Xw="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-epjQsC2vTOpppEuMljG78vm/RWecUu/YJRAt+2ETd9s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-DHGL/dDpQ6LhathaNJxp3M3qQcCEG9oYisUQ6WMurMA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-6hx88DtgvvwRhyEFHS32AKvRwwHZyS44SxYRG4La+i0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-KdRDHgeE6ShPewlbreXJ+87JrPGdhO5CEGBzVOyn44M="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-g7De3JFCkr1wtMguY1QJXAZD5CX855/xen6pCMCrkDE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-PdskfOr7EiC4VDvyAo5k5MjmKayexsyPNkJhaAhVXjg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-tSZ9tj81dWrHqrau0in1b/ZgbMyDs5P9Ea3sofhQ/ks="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-21RqIxjfaIOaABcqoe9AlZElWdXNd44dX0jodejOFNY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; hash = "sha256-nCSziE636/NGvg4J8HKI0CZ48SZZvwKu22QZa7Q/sAg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-3vnqKFPAhjoLP6h/MnVfhoWOr2/0XvnUyufafbYED8Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-4zmkFZSBB46KjlubRHJ+DIBZs22CJLbIonT9hVsf57o="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-JeCvY8S+YPlFMwNokIxIfOsMc+cPSxIRozAVT03+ZlU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-EXfxzK1Z7kqCDckq829GHat6EfYCKJ+9BrcBeHd1raA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-oDjnxygsxPsy1Mgnx59tpmqikAgN5H4o3IBzXup4zNo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; hash = "sha256-xxkmlp9i3x/4Ii+e4YYMPAA4iWdK2cwwj4030tp3o+U="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-ZB3eGK98abOZpcYmfWx0V3G/8AWr20gGyB/Ko5Zl91I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; hash = "sha256-L1IBy+DvMCZIbTzmlvSU2vsRrlZz7f29VS4H0+1/stw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-6G+7coU3SeYUTAjWl0iSYi28nGv5mzTnS8nkMMffGP0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-o3tSBAtHJGV5FbpreOQPF1VPb1ZoJI0unynfBUwvZ+E="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-NI6EnCoVuFHZ6mH9ZMXb38GhmQUhfxwP+vPlO/MsVnI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-zvmCpjhY5JRezpwVr0S90rJfV0YGZ/wFJswo7Bl6tQQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; hash = "sha256-D4qB2A3tJGN3nJcxMl/gBxA+LQx5QiawYWHn1Y3jWHs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-emanxsPDi9tYicfkeLRVN4r+yZq06jG2RdoVpRG/lK0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; hash = "sha256-x7WOZWhE4NX6yc5MBlFO4EKHt4ExhnGx6lhmYrr8wfk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-SWEUTsvHkPP9S8iRW/PrneIZV7NRkz3IPiVmKZ95X6w="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-0EJXF7Aa+7nEUOvqMCDLr5Gwa9OWu/Ol5kpCymTVkP8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-sdCf4IfySwQalViNicdX1NFN3obWCImm6I6Zzhu1pxs="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-jHU0GS/mtOjKniVojxzKdk6VgQghNLRWi4G0/W+kflw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; hash = "sha256-hBmQqsJX4lPCEkwh0kuZl81KNkqR+4FZWwBKaGQPPPk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-kWp27hqFc4GlvnFiiPZlW8F6UEXmFRNAN5RkkNfM0D4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; hash = "sha256-lD/M7PhWXUSsS3FJ4doXNo+zFLIAnhqBmtfBkDvOX9U="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-xJc8ynP8Yaq3fdBrd+1wSgF02dx6fKaO8Ty1JJvm87w="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-/1nQT+3thlkAeQbfsIakuD+/oZsq9KeI0vCgCFubOO8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-2P9wZVY4iQmOxKttjrqb2fKQMWHzupFgVuwcE4egAOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-ZTK07ZSjid/flmTDgrp/GH37rmYpOYdXTKzJnEeIx3k="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-Lzxot9nzljMCvyqLHiXOu6qC3rgB3iN6JG5t1QCAbko="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-NmsUnkmjpbxYa3jNjLa3+CbbSa1ipFvolk6fjJQ52co="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; hash = "sha256-pkfKvNeb779TUp9jp19peJjCXK3NGpexaFjWwc3dSBo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-C0zUiMMAQ9nd1n7PDVoBhCShHzdGI67YFySTpeFH8uE="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-ojXEKX1OwepAx61seCAPh27UATzGTsE6VenT061IOmU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-wMhsf3QncEUGSnFrGEck2Kyb8cPLPW8n7ZgKHwebdI4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-AGqQ6fZicft/cBquuHb9jOh10N8gr/sLfijYzwm9vcM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-hl5uj5iR2xXkefLQJ7DVU0NfThLatJUOqm9MGZUN9HM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; hash = "sha256-gS1Lu8UcYwlJL+N4Q86NnObCYOjsaG09+bHbjXr1Ro8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-z5swa/BoIPh7oDb4WpAh5uvXZ46artGD/lnQm4e2cko="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; hash = "sha256-fpqkDTGVOO85fWS+X5Yj//NRkVoRf/RxJZ974N4OKvI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-nZEdf9Y3TLgyLOzSpn5ryl4xAbIy1vMGnVqCcYr4G74="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-NDGG0iZtxXLArTb3DEF1ELT3nHNTT5ogXqG00+70f9s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-QYpsPJMunG+1LY6iOhkqe3TWZeUnV2sFdCRGKByEJcg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-B0EIM5Jxi367oSvB1mHiHE3VpdoE02OF9FbFC1FlkLk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-y1V5P/emZwwzWoz0UtMC/OYQjK+nGe9vkrY4RE9HRVI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; hash = "sha256-vz7hG4LOgtZVpOMCCDrosxSiSUAIFmHWHxPe2kfIAWo="; }) + ]; + }; + in rec { release_8_0 = "8.0.8"; aspnetcore_8_0 = buildAspNetCore { version = "8.0.8"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "d6c0cc2aac79fbacbf81b597f286763599f66278c17ddb448ce0b93d499bad8f88777d425854e68602945ab18af8a61f1ee59d431d5503006137f86113faa8b2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-0P7t2Ru0AoBp2M/xcmGR6fCZIOdWQF3g0rv29DEWJ3zJPr4kg/QFuqSXK1T/6JsJy+FypjnmA5eucTjfXvSMTg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "c3dc9d71fca0a48eda96074cbcef4c9a265c1c4e10cbff38614dd74d79443ae9d1ccd10714764cd041291f81d83c0ed1c307abf89249ab4b6f58a5de952fcffd"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-w9ydcfygpI7algdMvO9MmiZcHE4Qy/84YU3XTXlEOunRzNEHFHZM0EEpH4HYPA7Rwwer+JJJq0tvWKXelS/P/Q=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "d3ba8dcfaddcd6d50fd434911fe3eb8309666939a8a1ede800d7da2dd814efbd781d1449a42b71d1c71d9593465e9e97205025eb432808ef9a3ba0dcbdba0e3e"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-1sDMKqx5+6y/gbWX8oZ2NZn2YnjBfdtEjOC5PUmbrY+Id31CWFTmhgKUWrGK+KYfHuWdQx1VAwBhN/hhE/qosg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "a196c62b14e9136362073826a03e76e0a147027f03655529426e594f7e44eb8dd036daea80997876047171c1793c7edcfa5146bd55a01b591d9405fb1646eb00"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/9255e487-cdf2-4690-9840-74712503e37d/40be3d122db1d1ffa53a9843321c3979/aspnetcore-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-XZ9gnnLc/MFra7Y9Sef9R8Pi13kT2d4UhkQX+ypTSy99tWUw2xZazGNjNkHHBtD6upXbmFsJhEZ32MtBA5oMZw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95f358cf-86b5-4789-8ee8-063067081c8b/e50e603b2453d7dc65eeb26dd4cfb398/aspnetcore-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-YCjCkwbUlp7kBMRZ3KMTDx6WFNGVTo7UQAFAs1rYoeZqCos64CFV32vQRs2TCQdCIEh6HCYlw58IG9xsjtYgBQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d2ac05d-2bef-4069-9513-bb2ef7fab48d/4f3d2d3fec003a65513dc1f70c126ab7/aspnetcore-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-gi8uFxbcLSqkb/CPTS2bueqMgjMnhdCrpfTzPl62C9zYTomc0qE8qTAyImcQtfDKXHFZvtoXAn+E76KFJ4tXmA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-oZbGKxTpE2NiBzgmoD524KFHAn8DZVUpQm5ZT35E643QNtrqgJl4dgRxccF5PH7c+lFGvVWgG1kdlAX7FkbrAA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-07qNz63c1tUP1DSRH+PrgwlmaTmooe3oANfaLdgU7714HRRJpCtx0ccdlZNGXp6XIFAl60MoCO+aO6DcvboOPg=="; }; }; }; @@ -142,21 +212,37 @@ in rec { runtime_8_0 = buildNetRuntime { version = "8.0.8"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "8f5220098c562fa3490417748eb9f4f9ca1551f7155728b9ebb1924359c63c18dedef643bcd89ec67b59cb5b1b9de7283ee156ef381ffb16801b516dba9b1b0f"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5e427de4-981a-481e-9fec-fa77b02a7edb/0d156acae55ca1329b6b9a8de70f398f/dotnet-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-yHr1qq8y4YzNwpZRecZaq65eDp6Oogn2w2QnDOLkr//ql5yiLhQ95GdONqKxLGa1dViK4hnxZjaspxIUQCQCiA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "246fb7e5edb51db93421c6bb7420f7a358430b98b224a71fb70e71a2bce0bc91f853aa89109f2188b0ab28532a245c3d52baac163463e01a02019dea37fd39f2"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-JG+35e21Hbk0Ica7dCD3o1hDC5iyJKcftw5xorzgvJH4U6qJEJ8hiLCrKFMqJFw9UrqsFjRj4BoCAZ3qN/058g=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "8029986c1f8bbf1b0e8d0929756156fe41d46d2df6ebe1ab1c66fbcea2add47c35b934573c6198797cf60d2b372cd463e70326c0a35b0926dab4d5c157a357f3"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-j1IgCYxWL6NJBBd0jrn0+coVUfcVVyi567GSQ1nGPBje3vZDvNiexntZy1sbnecoPuFW7zgf+xaAG1FtupsbDw=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "88b06dd051819bd9e8ce2c340b2516dc0e4a77d565eff145d8e957b2552a641e235a5ce7e8db3607475887bc766f1530d01d0e7efd80d10cd652a299954398b4"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2f4507aa-972d-429c-9129-cfe95c1279eb/60dd9afc3f4786a568b01119c2280c63/dotnet-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-im+SDZPX1VJ9won0clIeKmca+05mOqrP2CwyZYwuo56rQ6XJfT09e6WEA+v79suW/HP/W3zMGpRH0Tv0HuuAyQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d78f160-0833-4db5-bd62-947f8bc2d571/25638f47211018a7bd8fd9d314763196/dotnet-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-JvNeHGB0p9maQOpI9sAtt49OLHQ8vHRGOglNoBThJuk3nQm05WgJrJgpsmtroKkBrcR638PF01qX6erVppMUiQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d9c4e4e4-bb2d-4f1a-9ded-bff5e354bd5a/0c6dbc5f68bea36a65fdf80e6aa4d55f/dotnet-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-yi/zIUVQZRMlP4Ds1ytcJNi9oo9EroPJiMOev6dec31VELy4S8J6FJ0uaZV2H4sSTXcBUirpu8rBf8MmZyF+tg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-iLBt0FGBm9noziw0CyUW3A5Kd9Vl7/FF2OlXslUqZB4jWlzn6Ns2B0dYh7x2bxUw0B0Ofv2A0QzWUqKZlUOYtA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-gCmYbB+LvxsOjQkpdWFW/kHUbS326+GrHGb7zqKt1Hw1uTRXPGGYeXz2DSs3LNRj5wMmwKNbCSbatNXBV6NX8w=="; }; }; }; @@ -164,70 +250,118 @@ in rec { sdk_8_0_4xx = buildNetSdk { version = "8.0.401"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz"; - sha512 = "4d2180e82c963318863476cf61c035bd3d82165e7b70751ba231225b5575df24d30c0789d5748c3a379e1e6896b57e59286218cacd440ffb0075c9355094fd8c"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/788ca4e7-c3ea-405d-9f82-2d362d4a08f6/d54b1aefd4048bcf4eebb24edfc6aeb9/dotnet-sdk-8.0.401-linux-arm.tar.gz"; + hash = "sha512-+5Co5S9d0p5ZU+RmLMnVfKqW3GqPb/bPrheUeqij9Ttf7xuzW4wFgV+hyvvccxefcpbOhGv1dp7hLJ2vW9J5QQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/14742499-fc32-461e-bdb8-67b147763eee/c14113944f734526153f1aaac38ddfca/dotnet-sdk-8.0.401-linux-arm64.tar.gz"; - sha512 = "e8738b21351d030a83be644571f3674c8dda9e6fbd360b221907a7108fab02becd18e1331907535a1294d8c4d0f608519674c27c77dc2c2803cc53cce3e10e0d"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/14742499-fc32-461e-bdb8-67b147763eee/c14113944f734526153f1aaac38ddfca/dotnet-sdk-8.0.401-linux-arm64.tar.gz"; + hash = "sha512-6HOLITUdAwqDvmRFcfNnTI3anm+9NgsiGQenEI+rAr7NGOEzGQdTWhKU2MTQ9ghRlnTCfHfcLCgDzFPM4+EODQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b266f183-c677-4f93-a729-abe0334401ea/ca0ce4f684c4cfea2d372223f9c67cbd/dotnet-sdk-8.0.401-osx-x64.tar.gz"; - sha512 = "063aeaf4e949b96d501b77873279f0286cde46f9212b59181c6db21630401fd6a352e3259848cee8e127e4ceac85a25e0bce36699a2fb6f6e2a91997c6f61eae"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz"; + hash = "sha512-TSGA6CyWMxiGNHbPYcA1vT2CFl57cHUbojEiW1V13yTTDAeJ1XSMOjeeHmiWtX5ZKGIYys1ED/sAdck1UJT9jA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/29ef2c29-154a-4c44-9450-071ae664767a/4ce00627f3eaee13874b54f033a9a27a/dotnet-sdk-8.0.401-osx-arm64.tar.gz"; - sha512 = "a3232c0693b41ee6b18dc3c8b26d82dd9116132bd7871dc9c0a0acc5e7995f352e760869fe91a08828417ea7b91fc27859aeea449b9efabc17c136a57737c93e"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/f9eed98d-5e19-4822-85d6-c59c62376bad/52ba188eabe759516711f14247c57f7a/dotnet-sdk-8.0.401-linux-musl-arm.tar.gz"; + hash = "sha512-xcVH6zAdyWXu8dm8xkIxZ44glZG4AZengknTXRZVpUafOc5t5lQ2N19uQtItFZw9xIe+F/bb52NAQAlfyYjbIQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8f3dec03-a016-4c06-a4b0-04efcffbe521/e0e94170cbed0aa9312be63e43a69932/dotnet-sdk-8.0.401-linux-musl-arm64.tar.gz"; + hash = "sha512-L6q5PdOKSThgMgg6D0o6WlZh1uz/SpjwaO16oHsgEjOAT6Dl76SRG27r7cmZTVnE1dhD3rdz5+JieyqpfmNKgg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3ce68ecc-a007-4d15-9196-79ced76a154a/6a45f69bb5c24576abeea048cea09987/dotnet-sdk-8.0.401-linux-musl-x64.tar.gz"; + hash = "sha512-5xG3SDImlGPif5iwScRC02hM3CExFRMyhaKxie9FZLZRJ3R83TqQDeU1gQGb349HQm8s/Jv8HAw6gxBvm7VOpQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/29ef2c29-154a-4c44-9450-071ae664767a/4ce00627f3eaee13874b54f033a9a27a/dotnet-sdk-8.0.401-osx-arm64.tar.gz"; + hash = "sha512-oyMsBpO0HuaxjcPIsm2C3ZEWEyvXhx3JwKCsxeeZXzUudghp/pGgiChBfqe5H8J4Wa7qRJue+rwXwTaldzfJPg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b266f183-c677-4f93-a729-abe0334401ea/ca0ce4f684c4cfea2d372223f9c67cbd/dotnet-sdk-8.0.401-osx-x64.tar.gz"; + hash = "sha512-Bjrq9OlJuW1QG3eHMnnwKGzeRvkhK1kYHG2yFjBAH9ajUuMlmEjO6OEn5M6shaJeC842aZovtvbiqRmXxvYerg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_3xx = buildNetSdk { version = "8.0.304"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/52cedf32-8a92-4966-b184-18404ea1c5a4/cc399fff1b152b822776514ad247df50/dotnet-sdk-8.0.304-linux-x64.tar.gz"; - sha512 = "971c344379240ec4bfaaf1eca69c6667e594cdd0dfdcde6e8962cb7a41d669dff91c644e48eed3573d841b7b3e60ce02e0c27a7ce37b66cdec27bf3457087c4a"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c73041ed-e684-4dc9-981a-2db502409dd7/0e24c20b4b1d0a728e20982de0b8790f/dotnet-sdk-8.0.304-linux-arm.tar.gz"; + hash = "sha512-MbSFdO52Ow1BggwfSWs+BVNsa2n9bnZBJEsc1l3MOy7V77SD17/MPC/O0v5OlGWJpY4kTdxaExyyZUgiAYwNLg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/be9572a5-bcd5-46a0-b10d-0d00229ad57c/b80d3adb25c20fec467bd33f29f9a1be/dotnet-sdk-8.0.304-linux-arm64.tar.gz"; - sha512 = "6ce93ba330848b4045b6c63f96ad0a91c474361cb0a208bd4128d418fd6da04695559add63df9a0acf283a32e6e781328d3979af900e0b2382cf006c9982806d"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/be9572a5-bcd5-46a0-b10d-0d00229ad57c/b80d3adb25c20fec467bd33f29f9a1be/dotnet-sdk-8.0.304-linux-arm64.tar.gz"; + hash = "sha512-bOk7ozCEi0BFtsY/lq0KkcR0Nhywogi9QSjUGP1toEaVVZrdY9+aCs8oOjLm54EyjTl5r5AOCyOCzwBsmYKAbQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b5c27ce-6c82-4a06-8960-15ebd5434595/508572144872e190e7f00ba6583011d4/dotnet-sdk-8.0.304-osx-x64.tar.gz"; - sha512 = "50f0265436e8c3d756ba00ab7fcd606cb5d452d7bede4daf97e4c02cc97dbbafc00b76f37ec4f07bbed4bee643a433849ddbd363ad2d916aa5965ee74ba317d6"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/52cedf32-8a92-4966-b184-18404ea1c5a4/cc399fff1b152b822776514ad247df50/dotnet-sdk-8.0.304-linux-x64.tar.gz"; + hash = "sha512-lxw0Q3kkDsS/qvHsppxmZ+WUzdDf3N5uiWLLekHWad/5HGROSO7TVz2EG3s+YM4C4MJ6fON7Zs3sJ780Vwh8Sg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ba638c9-0721-42c5-8bf8-9706c0f9c033/f8dbde51758bd9e734a9c932b60e12bc/dotnet-sdk-8.0.304-osx-arm64.tar.gz"; - sha512 = "6993a950bc5bff0efe762ba2562a88761e93c61024d93633209950cbb68aeb5ff189fcbfe9247a1cdebbe37e738136123c7d4eda1050708608bb1ff0408eff4d"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/21dcf586-94e5-44f2-8407-bd409d73f59a/ec99c395aae24f38dd5cf91c8dc06fd3/dotnet-sdk-8.0.304-linux-musl-arm.tar.gz"; + hash = "sha512-0tEHHGdGZKj+lvYaYgTFb54sZZjSoR406skWX/MNHNMxGeEOeUmamjVOxGHjBj5Ad3KzYvNkDmQRTNzSpO8Pag=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8083f186-347d-43ff-ac05-575f63a1c692/dfbfb3ee9943b880472ccb8e5517a881/dotnet-sdk-8.0.304-linux-musl-arm64.tar.gz"; + hash = "sha512-8mbyyMQFN32ExPGRegxKdJMJfMhTlA7hKQ7vyHdzMZNagAAqnGx8AxmP82YbyKui6TNBXYp3iUn/kB2ov9qNGg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5cf9b56c-0da6-4229-9e30-44547aba8be6/20d2e5353050b04d3272aa5c4a1b689c/dotnet-sdk-8.0.304-linux-musl-x64.tar.gz"; + hash = "sha512-QdptR5cqfKZ268Bxhh+jxW8xH2PuCff+A8wJzvHkdx5O/nPF/GsCq4TwB8LnBE1+4WxliXH6hW1T8V9D5qYdmw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ba638c9-0721-42c5-8bf8-9706c0f9c033/f8dbde51758bd9e734a9c932b60e12bc/dotnet-sdk-8.0.304-osx-arm64.tar.gz"; + hash = "sha512-aZOpULxb/w7+diuiViqIdh6TxhAk2TYzIJlQy7aK61/xify/6SR6HN67435zgTYSPH1O2hBQcIYIux/wQI7/TQ=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8b5c27ce-6c82-4a06-8960-15ebd5434595/508572144872e190e7f00ba6583011d4/dotnet-sdk-8.0.304-osx-x64.tar.gz"; + hash = "sha512-UPAmVDbow9dWugCrf81gbLXUUte+3k2vl+TALMl9u6/AC3bzfsTwe77UvuZDpDOEndvTY60tkWqlll7nS6MX1g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_1xx = buildNetSdk { version = "8.0.108"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; - sha512 = "5666ddf6fa9b65deaba4d7c5fcc2e2d56f631c4f5f6fb2a9f5919af0616ab2b420b12a828becc2e4b8628a76ac3dae824b55abde5c6d5ac59ee131d7eceae7c2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/27228a4b-1ae9-4c1f-8a21-eecd21d6c7b8/c0500c9fac6db54f68c04956b828e8ea/dotnet-sdk-8.0.108-linux-arm.tar.gz"; + hash = "sha512-+vqFZLNLUktCCeEEfOfPEZCl1C57obE1JPXeYCsHXmMM3SKVZ/FOsvCubJaskQrp27T8TlKN+VjJ0xRxNB7tyg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; - sha512 = "6cc723f2b139d19b2e17da5936698d388a5b64638b75ef78c40c407ed3cfd3dea745c2916f03efc9e66479fc55d608eb3a89305727ecdb1c999b183b58de258d"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; + hash = "sha512-bMcj8rE50ZsuF9pZNmmNOIpbZGOLde94xAxAftPP096nRcKRbwPvyeZkefxV1gjrOokwVyfs2xyZmxg7WN4ljQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; - sha512 = "a80fee279abfeb558a5540ca2a969a11bb3dbeade8c39d8c47be8a2d622ef1c2bedb22c874598ad41dbff2b95d5a43197bd9f55fc933ab4ede5edcb6a76cf6cb"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; + hash = "sha512-Vmbd9vqbZd6rpNfF/MLi1W9jHE9fb7Kp9ZGa8GFqsrQgsSqCi+zC5LhiinasPa6CS1Wr3lxtWsWe4THX7Ornwg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; - sha512 = "83b01276474b4b62bf0a282fbe11d2353a2191d90becd403b373cd6dfc95264442a907117ad8f615765b13969267b887d26a9f24dbd5f88d8b55daa94412d13c"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/24ef2f24-ca8e-4c3d-8466-2311550147d4/acbf2877ab4b8a611a3b63a9b9853dfc/dotnet-sdk-8.0.108-linux-musl-arm.tar.gz"; + hash = "sha512-77MI2BrBAgli8U0D58qUGaKQGghGEg4HzZXGVAf+KYGiY2DC/+oUHYBYGqxtLDanN5x2wHsvs31O+4NpBfj/aA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/63bf0f75-e962-46b3-b7c3-12aa20129d46/071514943265037c423e6f5e40df7ace/dotnet-sdk-8.0.108-linux-musl-arm64.tar.gz"; + hash = "sha512-5wCbo3OwQ8y0aVVycayK5RirnJtbNk6YQdi5cwW2A28zJA5nLnxIN5hhaiM0KXSNUDj9/TNjUrggYK/WRXRwRQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cab77c39-2e16-4f29-a9cb-e490d7fff442/ee37bc88e34e082a64d834ed5041bcee/dotnet-sdk-8.0.108-linux-musl-x64.tar.gz"; + hash = "sha512-dEcVUB3jlG8GzTFvNcq8DjY+CvZRBEyXZwjA1I1OsNCUidkszrKDx1Gy7tDik86qq93Lq/fCXiHWWOv/ncMEqg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; + hash = "sha512-g7ASdkdLS2K/CigvvhHSNTohkdkL7NQDs3PNbfyVJkRCqQcRetj2FXZbE5aSZ7iH0mqfJNvV+I2LVdqpRBLRPA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; + hash = "sha512-qA/uJ5q/61WKVUDKKpaaEbs9vq3ow52MR76KLWIu8cK+2yLIdFmK1B2/8rldWkMZe9n1X8kzq07eXty2p2z2yw=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0 = sdk_8_0_4xx; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix index 9232daa707..f615911b77 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -1,96 +1,166 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v9.0 (go-live) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "05idm7kclnb8nw0nwv9wr40sm5fw7wk3zy2khiaiyvwf5c7klbkq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1pxyk6yblg9y58w4lp9nb1dwwh0yvis4lq8b5w65ikihfyarm844"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1prajkaxj7j0jdf6s52pkmgxi8d8al6h7kvl9viwgqc3jqz2kib6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "02kz3kagy2zq19vxq2rilnnc8lnal4g6l9zzsba3045daij0gp61"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1r8577sjl8bifagq8cz7lx2jzdhhn3r668h313mz7fxwl2bqwv1a"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1bdjl8kh80p3y51yngzvvz2kc9algsg5mx9givyapkcvj465pvhc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "09ispgilx7ss1b43wqcy7c9k1145p622h22vg6z3c0g90i0n2qgw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1lnz66r42mrxyfjdv5hswwmxv14fikn5p2il512vq0rmqq3fjwg7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; sha256 = "0l3wb3v7grmpipd6p40dajzc574qmffv01g68n5c5qy38fs5kicl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; sha256 = "1091fxvfq9zicgrx9cnk3x7xsg4389qxnj2cbfa6fq96p6rizhi1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "16q6865rwblb2jiqvpiasw6fcq1n4h221pi3xgjdc62vkx0k5xd0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "01c2ya9wmf7qkpxyjlnlflihxqpi6wrfq4slp3dylyaylypgha45"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "01qlklw2y6ci1mm8p4fcx4f7sx4lzx9rbn7d9pn1j85j2bb88rp9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qidj6b5qymfggpgflg3173jalzmvxz662g9pkj02cd1kbm6qp5a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x7vfky0ar1i3521xaai20a08j43cg2azdfghxg5dxaa1ynl53j5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1i597rmx8ab3lbl4xkff5vnvkrikpm1zk1vd5b7bk8jyz1ls2wa2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "008w5dlmnpc73mxk580l79a84djxnchyw8cjabh8d0255fk6p3a3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bcfx38p4zqbvqvp3mrjm8yzcbh88i4vwd5af90z1ikfaml6841r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "00lhshwp5gj8ckdq276lrjp7025xhmi33vlj1284xhfvbbfam58c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1wqqq09ixbshswx59fq6ignj88izazw1k8sqp2iarxfv0jkv8fng"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "07qgqja3c1f62yfi3lqjjsyazp1hlkk41wkpk117b2xm8hw6yx4q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0a0kmkrq99hk6sm690qwam6i0fdgzpx8yiawa6h4ylpazy8jxfxv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qbaijdf4k3z71820r01z3sib5l7nlr6mjf75gil39yhd9s6slc7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v56060wm998yy34pdr8cqp8vbc3m97yzsvc50rm6rkhdld44vql"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "08afgp9k7nr02jikd5xaim53qiqdn4r556v2sfmgv17mvix7vhmz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ldmhq12xka64hn327p503m6ji12djkjax9lnr5lcflx527k5i3f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "13qk3ppy0ym4x81jwxa0322hlzxhhg6vkb5n0xzyzy5ks8rfqnx0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "17f4wkf7pq1c2hacl1z53am96wg5ydq9z0gsdz5zabkyfgs4knin"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1p39yik8xx87xv3jykljxv9jsazkkgcw47ckppzfzadf6967nh2r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "0kqw9hnircqdbgpvk4m634nrn4lxj2p40a6qlscsqvw5yq06qvsz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "05y2i9grw8my2kg2svrrmpk2zflvcqidmkyycf58p9a3bmd2xp32"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "00gsj3xwfpsc02rv4h75hrjq140ppr1bjqz5ics9xygj9gqrf40h"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "12vld4zgmlm1s73vn3csss9v81zh53xv0hhw138rrizsl8sxb0x5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "09yn2lqvij53mv0w4n6fqpxhh15hp3fap1ymjjv4bv11y0gsml22"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1xvhiswcni1z6czcmra2q25i6ih4pf5crfajgzb6mhvxxambk50x"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02mlwynhl24avpyvllsgpmnrp6q05a3q5ia34anfs9fjxdbf31yr"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1gxvgw12g617vj5gki2ag51ll4bxqfffbg5bkqjbnxig4ilh0xmi"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v7fmdv74lgybk7bvighf5i1qwhlsb44lmxmkxn6f5ijc7jd1v5a"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ql7115ihqqv09qzd23jd4ng7dnhk0vjiy892w2vnlaghkka1klr"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02v6yklh3kw6xl8aacxjbsijrh0x8654hnjf3aa0qi5ffpng9czh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0bi1vrf5g26gmwv5js7rc4g5anva0m0gsinr7cvqixd2g13jl708"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1r3p996mj6hvl7gi6kffbnmm744i24smlxb9ay8hbkjmagv7pjp2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0llqrym4z3jrqf79hpl7w25vqnhrjsjmywayp5vr4c0y2bjpl3sk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1hqfam3749yy15fyvqza54vvsx883kk0gq9fs2y78idmj0pr4g95"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; sha256 = "109f84rqdqj5vl0fxyb7nhq5lil9s1b7l6cv5y8z4gg139dv0z38"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "08qm6yp5swc7zryk5qkkwbsxybn8if6zmrai280bll8ygn932594"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0n5dgj0lhxcjzy8bbzkavz2d3ixf4d1diyq4i6nysgri81kk8wd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "10lr36pv80c31vpzpnl3jxs655xm2d2b1gj26891hzpwp0v1z9l6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "07j0samh7jlkjphj2dlkphj0jrhs694qw2md6hr7mpinjr065ji4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0j1nkhmkg3p9n626j04lqr1vv3xnpnzvnhr39j4cn0ixyr7pbfqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "1rq2ixq8r6r29mn2xi31jpck1xicgwg3zjzlvs5zdib8w7rxiznl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "11pxn2gwss6s8rmkgzvrljjwndif3pdlpfy0l3y5fbq60rrv6gy9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "044j6xkzylzawfjghqr5fkr63k0xhxvs7azmw8pbgh6mprmva4w9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "16izyfqy0d2mvjl45z75ymhvjyrk5njrcfv1k7h223b1c1rn8p8d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fvhwlyvz0fm9cd0pw7l9a64shc565yk47hp873y7dai4lsch03v"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fnk9q8iplj70jqy490fgg67z6sx5kyblkwd8z730s9yc3jr3919"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0yxnbm7p8s9s1j7rl7cmvg1j6xnxrp64qp4dsi9c5hzn0fxg3jjk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1lzfk31aq4kfaypbqrzv74vw1pw27576a1yxpdyxls84lmd10dsy"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0cq9i0cfd4gg5vgywf2jvyn8mbqnwjz6gi20x7ij85bad9hanm82"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0zv3brnkvn8v8ml2597vl7z1ydy71j6q7ycjkygy4l0b053870sw"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0vgr2xnskksrnrwlzk0n7qrajwkmz7cyvaifb0jbcx3kyzchxiz7"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v22m76v8f5kwd5baww7l81ap33jrw4ccsz0lyki3hj2ssmzvr3i"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x8nafwsh0y0dycdpwjix1rxfkwk25irsqrbzcbqbdx3aas6jpk5"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bbpncqbd2f73n8nznhi2m2i5z8n2hds0ryz616n0nzcc4y3gnkz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "08k1fzwvqyiqik98r0b03f089y4n06p5nfr73688rijgzm55l8zh"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-IcIfs7kmYWeUW0xI23FCgzzdTx/TstTzY/En7HZ3IYE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-YtwuWl1DpYuKY97P2iJmm7ov5q05by3eFL4inl+Kwhc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-aHywWxrhPfKRL5sZelbQiUZaMLRn+e4A3UXihjNBLoE="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-KaSR5WA+aTDOR41PuvwsXZt/zHsOJOKxBEfSGxFO07o="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-f9o3PGHsW2BNMN9noBsUFv0SRRUR2m+RHceJtjCzd60="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-1P7Y8+FoxfaL3vTLPx5/LPYw2ZVhxC5sTSKbjHCPAuc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-yT+zcwYGL1f8oMC7S9sdLjbLpaR5/zdrRtpozZ+w/YY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-U8rxugP2w8JS1I1cTMzN3XYjw9uVHZqPDDppdE9dtns="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-iRO1a77VwLcu4vWro3eHHcxh8nQlY/ik4+pT/2c3khA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XIODRgELUOKfn5L5g40Mxzcf/qH7pCJoRRvZPW1eY38="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-hqYfNrj8fhgSMkK+sEQTtZdidJeD2vvvDoMBtK8ZmYI="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JMpiQJY23noyNK0KjkkyGmYJJLyTNiHhlZPKA6vSQB4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XjcQWqUEadp9u90HZU45gt/ANzn7Z7yuV24SrMKY7tM="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Dbt1T/Y9AsuITCNDu7+9to+9Q8aUAGmEsemONyucNkg="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-AlWrYGpqFSTj6UDEZ77kFq+KrN9SOO7fLu+R5hiICTM="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ewDINCVRtePHQRceMn0xhUFNjEr08AsaS9WBvz3lcLs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8CNaSv1PxoyQGSc7W64BlviEgBtggYzSjDh6vPl3YSI="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DV1kc2BhDSHgmWE7lqUtM3u5YfXl/EKo3FU04LHzP5o="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-58cO2fdzdLYkWC6q7dn5dXKpMj4WzE95tlnPqW0X+W0="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-GugOroZ0SRoGoP3xE3jt91vTbHwXLPq8bHYckNC8SIA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ceT9q9ZCwhGnp+BrxgjPcoyrAqKHc7VK47M4tM2pQmw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-lvAHbw3hhS6OnCuUMLEa4NKJWZPHqcBM3IeXpeYtLHo="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ZV5ptFKjt4UX+ytjnWMRk0/Xc+hR8tuYb8ADqLlTFnU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ULArvCiy+bOHtkD5E0q7u+Cfg7R+IJZ4A60ldV798vs="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-eC46DyuObx9VhFP4PyY/3JWqAck8bW4Bt2hZyuapLRY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-6WaE1hKyIBnsTe3YlVP/lHR9HOnMkYtqDZEZLzidFAc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-u7sukf/qUk+gUVxFj/r9rzkQTVUcg2SqNhOmhPOsEyg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pYPVNaL6x5zRCBxCsPso8Ae0k9aaDbvH0aHS+j5pdIs="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hKCalXcwzlgMLwthSnTcHkDOW1g2XUo4Kj49uryZvt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-qlxs6pqhMQHkvOkJY37f9VMlxwnjUffue656XJaRLWI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-h1FtdGrQp0HjK8fJajK1h5YV9fgBZCBQOH9M4pqMamE="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-EBCX8Uvy+Z40i+VjuUK+F5CAZYblQLKzAExfx/uQ+gE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-KmyOl6C8u/PrCAMiY/KwELYvRafnM4SfcnEhKvU5BeU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Q41rpitFgIbgUpIh7iGzXTaCVDoUoDJ7HYddW2krHAE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-bsQyjyidOkZLtjR1JadsIkRp6gDlHjEsJEbNLgKGtdE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-2YfhVuvSJe2sIkPFgocqAJubbb1PU7r93YoICq3ntAo="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-oPUyQZ9bGNbk6yPeIAQkNmDmDNcq3o2jFIsunotBBps="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-CBwqR3ii9Yg3O9lG/UAFaltVHmH5aFk2r8+IV1zeIS4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Uw965RIeMJJ3uV5xX6WWGVq8i+CHXpiOw1mOT6rPmFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JBUxkn0eUboAElHl+o2LyC7f9eJz4jJ9/odxXa43FSM="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-ZsUpPpaD4cfjTnTPAw1VqKHYX51XFG1ck0Ae2dWUKt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-RY5CrQ9K9VZeh8+1r8Rjg0gEFBBRqR5EGTFkBfx0+3Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-FG9CGm1wZlMzKGzr70+qg62NLmYot0uG9yilyoEBpmw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QtCqH/Ah7EW2lNWHq9y4sAQI+8XOWMLBrqPIuDEV1ic="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-wdwHZFStEDDU0v8nah6hylLErKUxC9x3CvgL/9Qcfwo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QnGhafheornOKm2H+UO9M+a57S7OzU7oomMp1Gs+qcQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-v8J9etz1hP2q02KbUjKxDUc8So2qlzajFCDbM9N9TiE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-HZS5qup9w2rWf1K5zIq7BEYTi8BC5co+Mz9Ey7iOcPc="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hSj4rqdeeerbuFQT7DI38eIOI3XUUun7nfi4ypPyggU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-4sp79lNVzgWRV2l1WjURkZBTq13OTRPfoRsaWU1Kd+Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JT2SL5C1RXS80C7hB+YcCHW9Nynq4+1dCd4nckZVDsM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pnE0Z0AxP+2tiQT72EIjrsfRxN9q/rWQ/5J1SIF8rVg="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-DO5bDJGbzav8ji/1Wp5+VCU2xd/7P+tD8eMCBCeisq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ORBkaFVuxvBBcqo0vklECC72Paoy13E33gt/ctHojq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-oFvsMtKz+O9/B7asuc2DsH8KhRhAdS4D6qR64O8dE48="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-sXYAaSQvdrsknqu85ZzDfRFKQ3lKxPmK3CeYJwJ/u78="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-/GFhQQTpATa+eVsIKIS5hYQwEzueYT7IClqfTuO7OiY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DJWq3FrbwU6QCJLuMWKFvQhwrszUHIHbZEi+cjnUkAI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-NtpJ9HN+LvXLb/qBn3Dz5XGTqhrlB8oUFCzge9zkxJ0="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-quzQ5GEyFmdsn7VXSsjSFHIcYnHwxb3OXP5Rcnar7mw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-53HpBsY1A7xFKDSKW+yMjoTdK+calt2k8z1XQbIx39I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-zzq0pwTb9ayiuFijGfhXPyIk7YsGu1Q611CvHhPAGPM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-WUB7TDKuqe/+vZMdwtmb8yst0+6STi/H7gf1jmb0adw="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mc6g5oRPUbsFFwn5KDeY0LbzLGlyiPZxAhtjGEsIh+I="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-lMVZtEPD48KKReYFsJ2rmJzCvlQNkGvajbfmd/ZYfFA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mHRvOES1i3VCmHfyQOakMNyvvJYS0xGdF8YFNpTEDx8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-X29sAPaFb6yZptgoQK6QnRKbLRmmkrnvWw2zHC1MHE8="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8LP07HWuRAyUGk5aSIpBHcAso16yM6UQ7YbPAen0Zgs="; }) + ]; + }; + in rec { release_9_0 = "9.0.0-rc.1"; aspnetcore_9_0 = buildAspNetCore { version = "9.0.0-rc.1.24452.1"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; - sha512 = "f8fd285d67bb044d631596869d6301e10a2a243c81c9a05096a66aff4fb3431529812c7482e6cf0e065e8e065fc50b16b50d7f2a495ab30077a68bd45b3ba376"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c414fabc-f831-4c5d-af5e-8e85ebecc6a0/670acec9f83315bec2788393db85e708/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm.tar.gz"; + hash = "sha512-EgHd12xUpnbLKHRD7xszFtCHufNVfHl/ckzU/LhphutJmzEilZskl2RE4mIoXAWooPjz8oKJRjHlj6TeQrtUiQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; - sha512 = "84610a38fb9a98eb7bd26ba89a9c4998682ec3fffb5eade5bbafbafd63cac7d9a5279618bb5b2575d27feec098da5fe6f7150c67253f3f37762601590396e122"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; + hash = "sha512-hGEKOPuamOt70muompxJmGguw//7Xq3lu6+6/WPKx9mlJ5YYu1slddJ/7sCY2l/m9xUMZyU/Pzd2JgFZA5bhIg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; - sha512 = "ff4a6e35b41f5200521ea4b257b293e4d48f1786ccaa9cd85b55ba96ad36036dbc149d2ff820f1dff5f2d9acf6c38b6c3540e700c2c2db5fe6d82d4f85f461ae"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; + hash = "sha512-+P0oXWe7BE1jFZaGnWMB4QoqJDyByaBQlqZq/0+zQxUpgSx0gubPDgZejgZfxQsWtQ1/KklaswB3povUWzujdg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; - sha512 = "03f7e03352d1ad2d54e9de4c1cdd7a94c2311bb36d4c6296661fab286cddebf3f57204f73892efd53f43cfb13ba73cafae95d0522c47be03203d5fb69a0ecfe9"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d4492ed-c733-4cfc-bf16-4f13191587f2/c843723067d5fc1d790ffa1810c683c1/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm.tar.gz"; + hash = "sha512-Kdvu4spDebM0V+KwVliBFPoxgTUGxTWaIxRfI6QdBj0F6qCX6hF2I6QPqxE1FrRRUL0XovBXKHViwz/pFovymQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bc3735cb-fea1-4f97-8669-3ab0e389d055/084b94228b13a45478ac75f5158801b3/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm64.tar.gz"; + hash = "sha512-n08aOk85N3d5v092zguXYxAtnKYX/99h/3Wg2Bxcxj+1BCcI/xCxqD5VgFDZuVu68Vn6d+J8wD4K00NEHhZLXg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/10aac5f7-c037-4874-8c05-425e668b0a24/4706d38e511259862e93a61f15dda28f/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-x64.tar.gz"; + hash = "sha512-D5RfnHYZkY1hmmbPtsiwH9mTlDjOjvi+B5f66ky9c87eb9JcIlhV77eTvmcL/A9xmOnyMfoFEdfPMZ0vq7rJ0w=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; + hash = "sha512-A/fgM1LRrS1U6d5MHN16lMIxG7NtTGKWZh+rKGzd6/P1cgT3OJLv1T9Dz7E7pzyvrpXQUixHvgMgPV+2mg7P6Q=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; + hash = "sha512-/0puNbQfUgBSHqSyV7KT5NSPF4bMqpzYW1W6lq02A228FJ0v+CDx3/Xy2az2w4tsNUDnAMLC21/m2C1PhfRhrg=="; }; }; }; @@ -98,21 +168,37 @@ in rec { runtime_9_0 = buildNetRuntime { version = "9.0.0-rc.1.24431.7"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; - sha512 = "9f9a85b8d9f6362ed2c2d0edefd04999181b2c386647644fbc1d9f248255387324399edb1c40bc7fa8c47adc22e2d71db5f25ce794521d59e46c40593b5f6cc5"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26c238f2-53a2-4fdc-981e-31272c80d107/67c11b008d57d501cd2e5ca642cbc8c1/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm.tar.gz"; + hash = "sha512-ioPeMA6PnsZ/cFAE9VIpVz3Yv7EG9sQjie+ylsI4buJ4Rvgbqv5rQmnpxyaQN+XsPxN2xyvBA+RkHJGBp+V2Rw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; - sha512 = "8542bb9381e4eca6f0ebceddec68525cc59e34f7244613cf33cb2151f570c3345cb6d081c492b01070e762d3440f02d4558234532d58ff3dc919057e06b7bdac"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; + hash = "sha512-hUK7k4Hk7Kbw687d7GhSXMWeNPckRhPPM8shUfVwwzRcttCBxJKwEHDnYtNEDwLUVYI0Uy1Y/z3JGQV+Bre9rA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; - sha512 = "f62f867eab633737c450ffb0543a726f1ba2f46a4265cb47978d88dad0c6b80a8db5ccf6f583842f85cb613b96d2f7c6806d669826f4b92b906e71d8d10e53e8"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; + hash = "sha512-n5qFuNn2Ni7SwtDt79BJmRgbLDhmR2RPvB2fJIJVOHMkOZ7bHEC8f6jEetwi4tcdtfJc55RSHVnkbEBZO19sxQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; - sha512 = "a825fca9edde53ab6abc0efe0c44d6fb25c5c77aeb2d35b6c414d42f364453ceb069ed9db8865c2bb82523989fceb7cccbf86047699590ff756a6b9c54c21d74"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c948e710-a590-4492-870d-1e44ce476a55/86522880c5160af3c81bfa71378b79b9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm.tar.gz"; + hash = "sha512-ERibzBMUhpSROsX7BQt324EErGLdOblwzZau85n3p87mVqMUtE8BE/lnJufuCiad6jhjcCD+BiYaiwHKDfnktA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9ef6c8f0-49ac-4b37-9e7a-0f2cbbc74472/ceebdb8281a18bc80d17147ec3146cd0/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm64.tar.gz"; + hash = "sha512-3WKnNzaydaFbWv+jRloO89aWGaBsyqo5FrMx9Fs4WakCjnjrfNhcdm3v+5cDx7uWeI9AYdVJy98yW/gYlDEFIQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30c11bec-b456-45de-bb45-5e892fd1a509/cd72910d2c8b0c908f717a3563c2445f/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-x64.tar.gz"; + hash = "sha512-vXcBXKRriSj3CmHmz+8jxeMIrUDAPd1CHCEBQbGjjNXE2O31Nl6LruIn21pqxx++pIHBqLPFum6lgzCv3X/iMQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; + hash = "sha512-qCX8qe3eU6tqvA7+DETW+yXFx3rrLTW2xBTULzZEU86wae2duIZcK7glI5ifzrfMy/hgR2mVkP91amucVMIddA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; + hash = "sha512-9i+GfqtjNzfEUP+wVDpybxui9GpCZctHl42I2tDGuAqNtcz29YOEL4XLYTuW0vfGgG1mmCb0uSuQbnHY0Q5T6A=="; }; }; }; @@ -120,24 +206,40 @@ in rec { sdk_9_0_1xx = buildNetSdk { version = "9.0.100-rc.1.24452.12"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; - sha512 = "e8130817b779d0104a6eee33d98d97c3fad1c336013435f47c0e9e22370172b75da37ade76e49dec7cbe696884390d2e6941cc69e2bad5593d6d1c6b41083051"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/87c96627-cf20-47d7-8cb4-d5e083084dd4/07d4b533e746b344a3dbf9f7279f450b/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm.tar.gz"; + hash = "sha512-8xpKLDCAqSHP3XGTPR9XwvV/9MQ/WgrW9SZAvHkeVPjAUm2OEgatIfhoI1elPPbUiKiwEQfnw0vq/iyMNCXdjA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; - sha512 = "f5742537128801c199a127266175066058788a26e8a603cbd26a1c16e9ef33a5d418e4790a3cea722d7de483eee8b68e0de4bb1dfdf279713369ed3b4d163a11"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; + hash = "sha512-9XQlNxKIAcGZoScmYXUGYFh4iibopgPL0mocFunvM6XUGOR5Cjzqci195IPu6LaODeS7Hf3yeXEzae07TRY6EQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; - sha512 = "0d1f0718eeef006c3ecfbefeebf9df0772ec22c74db4bb635b6463b8aedfd3957274b908b51ec019ced69d3e7af4ae9252f18e87b14a4411e1089a4cc41e37d0"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; + hash = "sha512-6BMIF7d50BBKbu4z2Y2Xw/rRwzYBNDX0fA6eIjcBcrddo3reduSd7Hy+aWiEOQ0uaUHMaeK61Vk9bRxrQQgwUQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; - sha512 = "af30b31cd937e9fc97e164b83628c2c1ecd21329b75f742d9f5232aa68427d25b5d702cc565aa860d3c738c8727790569bf66a3ed74e5cef719ae589d302846f"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8cb683aa-4558-45ac-944a-73ac40b708d2/2795bd0253d5518490378edc7f7b562e/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm.tar.gz"; + hash = "sha512-hICQDhS9EDT1hsPhdAK+LwTKslDXm00d2jqoh+n6+mg604it9/JbXHsNxDM3XOHCcrPZQZY25tsPe/MA6EGgpQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8737d284-0c4b-49a0-984c-23fddc7abcd8/ada586539e4417b557d60d0214e8b2eb/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm64.tar.gz"; + hash = "sha512-ZWv6TnxKPuKAuZ6v+mILCbibOjufbTPJ14fB+JOLhK+1qkPYBUboGiv9UydwwoLFmuoWf1DQGlcCeiBh5ZXw6Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/791e9a41-59da-4f92-9dfb-2cceaaea001b/710f7adf35dc2f32be49ac2834ad0afd/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-x64.tar.gz"; + hash = "sha512-sdgATPnD/7Uw+7PUJZF0ywdqMroAJo2qQ9v0Uv5tRsz5eaY9f1OucKL6ehAanfG9O4QFUqySqFIRm7c4WmX2Xw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; + hash = "sha512-rzCzHNk36fyX4WS4NijCwezSEym3X3Qtn1IyqmhCfSW11wLMVlqoYNPHOMhyd5BWm/ZqPtdOXO9xmuWJ0wKEbw=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; + hash = "sha512-DR8HGO7vAGw+z77+6/nfB3LsIsdNtLtjW2RjuK7f05VydLkItR7AGc7WnT569K6SUvGOh7FKRBHhCJpMxB430A=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_9_0 = sdk_9_0_1xx; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix index d6cfcd9035..2c95d7d6ee 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix @@ -1,46 +1,46 @@ -{ clangStdenv -, lib -, fetchurl -, dotnetCorePackages -, jq -, curl -, git -, cmake -, pkg-config -, llvm -, zlib -, icu -, lttng-ust_2_12 -, krb5 -, glibcLocales -, ensureNewerSourcesForZipFilesHook -, darwin -, xcbuild -, swiftPackages -, openssl -, getconf -, python3 -, xmlstarlet -, nodejs -, callPackage -, unzip -, yq +{ + clangStdenv, + lib, + fetchurl, + dotnetCorePackages, + jq, + curl, + git, + cmake, + pkg-config, + llvm, + zlib, + icu, + lttng-ust_2_12, + krb5, + glibcLocales, + ensureNewerSourcesForZipFilesHook, + darwin, + xcbuild, + swiftPackages, + openssl, + getconf, + python3, + xmlstarlet, + nodejs, + callPackage, + unzip, + yq, -, dotnetSdk -, releaseManifestFile -, tarballHash + bootstrapSdk, + releaseManifestFile, + tarballHash, }: let - stdenv = if clangStdenv.isDarwin - then swiftPackages.stdenv - else clangStdenv; + stdenv = if clangStdenv.hostPlatform.isDarwin then swiftPackages.stdenv else clangStdenv; inherit (stdenv) isLinux isDarwin buildPlatform - targetPlatform; + targetPlatform + ; inherit (swiftPackages) apple_sdk swift; releaseManifest = lib.importJSON releaseManifestFile; @@ -50,16 +50,17 @@ let targetRid = dotnetCorePackages.systemToDotnetRid targetPlatform.system; targetArch = lib.elemAt (lib.splitString "-" targetRid) 1; - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; _icu = if isDarwin then darwin.ICU else icu; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "dotnet-vmr"; version = release; # TODO: fix this in the binary sdk packages - preHook = lib.optionalString stdenv.isDarwin '' + preHook = lib.optionalString stdenv.hostPlatform.isDarwin '' addToSearchPath DYLD_LIBRARY_PATH "${_icu}/lib" export DYLD_LIBRARY_PATH ''; @@ -69,53 +70,58 @@ in stdenv.mkDerivation rec { hash = tarballHash; }; - nativeBuildInputs = [ - ensureNewerSourcesForZipFilesHook - jq - curl.bin - git - cmake - pkg-config - python3 - xmlstarlet - unzip - yq - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - nodejs - ] - ++ lib.optionals isDarwin [ - getconf - ]; + nativeBuildInputs = + [ + ensureNewerSourcesForZipFilesHook + jq + curl.bin + git + cmake + pkg-config + python3 + xmlstarlet + unzip + yq + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + nodejs + ] + ++ lib.optionals isDarwin [ + getconf + ]; - buildInputs = [ - # this gets copied into the tree, but we still want the hooks to run - dotnetSdk - # the propagated build inputs in llvm.dev break swift compilation - llvm.out - zlib - _icu - openssl - ] - ++ lib.optionals isLinux [ - krb5 - lttng-ust_2_12 - ] - ++ lib.optionals isDarwin (with apple_sdk.frameworks; [ - xcbuild - swift - (krb5.overrideAttrs (old: { - # the propagated build inputs break swift compilation - buildInputs = old.buildInputs ++ old.propagatedBuildInputs; - propagatedBuildInputs = []; - })) - sigtool - Foundation - CoreFoundation - CryptoKit - System - ] - ++ lib.optional (lib.versionAtLeast version "9") GSS); + buildInputs = + [ + # this gets copied into the tree, but we still want the hooks to run + bootstrapSdk + # the propagated build inputs in llvm.dev break swift compilation + llvm.out + zlib + _icu + openssl + ] + ++ lib.optionals isLinux [ + krb5 + lttng-ust_2_12 + ] + ++ lib.optionals isDarwin ( + with apple_sdk.frameworks; + [ + xcbuild + swift + (krb5.overrideAttrs (old: { + # the propagated build inputs break swift compilation + buildInputs = old.buildInputs ++ old.propagatedBuildInputs; + propagatedBuildInputs = [ ]; + })) + sigtool + Foundation + CoreFoundation + CryptoKit + System + ] + ++ lib.optional (lib.versionAtLeast version "9") GSS + ); # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. @@ -132,216 +138,223 @@ in stdenv.mkDerivation rec { (global-name "com.apple.system.opendirectoryd.membership")) ''; - patches = lib.optionals (lib.versionOlder version "9") [ + patches = lib.optionals (lib.versionAtLeast version "9") [ + ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch + ] ++ lib.optionals (lib.versionOlder version "9") [ ./fix-aspnetcore-portable-build.patch ]; - postPatch = '' - # set the sdk version in global.json to match the bootstrap sdk - jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${dotnetSdk}/bin/dotnet --version)" > global.json~ - mv global.json{~,} + postPatch = + '' + # set the sdk version in global.json to match the bootstrap sdk + jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${bootstrapSdk}/bin/dotnet --version)" > global.json~ + mv global.json{~,} - patchShebangs $(find -name \*.sh -type f -executable) + patchShebangs $(find -name \*.sh -type f -executable) - # I'm not sure why this is required, but these files seem to use the wrong - # property name. - # TODO: not needed in 9.0? - [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ - sed -i 's:\bVersionBase\b:VersionPrefix:g' \ - src/xliff-tasks/eng/Versions.props + # I'm not sure why this is required, but these files seem to use the wrong + # property name. + # TODO: not needed in 9.0? + [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ + sed -i 's:\bVersionBase\b:VersionPrefix:g' \ + src/xliff-tasks/eng/Versions.props - # at least in 9.0 preview 1, this package depends on a specific beta build - # of System.CommandLine - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ - src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj + # at least in 9.0 preview 1, this package depends on a specific beta build + # of System.CommandLine + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ + src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj - # AD0001 crashes intermittently in source-build-reference-packages with - # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. - # possibly related to https://github.com/dotnet/runtime/issues/90356 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ - src/source-build-reference-packages/src/referencePackages/Directory.Build.props + # AD0001 crashes intermittently in source-build-reference-packages with + # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. + # possibly related to https://github.com/dotnet/runtime/issues/90356 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ + src/source-build-reference-packages/src/referencePackages/Directory.Build.props - # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 - xmlstarlet ed \ - --inplace \ - -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ - src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props + # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 + xmlstarlet ed \ + --inplace \ + -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ + src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props - # this fixes compile errors with clang 15 (e.g. darwin) - substituteInPlace \ - src/runtime/src/native/libs/CMakeLists.txt \ - --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' + # this fixes compile errors with clang 15 (e.g. darwin) + substituteInPlace \ + src/runtime/src/native/libs/CMakeLists.txt \ + --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' - # strip native symbols in runtime - # see: https://github.com/dotnet/source-build/issues/2543 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n KeepNativeSymbols -v false \ - src/runtime/Directory.Build.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # repro.csproj fails to restore due to missing freebsd packages - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ - src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj + # strip native symbols in runtime + # see: https://github.com/dotnet/source-build/issues/2543 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n KeepNativeSymbols -v false \ + src/runtime/Directory.Build.props + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # repro.csproj fails to restore due to missing freebsd packages + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ + src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj - # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ - src/runtime/Directory.Build.props + # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ + src/runtime/Directory.Build.props - # patch packages installed from npm cache - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ - src/aspnetcore/eng/DotNetBuild.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 - substituteInPlace \ - src/aspnetcore/eng/Dependencies.props \ - --replace-fail \ - "'\$(DotNetBuildSourceOnly)' == 'true'" \ - "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" + # patch packages installed from npm cache + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ + src/aspnetcore/eng/DotNetBuild.props + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 + substituteInPlace \ + src/aspnetcore/eng/Dependencies.props \ + --replace-fail \ + "'\$(DotNetBuildSourceOnly)' == 'true'" \ + "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" - # https://github.com/dotnet/source-build/issues/4325 - xmlstarlet ed \ - --inplace \ - -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ - eng/init-source-only.proj + # https://github.com/dotnet/source-build/issues/4325 + xmlstarlet ed \ + --inplace \ + -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ + eng/init-source-only.proj - # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] - substituteInPlace \ - src/runtime/src/coreclr/ilasm/CMakeLists.txt \ - --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" + # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] + substituteInPlace \ + src/runtime/src/coreclr/ilasm/CMakeLists.txt \ + --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" - # https://github.com/dotnet/source-build/issues/4444 - xmlstarlet ed \ - --inplace \ - -s '//Project/Target/MSBuild[@Targets="Restore"]' \ - -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ - src/aspnetcore/eng/Tools.props - '' - + lib.optionalString isLinux ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ - --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' + # https://github.com/dotnet/source-build/issues/4444 + xmlstarlet ed \ + --inplace \ + -s '//Project/Target/MSBuild[@Targets="Restore"]' \ + -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ + src/aspnetcore/eng/Tools.props + '' + + lib.optionalString isLinux ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ + --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' - substituteInPlace \ - src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ - --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' + substituteInPlace \ + src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ + --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ - --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' - '' - + lib.optionalString (lib.versionOlder version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ - --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' - '') - + lib.optionalString isDarwin ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ + --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' + '' + + lib.optionalString (lib.versionOlder version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ + --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' + '' + ) + + lib.optionalString isDarwin ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - substituteInPlace \ - src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ - src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ - --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' + substituteInPlace \ + src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ + src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ + --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/eng/native/functions.cmake \ - --replace-fail ' -no_code_signature_warning' "" + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/eng/native/functions.cmake \ + --replace-fail ' -no_code_signature_warning' "" - # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n SkipInstallerBuild -v true \ - src/runtime/Directory.Build.props + # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n SkipInstallerBuild -v true \ + src/runtime/Directory.Build.props - # stop passing -sdk without a path - # stop using xcrun - # add -module-cache-path to fix swift errors, see sandboxProfile - # :0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' - # :0: error: could not build Objective-C module 'SwiftShims' - substituteInPlace \ - src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ - --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ - --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ - src/runtime/src/native/managed/native-library.targets \ - --replace-fail ' -no_code_signature_warning' "" + # stop passing -sdk without a path + # stop using xcrun + # add -module-cache-path to fix swift errors, see sandboxProfile + # :0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' + # :0: error: could not build Objective-C module 'SwiftShims' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ + --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ + --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ + src/runtime/src/native/managed/native-library.targets \ + --replace-fail ' -no_code_signature_warning' "" - # ld: library not found for -ld_classic - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ - src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ - --replace-fail 'Include="-ld_classic"' "" - '' - + lib.optionalString (lib.versionOlder version "9") '' - # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: - # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll - substituteInPlace \ - build.proj \ - --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ + --replace-fail 'Include="-ld_classic"' "" + '' + + lib.optionalString (lib.versionOlder version "9") '' + # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: + # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll + substituteInPlace \ + build.proj \ + --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' - substituteInPlace \ - src/runtime/src/mono/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - ''); + substituteInPlace \ + src/runtime/src/mono/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + '' + ); prepFlags = [ "--no-artifacts" "--no-prebuilts" - "--with-packages" dotnetSdk.artifacts + "--with-packages" + bootstrapSdk.artifacts ]; - configurePhase = let - prepScript = - if (lib.versionAtLeast version "9") - then "./prep-source-build.sh" - else "./prep.sh"; - in '' - runHook preConfigure + configurePhase = + let + prepScript = if (lib.versionAtLeast version "9") then "./prep-source-build.sh" else "./prep.sh"; + in + '' + runHook preConfigure - # The build process tries to overwrite some things in the sdk (e.g. - # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. - cp -Tr ${dotnetSdk} .dotnet - chmod -R +w .dotnet + # The build process tries to overwrite some things in the sdk (e.g. + # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. + cp -Tr ${bootstrapSdk} .dotnet + chmod -R +w .dotnet - ${prepScript} $prepFlags + ${prepScript} $prepFlags - runHook postConfigure - ''; + runHook postConfigure + ''; postConfigure = lib.optionalString (lib.versionAtLeast version "9") '' # see patch-npm-packages.proj @@ -353,21 +366,24 @@ in stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString isLinux - "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString isLinux "${glibcLocales}/lib/locale/locale-archive"; - buildFlags = [ - "--with-packages" dotnetSdk.artifacts - "--clean-while-building" - "--release-manifest" releaseManifestFile - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - "--source-build" - ] - ++ [ - "--" - "-p:PortableBuild=true" - ] ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; + buildFlags = + [ + "--with-packages" + bootstrapSdk.artifacts + "--clean-while-building" + "--release-manifest" + releaseManifestFile + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + "--source-build" + ] + ++ [ + "--" + "-p:PortableBuild=true" + ] + ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; buildPhase = '' runHook preBuild @@ -389,35 +405,37 @@ in stdenv.mkDerivation rec { runHook postBuild ''; - installPhase = let - assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; - in '' - runHook preInstall + installPhase = + let + assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; + in + '' + runHook preInstall - mkdir "$out" + mkdir "$out" - pushd "artifacts/${assets}/Release" - find . -name \*.tar.gz | while read archive; do - target=$out/$(basename "$archive" .tar.gz) - # dotnet 9 currently has two copies of the sdk tarball - [[ ! -e "$target" ]] || continue - mkdir "$target" - tar -C "$target" -xzf "$PWD/$archive" - done - popd + pushd "artifacts/${assets}/Release" + find . -name \*.tar.gz | while read archive; do + target=$out/$(basename "$archive" .tar.gz) + # dotnet 9 currently has two copies of the sdk tarball + [[ ! -e "$target" ]] || continue + mkdir "$target" + tar -C "$target" -xzf "$PWD/$archive" + done + popd - local -r unpacked="$PWD/.unpacked" - for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do - rm -rf "$unpacked" - unzip -qd "$unpacked" "$nupkg" - chmod -R +rw "$unpacked" - rm "$nupkg" - mv "$unpacked" "$nupkg" - # TODO: should we fix executable flags here? see dotnetInstallHook - done + local -r unpacked="$PWD/.unpacked" + for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do + rm -rf "$unpacked" + unzip -qd "$unpacked" "$nupkg" + chmod -R +rw "$unpacked" + rm "$nupkg" + mv "$unpacked" "$nupkg" + # TODO: should we fix executable flags here? see dotnetInstallHook + done - runHook postInstall - ''; + runHook postInstall + ''; # dotnet cli is in the root, so we need to strip from there # TODO: should we install in $out/share/dotnet? diff --git a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix index d244fc62ae..5fbf929d5e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = # Checks are broken on aarch64 darwin # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 - !stdenv.isDarwin && + !stdenv.hostPlatform.isDarwin && # Checks are broken when building statically on x86_64 linux with musl # One of the test tries to build a shared library and this causes the linker: # x86_64-unknown-linux-musl-ld: /nix/store/h9gcvnp90mpniyx2v0d0p3s06hkx1v2p-x86_64-unknown-linux-musl-gcc-13.3.0/lib/gcc/x86_64-unknown-linux-musl/13.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object diff --git a/third_party/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix index 75055130ad..121935df5f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix index efb3fbfcc5..bc456d2479 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix index a457a422cf..5ff6d4117b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { }; buildInputs = - lib.optionals (!stdenv.isDarwin) [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix index 79101092e7..eca3fcd480 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix @@ -4,8 +4,8 @@ }: let - os = if stdenv.isDarwin then "macos" else "linux"; - arch = if stdenv.isAarch64 then "arm64" else "x86_64"; + os = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; + arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; hashes = { "x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix index 1580d1f43f..0ab5a28046 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../../../node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix index 100bd0de0d..06bcc8d147 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.43"; + version = "0.6.44"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-syw/UX0I2ECfxB3wUlL0aMG7qI27wvoDWBELshncREM="; + hash = "sha256-Pw6q3qmYehTPnB3MyDi8Q5tC018H3zLsZAXWuc+abjE="; }; - cargoHash = "sha256-03wB01D+4a5fT/Zvb8nMw8/KUULE7Go+Egax7YbHVcU="; + cargoHash = "sha256-uO+j1kmoCLy00P0QHGy30XVPyG1tH4FU6YvTfWxxvWE="; nativeBuildInputs = [ makeWrapper @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { env = { BUILD_DATE = "1970/01/01 00:00:00"; - CASE_SENSITIVE = lib.boolToString (!stdenv.isDarwin); + CASE_SENSITIVE = lib.boolToString (!stdenv.hostPlatform.isDarwin); GIT_HASH_SHORT = src.rev; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/third_party/nixpkgs/pkgs/development/compilers/fasm/bin.nix index f23e954092..71e2146a70 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fasm/bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fasm/bin.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -D fasm${lib.optionalString stdenvNoCC.isx86_64 ".x64"} $out/bin/fasm + install -D fasm${lib.optionalString stdenvNoCC.hostPlatform.isx86_64 ".x64"} $out/bin/fasm runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix index bfc9597f38..0a9d0feccd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -1,4 +1,4 @@ -{ useNixpkgsEngine ? false, callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }@args: +{ useNixpkgsEngine ? false, callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }: let mkCustomFlutter = args: callPackage ./flutter.nix args; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; @@ -19,7 +19,7 @@ let , pubspecLock , artifactHashes , channel - }@fargs: + }: let args = { inherit version engineVersion engineSwiftShaderRev engineSwiftShaderHash engineHashes enginePatches patches pubspecLock artifactHashes useNixpkgsEngine channel; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix index 443db6af36..d9b2089888 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { paths = expandDeps ( - lib.optionals (stdenv.isLinux) [ + lib.optionals (stdenv.hostPlatform.isLinux) [ gtk3 wayland libepoxy @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.xorgproto zlib ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ clang llvm ] @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { "-I${finalAttrs.toolchain}/include" ] ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"; - nativeCheckInputs = lib.optionals stdenv.isLinux [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.xorgserver openbox ]; @@ -175,8 +175,8 @@ stdenv.mkDerivation (finalAttrs: { ninja dart ] - ++ lib.optionals (stdenv.isLinux) [ patchelf ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ patchelf ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.system_cmds darwin.xcode tools.xcode-select @@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p src/${dartPath}/tools/sdks ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk - ${lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.hostPlatform.isLinux) '' for patchtool in ''${patchtools[@]}; do patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) done @@ -269,7 +269,7 @@ stdenv.mkDerivation (finalAttrs: { export PYTHONPATH=$src/src/build '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH '' + '' @@ -322,7 +322,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { # Very broken on Darwin - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "The Flutter engine"; homepage = "https://flutter.dev"; maintainers = with maintainers; [ RossComputerGuy ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter-tools.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter-tools.nix index 306765cd0a..1639d54a86 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter-tools.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter-tools.nix @@ -28,7 +28,7 @@ buildDartApplication.override { inherit dart; } rec { popd '' # Use arm64 instead of arm64e. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace lib/src/ios/xcodeproj.dart \ --replace-fail arm64e arm64 ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/sdk-symlink.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/sdk-symlink.nix index 044a508805..98051efa56 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/sdk-symlink.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/sdk-symlink.nix @@ -17,6 +17,28 @@ let if [ -d '${flutter.sdk}/.git' ]; then ln -s '${flutter.sdk}/.git' "$out" fi + + # For iOS/macOS builds, *.xcframework/'s from the pre-built + # artifacts are copied into each built app. However, the symlinkJoin + # means that the *.xcframework's contain symlinks into the nix store, + # which causes issues when actually running the apps. + # + # We'll fix this by only linking to an outer *.xcframework dir instead + # of trying to symlinkJoin the files inside the *.xcframework. + artifactsDir="$out/bin/cache/artifacts/engine" + shopt -s globstar + for file in "$artifactsDir"/**/*.xcframework/Info.plist; do + # Get the unwrapped path from the Info.plist inside each .xcframework + origFile="$(readlink -f "$file")" + origFrameworkDir="$(dirname "$origFile")" + + # Remove the symlinkJoin .xcframework dir and replace it with a symlink + # to the unwrapped .xcframework dir. + frameworkDir="$(dirname "$file")" + rm -r "$frameworkDir" + ln -s "$origFrameworkDir" "$frameworkDir" + done + shopt -u globstar ''; passthru = flutter.passthru // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 0000000000..825d40fc61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "//XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix index c988eba2e5..2c1b1ea125 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix @@ -18,7 +18,6 @@ , extraCFlags ? [ ] , extraLinkerFlags ? [ ] , makeWrapper -, runCommandLocal , writeShellScript , wrapGAppsHook3 , git @@ -39,7 +38,6 @@ , cmake , ninja , clang -, lndir , symlinkJoin }: @@ -56,7 +54,7 @@ let }; })); - cacheDir = symlinkJoin rec { + cacheDir = symlinkJoin { name = "flutter-cache-dir"; paths = builtins.attrValues flutterPlatformArtifacts; postBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/binary.nix index e4c8a2358f..6f8acae7f9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/binary.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451"; } - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then fetchurl { url = "mirror://sourceforge/project/freepascal/Mac%20OS%20X/${version}/fpc-${version}.intelarm64-macosx.dmg"; sha256 = "05d4510c8c887e3c68de20272abf62171aa5b2ef1eba6bce25e4c0bc41ba8b7d"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix index 3c9eb60d57..70f3b60efb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ startFPC gawk ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreFoundation ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Patch paths for linux systems. Other platforms will need their own patches. patches = [ ./mark-paths.patch # mark paths for later substitution in postPatch - ] ++ lib.optional stdenv.isAarch64 (fetchpatch { + ] ++ lib.optional stdenv.hostPlatform.isAarch64 (fetchpatch { # backport upstream patch for aarch64 glibc 2.34 url = "https://gitlab.com/freepascal.org/fpc/source/-/commit/a20a7e3497bccf3415bf47ccc55f133eb9d6d6a0.patch"; hash = "sha256-xKTBwuOxOwX9KCazQbBNLhMXCqkuJgIFvlXewHY63GM="; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = lib.optionalString - stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix index 05d92d434f..78c98fe50f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -78,9 +78,9 @@ gccStdenv.mkDerivation rec { ] ++ gambit-params.extraOptions # TODO: pick an appropriate architecture to optimize on on x86-64? # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options - # ++ lib.optional pkgs.stdenv.isx86_64 "--enable-march=core-avx2" + # ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "--enable-march=core-avx2" # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 - ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; + ++ lib.optional (!gccStdenv.hostPlatform.isDarwin) "--enable-poll"; configurePhase = '' export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ @@ -97,7 +97,7 @@ gccStdenv.mkDerivation rec { # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ${lib.optionalString (gccStdenv.hostPlatform.isDarwin && !gambit-params.stable) ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/all.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/all.nix index 232241989b..5d5abb82c3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/all.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/all.nix @@ -24,7 +24,7 @@ let profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; - isl = if stdenv.isDarwin then null + isl = if stdenv.hostPlatform.isDarwin then null else if atLeast "9" then isl_0_20 else /* atLeast "7" */ isl_0_17; } // lib.optionalAttrs (!(atLeast "9")) { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix index b226975ef0..9c756ccfa4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix @@ -120,16 +120,16 @@ in ## Darwin # Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. -++ optional (atLeast14 && stdenv.isDarwin && stdenv.isx86_64) ../patches/14/libgcc-darwin-detection.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ../patches/14/libgcc-darwin-detection.patch # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin -++ optional (atLeast12 && stdenv.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch +++ optional (atLeast12 && stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch # Remove CoreServices on Darwin, as it is only needed for macOS SDK 14+ -++ optional (atLeast14 && stdenv.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch # Use absolute path in GNAT dylib install names on Darwin -++ optionals (stdenv.isDarwin && langAda) ({ +++ optionals (stdenv.hostPlatform.isDarwin && langAda) ({ "14" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ]; "13" = [ ./gnat-darwin-dylib-install-name-13.patch ]; "12" = [ ./gnat-darwin-dylib-install-name.patch ]; @@ -137,7 +137,7 @@ in # We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building # a foreign one: https://github.com/iains/gcc-12-branch/issues/18 -++ optionals (stdenv.isDarwin && stdenv.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ +++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ "14" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-14-branch. # 04696df09633baf97cdbbdd6e9929b9d472161d3 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.2.0 @@ -170,7 +170,7 @@ in }.${majorVersion} or []) # Work around newer AvailabilityInternal.h when building older versions of GCC. -++ optionals (stdenv.isDarwin) ({ +++ optionals (stdenv.hostPlatform.isDarwin) ({ "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ]; "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ]; "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ]; @@ -202,7 +202,7 @@ in ## gcc 11.0 and older ############################################################################## # libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target. -++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch +++ optional (is11 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch # openjdk build fails without this on -march=opteron; is upstream in gcc12 ++ optionals (is11) [ ./11/gcc-issue-103910.patch ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix index c71ea137ea..5ed7339c31 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ./install.sh (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")" install_name_tool -id "$libgerbil" "$libgerbil" ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix b/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix index 657847164b..9a4d676f51 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ m4 ]; - configureFlags = lib.optionals stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--build=x86_64-apple-darwin" ]; meta = { description = "Forth implementation of the GNU project (outdated version used to bootstrap)"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix index 56d89fd628..6b68f7b47c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-lispdir=${lispDir}" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "--build=x86_64-apple-darwin" ]; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { description = "Forth implementation of the GNU project"; homepage = "https://github.com/forthy42/gforth"; license = lib.licenses.gpl3; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault when running ./gforthmi + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault when running ./gforthmi platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix index a4602c9a64..20ad724624 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { # rcodesign is used to replace the signature instead of sigtool because it # supports setting the linker-signed flag, which will ensure future processing # of the binaries does not invalidate their signatures. - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ rcodesign ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ rcodesign ]; # Set LD_LIBRARY_PATH or equivalent so that the programs running as part # of the bindist installer can find the libraries they expect. @@ -245,14 +245,14 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin ('' + + lib.optionalString stdenv.hostPlatform.isDarwin ('' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # Resign the binary and set the linker-signed flag. Ignore failures when the file is an object file. # Object files don’t have signatures, so ignoring the failures is harmless. rcodesign sign --code-signature-flags linker-signed $exe || true @@ -274,7 +274,7 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + @@ -285,7 +285,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; '' + @@ -314,7 +314,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -349,7 +349,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux + postFixup = lib.optionalString stdenv.hostPlatform.isLinux (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -377,7 +377,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix index a6694e2e99..d0f9130ff3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix @@ -69,7 +69,7 @@ assert !enableIntegerSimple -> gmp != null; assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; let - libffi_name = if stdenv.isDarwin && stdenv.isAarch64 then "libffi" else "libffi_3_3"; + libffi_name = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "libffi" else "libffi_3_3"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; inherit (bootPkgs) ghc; @@ -253,7 +253,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch"; hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; @@ -302,9 +302,9 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -366,7 +366,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoreconfHook autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix index d66f47b661..eef0cba9f0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -26,7 +26,7 @@ let libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - glibcDynLinker = assert stdenv.isLinux; + glibcDynLinker = assert stdenv.hostPlatform.isLinux; if stdenv.hostPlatform.libc == "glibc" then # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -110,15 +110,15 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -perm -0100 \ -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libncurses${lib.optionalString stdenv.hostPlatform.is64bit "w"}.so.5 libncurses.so \ ${ # This isn't required for x86_64-linux where we use ncurses6 lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" } \ @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically @@ -160,14 +160,14 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix index 920b63ce4e..e8c6d83ea8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { # we need to modify the package db directly for hadrian bindists find . -name 'ghc-bignum*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # we need to modify the package db directly for hadrian bindists # (all darwin bindists are hadrian-based for 9.2.2) find . -name 'base*.conf' \ @@ -266,7 +266,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -281,7 +281,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmpUsed}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -316,7 +316,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -344,7 +344,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3-binary.nix index d67e9f47ac..6d8f195bb9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; '' # Similar for iconv and libffi on darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name 'base*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -267,7 +267,7 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = - lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -308,7 +308,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -336,7 +336,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isMachO $exe || continue diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix index b6d4d7236f..31d1e52ea9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix @@ -368,11 +368,11 @@ stdenv.mkDerivation ({ # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" '' + - lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -476,7 +476,7 @@ stdenv.mkDerivation ({ autoconf automake m4 # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers. python3 - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 2b23cd75a0..f6b6c33e9f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -309,13 +309,13 @@ stdenv.mkDerivation (rec { '' + lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "9.2") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "9.2") '' # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 export XATTR=${lib.getBin xattr}/bin/xattr @@ -383,11 +383,11 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx - ] ++ lib.optionals (stdenv.isDarwin && lib.versions.majorMinor version == "9.0") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versions.majorMinor version == "9.0") [ # TODO(@sternenseemann): backport addition of XATTR env var like # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 xattr diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/default.nix index 9a648f8384..aea58c62b6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { xorg.lndir gmp pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index 538711b2bd..279136ac60 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -12,21 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z9xDMQXzVUeHne7KG4QsutQAiU01mgnV7ccdkjl+EkU="; + hash = "sha256-buMnbBg+/vHXzbBuMPuV8AfdUmYA9J6WTXP7Oqrdo34="; }; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-XKHcA4DSVsWZfUHT6BkRjK0Mzz90E+ohYrtwZKPMtTY="; + cargoHash = "sha256-0Vtf9UXLPW5HuqNIAGNyqIXCMTITdG7PuFdw4H4v6a4="; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix index 7c8f1fbd9c..a4cb043510 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix index 4060a6cf69..afda23ba96 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix index d4486ff319..65c562389b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix index 6868ca9f8d..3cd5c1bcfa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; - hardeningDisable = lib.optional stdenv.isi686 "pic"; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "pic"; patchPhase = '' sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 83d60202a4..04f45c1ccd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -18,12 +18,12 @@ , zlib # extra params , extraCLibs ? [ ] -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , useMusl ? false , ... } @ args: -assert useMusl -> stdenv.isLinux; +assert useMusl -> stdenv.hostPlatform.isLinux; let extraArgs = builtins.removeAttrs args [ "lib" @@ -51,7 +51,7 @@ let "meta" ]; - cLibs = lib.optionals stdenv.isLinux ( + cLibs = lib.optionals stdenv.hostPlatform.isLinux ( [ glibc zlib.static ] ++ lib.optionals (!useMusl) [ glibc.static ] ++ lib.optionals useMusl [ musl ] @@ -86,7 +86,7 @@ let # # We therefor use --strip-components=1 vs 3 depending on the platform. tar xf "$src" -C "$out" --strip-components=${ - if stdenv.isLinux then "1" else "3" + if stdenv.hostPlatform.isLinux then "1" else "3" } # Sanity check @@ -104,12 +104,12 @@ let dontStrip = true; nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; propagatedBuildInputs = [ setJavaClassPath zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig stdenv.cc.cc.lib # libstdc++.so.6 @@ -136,7 +136,7 @@ let ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} ''; - preFixup = lib.optionalString (stdenv.isLinux) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' for bin in $(find "$out/bin" -executable -type f); do wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" done @@ -147,7 +147,7 @@ let runHook preInstallCheck ${# broken in darwin - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo "Testing Jshell" echo '1 + 1' | $out/bin/jshell ''} @@ -172,14 +172,14 @@ let ./helloworld | fgrep 'Hello World' ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux - lib.optionalString (stdenv.isLinux && !useMusl) '' + lib.optionalString (stdenv.hostPlatform.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' ''} ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && useMusl) '' + lib.optionalString (stdenv.hostPlatform.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 907441ff68..2c8220d89a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation ({ pname = product; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook ++ extraNativeBuildInputs; buildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation ++ extraBuildInputs; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix index bfc9c72968..c546d65ef0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -5,7 +5,7 @@ lib.makeScope pkgs.newScope (self: { stdenv = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 2c7e931a8a..b0834d839e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "22.0.2"; + "version" = "23.0.0"; "hashes" = { "aarch64-linux" = { - sha256 = "1n8ln1xk60hjvr191pj1mpg793zmq531mkwx3la8d2x6by0lrji8"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-aarch64_bin.tar.gz"; + sha256 = "084b0xwadq3ppk1wfn56z17hm02vlqq6vzhj7vmqcb8injym7bj2"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "0krnfhcnvhm809prdbhalj86652zh5cgl14qvp8vq3sydbcivb7b"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-x64_bin.tar.gz"; + sha256 = "180jhfkdbpkh5znwmncyxrfcyv0ail16l8vxz6371ws8ym5vc3j4"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1r0j7n4k5ganyrxs9pxjwdbm8k9a20g6giixdhm9nmpan6hxs4h5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-x64_bin.tar.gz"; + sha256 = "1ajdkm0f1gckyss9rp7i7gay8dh25azr37pd8f36hif8wlwbhf0k"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "07qhym71n4v2744j9h6qx72v79mgkk266isn4kc9rgrb7x8gsgc8"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-aarch64_bin.tar.gz"; + sha256 = "16rapbc1az3c8dx83961yjra1j1rwg3i24dvgwixqd2is7v8g9fd"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_macos-aarch64_bin.tar.gz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index 95e9c56fc2..da97134765 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix @@ -17,7 +17,7 @@ graalvmCEPackages.buildGraalvmProduct { openssl ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/lib/mri/openssl.so \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -31,7 +31,7 @@ graalvmCEPackages.buildGraalvmProduct { export LC_ALL=C $out/bin/ruby -e 'puts(1 + 1)' ${# broken in darwin with sandbox enabled - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo '1 + 1' | $out/bin/irb ''} ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix index 738ecc81a1..d34ee3af91 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether # ::aligned_alloc is available. For us, it isn't. - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace 'src/runtime/HalideBuffer.h' \ --replace '#ifdef __APPLE__ #include @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { libjpeg eigen openblas - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ mesa libGL ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix index 78e5770cc6..4613b90113 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -65,7 +65,7 @@ let ] ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 - ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security + ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.hostPlatform.isDarwin) Security ++ ocamlDependencies version; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix index 2d5ec9a283..6f39eea618 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { makeWrapper clang platformChez - ] ++ lib.optionals stdenv.isDarwin [ zsh ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; buildInputs = [ platformChez gmp @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchShebangs --build tests ''; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.isDarwin "OS="; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` buildFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/tests.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/tests.nix index bb5cd140c9..b4193286d4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/idris2/tests.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/tests.nix @@ -28,7 +28,7 @@ let # is not the case with pure nix environments. Thus, we need to include zsh # when we build for darwin in tests. While this is impure, this is also what # we find in real darwin hosts. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; } '' set -eo pipefail diff --git a/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix index cb464e3484..b4b97af524 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix @@ -29,6 +29,6 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ mbbx6spp ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix index b8c48c5c6a..2aa173fdde 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb # the default test target is sse4, but that is not supported by all Hydra agents -, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] +, testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ]; buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_UTILS=OFF" - ("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE")) - ("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE")) - ] ++ lib.lists.optionals stdenv.isDarwin [ + ("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE")) + ("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE")) + ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/17.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/17.nix index 76d4079baa..a868a441ba 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -147,7 +147,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { inherit (openjdk17.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 0f003a3ea4..77ac8e904d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -38,26 +38,26 @@ let in jdk.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; - javaVersion = "21.0.3"; - build = "509.11"; + javaVersion = "21.0.4"; + build = "598.4"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime # git checkout jbr-release-${javaVersion}b${build} # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," - openjdkTag = "jbr-21.0.2+13"; + openjdkTag = "jbr-21.0.4+8"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-zTstmrH4KteR40BVDRfxOrl8aUQ26acE+ywscBd8sw8="; + hash = "sha256-YF5Z1A4qmD9Z4TE6f2i8wv9ZD+NqHGY5Q0oIVQiC3Bg="; }; BOOT_JDK = jdk.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update - SOURCE_DATE_EPOCH = 1723453663; + SOURCE_DATE_EPOCH = 1726275531; patches = [ ]; @@ -147,7 +147,7 @@ jdk.overrideAttrs (oldAttrs: rec { inherit (jdk.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 537133524a..9cda4fc516 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -45,7 +45,7 @@ , thrift }: -assert !stdenv.isDarwin; +assert !stdenv.hostPlatform.isDarwin; # I can't test darwin let diff --git a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index 8e723cdb82..4dc7557d13 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_GTEST=ON" "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix index 09a8c2bce3..fd78e61138 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/generic-bin.nix @@ -24,14 +24,14 @@ let "REPL" # Test flaky "ccall" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test flaky on ofborg "FileWatching" # Test requires pbcopy "InteractiveUtils" # Test requires network access "Sockets" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Test Failed at $out/share/julia/stdlib/v1.8/LinearAlgebra/test/blas.jl:702 "LinearAlgebra/blas" # Test Failed at $out/share/julia/test/misc.jl:724 @@ -71,7 +71,7 @@ stdenv.mkDerivation { '@test_skip ca_roots_path() != bundled_ca_roots()' ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook # https://github.com/JuliaLang/julia/blob/v1.9.0/NEWS.md#external-dependencies stdenv.cc.cc diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix index e3360137ca..53a5067e78 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/generic.nix @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "USE_BINARYBUILDER=0" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix index 617f868803..a5a8585d02 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KzoEh/kMKsHx9K3t1/uQZ7fdsZEM+v8UOft8JjEB1Zw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix index 8a76de0222..b472eb921c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix @@ -113,7 +113,7 @@ ocamlPackages.buildDunePackage rec { seqes stdint tezt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix index ee89de4ac7..9d6385ae74 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -12,6 +12,7 @@ python3, buildLlvmTools, patches ? [ ], + devExtraCmakeFlags ? [ ], }: stdenv.mkDerivation (finalAttrs: { @@ -43,9 +44,11 @@ stdenv.mkDerivation (finalAttrs: { libxml2 ]; - cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.llvm}/bin/llvm-tblgen") - ]; + cmakeFlags = + lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.llvm}/bin/llvm-tblgen") + ] + ++ devExtraCmakeFlags; postUnpack = '' chmod -R u+w -- $sourceRoot/.. diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix index 5a6d775804..9ef1a3a3c6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix @@ -17,6 +17,7 @@ , fixDarwinDylibNames , enableManpages ? false , clang-tools-extra_src ? null +, devExtraCmakeFlags ? [] }: let @@ -69,7 +70,9 @@ let # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]) ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "-DCLANG_DEFAULT_CXX_STDLIB=ON"; + ]) ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ + "-DCLANG_DEFAULT_CXX_STDLIB=ON" + ] ++ devExtraCmakeFlags; postPatch = '' # Make sure clang passes the correct location of libLTO to ld64 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 288ad81dcd..a6d727739d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -28,6 +28,7 @@ # `libcompiler_rt` library, at least under certain configurations. Some # platforms stil expect this, however, so we symlink one into place. , forceLinkCompilerRt ? stdenv.hostPlatform.isOpenBSD +, devExtraCmakeFlags ? [] }: let @@ -67,7 +68,7 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ cmake ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) ++ [ python3 libllvm.dev ] - ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include; @@ -132,11 +133,11 @@ stdenv.mkDerivation ({ # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 "-DCOMPILER_RT_ENABLE_IOS=OFF" - ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-DSANITIZER_MIN_OSX_VERSION=10.10" - ] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ + ] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF" - ]; + ] ++ devExtraCmakeFlags; outputs = [ "out" "dev" ]; @@ -145,10 +146,10 @@ stdenv.mkDerivation ({ # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix index 1c56e0f6f4..2a5d3c9dcd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix @@ -27,6 +27,9 @@ officialRelease ? null, monorepoSrc ? null, version ? null, + # Allows passthrough to packages via newScope. This makes it possible to + # do `(llvmPackages.override { = bar; }).clang` and get + # an llvmPackages whose packages are overridden in an internally consistent way. ... }@args: @@ -1055,7 +1058,7 @@ let lib.optional ( lib.versions.major metadata.release_version == "17" - && stdenv.isDarwin + && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" ) # https://github.com/llvm/llvm-project/issues/64226 @@ -1070,7 +1073,7 @@ let lib.optional ( lib.versionAtLeast metadata.release_version "18" - && stdenv.isDarwin + && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" ) # https://github.com/llvm/llvm-project/issues/64226 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxx/default.nix index f646edf030..17c687f883 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -16,6 +16,7 @@ , cxxabi ? if stdenv.hostPlatform.isFreeBSD then freebsd.libcxxrt else null , libunwind , enableShared ? !stdenv.hostPlatform.isStatic +, devExtraCmakeFlags ? [] }: # external cxxabi is not supported on Darwin as the build will not link libcxx @@ -103,7 +104,8 @@ let "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ cxxCMakeFlags - ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags; + ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags + ++ devExtraCmakeFlags; in @@ -119,7 +121,7 @@ stdenv.mkDerivation (rec { ''; nativeBuildInputs = [ cmake ninja python3 ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional (cxxabi != null) lndir; buildInputs = [ cxxabi ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix index 515914e6ac..77854ddfcc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -12,6 +12,7 @@ , python3 , libcxx , enableShared ? !stdenv.hostPlatform.isStatic +, devExtraCmakeFlags ? [] }: let pname = "libunwind"; @@ -68,7 +69,8 @@ stdenv.mkDerivation (rec { ]; cmakeFlags = lib.optional (lib.versionAtLeast release_version "15") "-DLLVM_ENABLE_RUNTIMES=libunwind" - ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF" + ++ devExtraCmakeFlags; meta = llvm_meta // { # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix index 99bb150a81..d5c0f7cb3a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lld/default.nix @@ -13,6 +13,7 @@ , libxml2 , libllvm , version +, devExtraCmakeFlags ? [] }: let pname = "lld"; @@ -32,7 +33,7 @@ let '(''${LLVM_MAIN_SRC_DIR}/' '(' mkdir -p libunwind/include tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" - '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.isDarwin) '' + '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.hostPlatform.isDarwin) '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; @@ -55,7 +56,7 @@ stdenv.mkDerivation (rec { "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ]; + ] ++ devExtraCmakeFlags; # Musl's default stack size is too small for lld to be able to link Firefox. LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix index 65974e757c..4f679f4dcf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix @@ -23,6 +23,7 @@ , monorepoSrc ? null , patches ? [ ] , enableManpages ? false +, devExtraCmakeFlags ? [ ] , ... }: @@ -53,7 +54,7 @@ stdenv.mkDerivation (rec { # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of # the `lib` output because that would create a cycle between it and the `out` output. - outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "lib" ]; + outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "lib" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; @@ -86,7 +87,7 @@ stdenv.mkDerivation (rec { # libclang into the rpath of the lldb executables. By putting it into # buildInputs cc-wrapper will set up rpath correctly for us. (lib.getLib libclang) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -122,9 +123,9 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${lib.getDev libclang}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ lib.optionals (lib.versionAtLeast release_version "17") [ "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}" @@ -142,7 +143,7 @@ stdenv.mkDerivation (rec { ]) ++ lib.optionals doCheck [ "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; + ] ++ devExtraCmakeFlags; doCheck = false; doInstallCheck = lib.versionOlder release_version "15"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix index a995c83405..281a21ca15 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -28,18 +28,19 @@ , sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true) - && (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? !stdenv.hostPlatform.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true) + && (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ +, enablePFM ? stdenv.hostPlatform.isLinux /* PFM only supports Linux */ # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 # broken for the armv7l builder && !stdenv.hostPlatform.isAarch , enablePolly ? lib.versionAtLeast release_version "14" , enableTerminfo ? true +, devExtraCmakeFlags ? [] }: let @@ -125,7 +126,7 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = (lib.optional (lib.versionAtLeast release_version "14" || stdenv.buildPlatform == stdenv.hostPlatform) ncurses) ++ [ zlib ]; - postPatch = optionalString stdenv.isDarwin ('' + postPatch = optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" @@ -166,7 +167,7 @@ stdenv.mkDerivation (rec { --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" ''))) + # dup of above patch with different conditions - optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' + optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" @@ -266,7 +267,7 @@ stdenv.mkDerivation (rec { # It seems to reference /usr/local/lib/libfile.a, which is clearly a problem. # 2. This test fails for the same reason it fails on MacOS, but the fix is # not trivial to apply. - optionalString stdenv.isFreeBSD '' + optionalString stdenv.hostPlatform.isFreeBSD '' rm test/tools/llvm-libtool-darwin/L-and-l.test rm test/ExecutionEngine/Interpreter/intrinsics.ll '' + '' @@ -318,7 +319,7 @@ stdenv.mkDerivation (rec { ''; # E.g. Mesa uses the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.hostPlatform.isDarwin) "-Wl,--build-id=sha1"; cmakeBuildType = if debugVersion then "Debug" else "Release"; @@ -366,7 +367,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ @@ -399,7 +400,7 @@ stdenv.mkDerivation (rec { nativeInstallFlags ]) ) - ]; + ] ++ devExtraCmakeFlags; postInstall = '' mkdir -p $python/share @@ -415,10 +416,10 @@ stdenv.mkDerivation (rec { substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' '') - + optionalString (stdenv.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' @@ -494,7 +495,7 @@ stdenv.mkDerivation (rec { mv polly-* $sourceRoot/tools/polly ''; } // lib.optionalAttrs (lib.versionAtLeast release_version "13") { - nativeCheckInputs = [ which ] ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast release_version "15") sysctl; + nativeCheckInputs = [ which ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl; } // lib.optionalAttrs (lib.versionOlder release_version "15") { # hacky fix: created binaries need to be run before installation preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix index 891e66b1d5..e4dd12d69e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -9,7 +9,8 @@ , libxml2 , libllvm , version -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, devExtraCmakeFlags ? [] }: stdenv.mkDerivation rec { @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" "-DMLIR_TABLEGEN_EXE=${buildLlvmTools.mlir}/bin/mlir-tblgen" - ]; + ] ++ devExtraCmakeFlags; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix index 0de91473dd..57c6de07c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -15,6 +15,7 @@ , perl , pkg-config , version +, devExtraCmakeFlags ? [] }: let pname = "openmp"; @@ -60,7 +61,7 @@ stdenv.mkDerivation (rec { "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" "-DOPT_TOOL=${llvm}/bin/opt" "-DLINK_TOOL=${llvm}/bin/llvm-link" - ]; + ] ++ devExtraCmakeFlags; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/default.nix index ee5efdb22b..2d0ffd4740 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/default.nix @@ -14,7 +14,12 @@ bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, llvmVersions ? { }, -}: + # Allows passthrough to packages via newScope in ./common/default.nix. + # This makes it possible to do + # `(llvmPackages.override { = bar; }).clang` and get + # an llvmPackages whose packages are overridden in an internally consistent way. + ... +}@packageSetArgs: let versions = { "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; @@ -25,9 +30,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs="; "20.0.0-git".gitRelease = { - rev = "ffcff4af59712792712b33648f8ea148b299c364"; - rev-version = "20.0.0-unstable-2024-09-09"; - sha256 = "sha256-RVxezpWFDH4prmaLhm0ASlpRwnMdmLqcZMsp2RiXq8I="; + rev = "48498ec7a4ded9f1bf813051abdc54c3e5b66fa7"; + rev-version = "20.0.0-unstable-2024-09-16"; + sha256 = "sha256-kybEr4T6vA4F9wtWdFf0QagVYU3tUvaXiSzPsxBkVUI="; }; } // llvmVersions; @@ -53,25 +58,29 @@ let in lib.nameValuePair attrName ( recurseIntoAttrs ( - callPackage ./common { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; - targetLlvmLibraries = - targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; - targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; - stdenv = - if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then - gcc12Stdenv - else - stdenv; # does not build with gcc13 - inherit bootBintoolsNoLibc bootBintools; - inherit - officialRelease - gitRelease - monorepoSrc - version - ; - } + callPackage ./common ( + { + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; + targetLlvmLibraries = + targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; + targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; + inherit + officialRelease + gitRelease + monorepoSrc + version + ; + } + // packageSetArgs # Allow overrides. + // { + stdenv = + if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then + gcc12Stdenv + else + stdenv; # does not build with gcc13 + } + ) ) ); diff --git a/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix index 645e7019aa..2ebe573cf5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ CoreFoundation Cocoa @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://strlen.com/lobster/"; description = "Lobster programming language"; mainProgram = "lobster"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix index ae4da0d5b0..6f4d14b279 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix @@ -22,18 +22,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsa-lib libX11 libXext ]; + buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXext ]; enableParallelBuilding = true; env.NIX_CFLAGS_COMPILE = "-Wno-unused-result"; preBuild = '' - pushd ${if stdenv.isDarwin then "macos/cmdline" else "unix"} + pushd ${if stdenv.hostPlatform.isDarwin then "macos/cmdline" else "unix"} ''; # TODO: build graphic version for darwin - buildFlags = (if stdenv.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildFlags = (if stdenv.hostPlatform.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; postBuild = '' popd @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - bin/${if stdenv.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy + bin/${if stdenv.hostPlatform.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix index 1abbac512a..c9fc962e30 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix @@ -15,9 +15,9 @@ let version = "12.1"; - bootstrapFromC = ! ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isx86_64); + bootstrapFromC = ! ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isx86_64); - arch = if stdenv.isLinux && stdenv.isAarch64 then + arch = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then "-aarch64le" else "-x86-64"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # leads to more efficient code than when building the tarball that contains # generated C code instead of those binaries. src = - if stdenv.isLinux && stdenv.isAarch64 + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-aarch64le.tar.gz"; sha256 = "12ra9bc93x8g07impbd8jr6djjzwpb9qvh9zhxvvrba3332zx3vh"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix index 0b95f3e9b2..ae2d11feb7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "ANSI Common Lisp Implementation"; homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix index c4dfa85b70..633f126a35 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.11"; + version = "4.7.12"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-awjinXegc8jLd6OAB8QLDoXnotZhKbyfMWckp2U3MjA="; + sha256 = "sha256-9a2CbIOHdN+kTtm2Z001qOEO/nXuSLrzq0ovgHU1hTQ="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlton/20130715.nix b/third_party/nixpkgs/pkgs/development/compilers/mlton/20130715.nix index 98b4aeda55..90285bf089 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlton/20130715.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlton/20130715.nix @@ -3,7 +3,7 @@ let version = "20130715"; - usr_prefix = if stdenv.isDarwin then "usr/local" else "usr"; + usr_prefix = if stdenv.hostPlatform.isDarwin then "usr/local" else "usr"; dynamic_linker = stdenv.cc.bintools.dynamicLinker; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; makeFlags = [ "all-no-docs" ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton '' + lib.optionalString stdenv.cc.isClang '' sed -i "s_ patch -s -p0 config/srcarchiveurl patch --verbose config/_heap2exec ${./heap2exec.diff} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Locate standard headers like substituteInPlace base/runtime/config/gen-posix-names.sh \ --replace "\$SDK_PATH/usr" "${Libsystem}" @@ -89,6 +89,6 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ thoughtpolice ]; mainProgram = "sml"; # never built on x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix index 2147d59ffd..73476c939c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -8,7 +8,7 @@ , python3 , z3Support ? true , z3_4_11 ? null -, cvc4Support ? gccStdenv.isLinux +, cvc4Support ? gccStdenv.hostPlatform.isLinux , cvc4 ? null , cln ? null , gmp ? null @@ -52,7 +52,7 @@ let maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; }; - solc = if gccStdenv.isLinux then gccStdenv.mkDerivation rec { + solc = if gccStdenv.hostPlatform.isLinux then gccStdenv.mkDerivation rec { inherit pname version meta; # upstream suggests avoid using archive generated by github diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix index b851ac2c14..f279ce475a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ./includes.patch ]; - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ]; buildInputs = [ bash-completion ncurses zlib sqlite libffi python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix index 20adaf5f55..89e4452e7d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { postInstall = '' install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool $out/bin/llvm-spirv \ -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index 628e69eb5b..c104cca2cf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -74,7 +74,7 @@ let packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false)])." -t "halt." ''; - withGui' = withGui && !stdenv.isDarwin; + withGui' = withGui && !stdenv.hostPlatform.isDarwin; optionalDependencies = [] ++ (lib.optional withDb db) ++ (lib.optional withJava jdk) @@ -85,7 +85,7 @@ let ++ (lib.optionals withGui' [ libXt libXext libXpm libXft libXinerama libjpeg libSM freetype fontconfig ]) - ++ (lib.optional stdenv.isDarwin Security) + ++ (lib.optional stdenv.hostPlatform.isDarwin Security) ++ extraLibraries'; in stdenv.mkDerivation { @@ -126,8 +126,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ] ++ lib.optionals (!withNativeCompiler) [ # without these options, the build will embed full compiler paths - "-DSWIPL_CC=${if stdenv.isDarwin then "clang" else "gcc"}" - "-DSWIPL_CXX=${if stdenv.isDarwin then "clang++" else "g++"}" + "-DSWIPL_CC=${if stdenv.hostPlatform.isDarwin then "clang" else "gcc"}" + "-DSWIPL_CXX=${if stdenv.hostPlatform.isDarwin then "clang++" else "g++"}" ]; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/default.nix index d3e2017958..c74ee850f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/default.nix @@ -50,7 +50,7 @@ let sources = callPackage ../sources.nix { }; # Tools invoked by swift at run-time. - runtimeDeps = lib.optionals stdenv.isDarwin [ + runtimeDeps = lib.optionals stdenv.hostPlatform.isDarwin [ # libtool is used for static linking. This is part of cctools, but adding # that as a build input puts an unwrapped linker in PATH, and breaks # builds. This small derivation exposes just libtool. @@ -78,7 +78,7 @@ let else targetPlatform.parsed.kernel.name; # Apple Silicon uses a different CPU name in the target triple. - swiftArch = if stdenv.isDarwin && stdenv.isAarch64 then "arm64" + swiftArch = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "arm64" else targetPlatform.parsed.cpu.name; # On Darwin, a `.swiftmodule` is a subdirectory in `lib/swift/`, @@ -109,7 +109,7 @@ let "toolchain-tools" "toolchain-dev-tools" "license" - (if stdenv.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") + (if stdenv.hostPlatform.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") "swift-remote-mirror" "swift-remote-mirror-headers" ]; @@ -205,7 +205,7 @@ in stdenv.mkDerivation { makeClangWrapper makeSwiftcWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild sigtool # codesign DarwinTools # sw_vers @@ -218,10 +218,10 @@ in stdenv.mkDerivation { swig libxml2 ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Foundation Combine @@ -262,7 +262,7 @@ in stdenv.mkDerivation { ${copySource "swift-experimental-string-processing"} ${copySource "swift-syntax"} ${lib.optionalString - (!stdenv.isDarwin) + (!stdenv.hostPlatform.isDarwin) (copySource "swift-corelibs-libdispatch")} chmod -R u+w . @@ -272,7 +272,7 @@ in stdenv.mkDerivation { # Just patch all the things for now, we can focus this later. # TODO: eliminate use of env. find -type f -print0 | xargs -0 sed -i \ - ${lib.optionalString stdenv.isDarwin + ${lib.optionalString stdenv.hostPlatform.isDarwin "-e 's|/usr/libexec/PlistBuddy|${xcbuild}/bin/PlistBuddy|g'"} \ -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ @@ -345,7 +345,7 @@ in stdenv.mkDerivation { hash = "sha256-nkRPWx8gNvYr7mlvEUiOAb1rTrf+skCZjAydJVUHrcI="; }} - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ @@ -384,7 +384,7 @@ in stdenv.mkDerivation { patchShebangs . - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # NOTE: This interferes with ABI stability on Darwin, which uses the system # libraries in the hardcoded path /usr/lib/swift. fixCmakeFiles . @@ -392,7 +392,7 @@ in stdenv.mkDerivation { ''; # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0' - hardeningDisable = lib.optional stdenv.isAarch64 "zerocallusedregs"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "zerocallusedregs"; configurePhase = '' export SWIFT_SOURCE_ROOT="$PWD" @@ -451,7 +451,7 @@ in stdenv.mkDerivation { " buildProject llvm llvm-project/llvm - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Add appleSwiftCore to the search paths. We can't simply add it to # buildInputs, because it is potentially an older stdlib than the one we're # building. We have to remove it again after the main Swift build, or later @@ -477,7 +477,7 @@ in stdenv.mkDerivation { # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 cmakeFlags=" -GNinja - -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.isDarwin "-WITH-HOSTLIBS"} + -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"} -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON @@ -490,11 +490,11 @@ in stdenv.mkDerivation { -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} - -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} + -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.hostPlatform.isDarwin then "ON" else "OFF"} " buildProject swift - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Restore search paths to remove appleSwiftCore. export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" @@ -526,18 +526,18 @@ in stdenv.mkDerivation { -DLLDB_ENABLE_LUA=OFF -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' -DLLDB_USE_SYSTEM_DEBUGSERVER=ON ''} -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} - -DCURSES_INCLUDE_DIRS=${if stdenv.isDarwin then "/var/empty" else ncurses.dev}/include + -DCURSES_INCLUDE_DIRS=${if stdenv.hostPlatform.isDarwin then "/var/empty" else ncurses.dev}/include -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} "; buildProject lldb llvm-project/lldb - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Need to do a standalone build of concurrency for Darwin back deployment. # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py cmakeFlags=" @@ -641,7 +641,7 @@ in stdenv.mkDerivation { cd $SWIFT_BUILD_ROOT/swift ninjaInstallPhase - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' cd $SWIFT_BUILD_ROOT/swift-concurrency-backdeploy installTargets=install-back-deployment ninjaInstallPhase @@ -669,20 +669,20 @@ in stdenv.mkDerivation { mkdir $lib/lib/swift/clang cp -P ${clang}/resource-root/* $lib/lib/swift/clang/ - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Install required library for ObjC interop. # TODO: Is there no source code for this available? cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc ''} ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # This is cheesy, but helps the patchelf hook remove /build from RPATH. cd $SWIFT_BUILD_ROOT/.. mv build buildx ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' # These libraries need to use the system install name. The official SDK # does the same (as opposed to using rpath). Presumably, they are part of # the stable ABI. Not using the system libraries at run-time is known to diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix index e55465e952..76db695b08 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -25,7 +25,7 @@ let # # The following selects the correct Clang version, matching the version # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. - clang = if pkgs.stdenv.isDarwin + clang = if pkgs.stdenv.hostPlatform.isDarwin then swiftLlvmPackages.clang.override rec { libc = apple_sdk.Libsystem; @@ -68,11 +68,11 @@ let useSwiftDriver = false; }; - Dispatch = if stdenv.isDarwin + Dispatch = if stdenv.hostPlatform.isDarwin then null # part of libsystem else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; - Foundation = if stdenv.isDarwin + Foundation = if stdenv.hostPlatform.isDarwin then apple_sdk.frameworks.Foundation else callPackage ./foundation { swift = swiftNoSwiftDriver; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index f0c08a41e4..2d1cd6dd04 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -21,7 +21,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "sourcekit-lsp"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { XCTest sqlite ncursesInput - ] ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure + '' swiftpmMakeMutable indexstore-db diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/default.nix index 2645f07aa4..1359588224 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ swift swiftpm ]; buildInputs = [ Foundation XCTest ] - ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/default.nix index ca2b88046c..03c7898fe1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/default.nix @@ -19,7 +19,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "swift-driver"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/default.nix index 712bc01777..b8d8d2fe7b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/default.nix @@ -81,7 +81,7 @@ let # Tools invoked by swiftpm at run-time. runtimeDeps = [ git ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun # These tools are part of cctools, but adding that as a build input puts # an unwrapped linker in PATH, and breaks builds. This small derivation @@ -99,13 +99,13 @@ let mkBootstrapDerivation = attrs: stdenv.mkDerivation (attrs // { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ cmake ninja swift ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = (attrs.buildInputs or [ ]) ++ [ Foundation ]; postPatch = (attrs.postPatch or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. if [ -e cmake/modules/SwiftSupport.cmake ]; then substituteInPlace cmake/modules/SwiftSupport.cmake \ @@ -121,7 +121,7 @@ let ''; postInstall = (attrs.postInstall or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # The install name of libraries is incorrectly set to lib/ (via our # CMake setup hook) instead of lib/swift/. This'd be easily fixed by # fixDarwinDylibNames, but some builds create libraries that reference @@ -149,7 +149,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; # Derivations for bootstrapping dependencies using CMake. # This is based on the `swiftpm/Utilities/bootstrap` script. @@ -168,7 +168,7 @@ let src = generated.sources.swift-system; postInstall = cmakeGlue.SwiftSystem - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -188,7 +188,7 @@ let ''; postInstall = cmakeGlue.SwiftCollections - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -245,7 +245,7 @@ let ]; postInstall = cmakeGlue.ArgumentParser - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Fix rpath so ArgumentParserToolInfo can be found. patchelf --add-rpath "$out/lib/swift/${swiftOs}" \ $out/lib/swift/${swiftOs}/libArgumentParser.so @@ -266,7 +266,7 @@ let name = "llbuild"; src = generated.sources.swift-llbuild; - nativeBuildInputs = lib.optional stdenv.isDarwin xcbuild; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = [ ncursesInput sqlite ]; patches = [ @@ -389,7 +389,7 @@ in stdenv.mkDerivation (commonAttrs // { sqlite XCTest ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/xctest/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/xctest/default.nix index d50d11706c..f6f4cdacae 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/xctest/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/xctest/default.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation { outputs = [ "out" ]; nativeBuildInputs = [ cmake ninja swift ] - ++ lib.optional stdenv.isDarwin DarwinTools; # sw_vers + ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; # sw_vers buildInputs = [ Foundation ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. substituteInPlace cmake/modules/SwiftSupport.cmake \ --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' @@ -34,9 +34,9 @@ in stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.12 ''; - cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin normally uses the Xcode version of XCTest. Installing # swift-corelibs-xctest is probably not officially supported, but we have # no alternative. Fix up the installation here. diff --git a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 9da96aee8d..29cdf778f5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -66,7 +66,7 @@ let xorg.libXrender xorg.libXtst zlib - ] ++ lib.optional stdenv.isAarch32 libffi; + ] ++ lib.optional stdenv.hostPlatform.isAarch32 libffi; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix b/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix index 1d50d6e23d..4193ab5316 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ llvmMerged ncurses libffi libxml2 ] ++ lib.optionals enableCUDA [ cuda ] - ++ lib.optional (!stdenv.isDarwin) libpfm - ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Cocoa Foundation ]; cmakeFlags = let resourceDir = "${llvmMerged}/lib/clang/" + ( @@ -100,6 +100,6 @@ in stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs # Linux Aarch64 broken above LLVM11 # https://github.com/terralang/terra/issues/597 - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix index b36eb44229..65eea0a48e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; in '' ${ - if stdenv.isDarwin && ! versionIsClean finalAttrs.version + if stdenv.hostPlatform.isDarwin && ! versionIsClean finalAttrs.version then "echo 'not overwriting VERSION since it would upset ld'" else "echo ${finalAttrs.version} > VERSION" } @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' rm tests/tests2/{108,114}* ''; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ joachifm AndersonTorres ]; platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) # TODO: more multiple outputs diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix index a32e516633..386322780c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix @@ -54,7 +54,7 @@ buildGoModule rec { nativeCheckInputs = [ binaryen ]; nativeBuildInputs = [ makeWrapper lld ]; buildInputs = [ llvm clang.cc ] - ++ lib.optionals stdenv.isDarwin [ xar ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar ]; doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform); inherit tinygoTests; @@ -112,7 +112,7 @@ buildGoModule rec { # GDB upstream does not support ARM darwin runtimeDeps = [ go clang.cc lld avrdude openocd binaryen ] - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ gdb ]; + ++ lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ gdb ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix index 21d9a2bf5d..59332fa41f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makefile = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix index 2dd2b7a158..5a8e57d213 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; version = "0.5.26"; - src = if stdenv.isDarwin then + src = if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; hash = "sha256-RF2Q5sCxT9F3IGM/8UP6bEe9sOjtpMVYHREuAPOzh8g="; @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { dontConfigure = true; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; - buildInputs = lib.optionals (!stdenv.isDarwin) [ gmp ncurses6 zlib ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmp ncurses6 zlib ]; installPhase = '' mkdir -p $out/{bin,lib} diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 1b880b61a0..96b995d64b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -50,7 +50,7 @@ let nativeBuildInputs = [ pkg-config flex bison libxslt gobject-introspection - ] ++ lib.optional (stdenv.isDarwin) expat + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ] ++ extraNativeBuildInputs; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix index a0acfd2634..267f473274 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix @@ -19,7 +19,7 @@ let }; # patch the ptrace reference for darwin - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace v.c \ --replace "#include " "${ptraceSubstitution}" '' + '' @@ -56,9 +56,9 @@ stdenv.mkDerivation { buildInputs = [ binaryen - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXau xorg.libXdmcp diff --git a/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix index db7d9b05b7..d58f2e9d72 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { # the linux 32 bit build fails. - broken = (stdenv.isLinux && stdenv.isAarch64) || !stdenv.is64bit; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || !stdenv.hostPlatform.is64bit; homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "ISO-compatible high-performance Prolog compiler"; license = lib.licenses.artistic2; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/0.12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/0.12/default.nix index 1a730d4c0c..f359140df2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/0.12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/0.12/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/0.13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/0.13/default.nix index 43093c822f..8ec68f2026 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/0.13/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/0.13/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix index cde1a61e35..27c193c056 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix index c9056236ea..f1d0f43325 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix @@ -16,7 +16,7 @@ # runtime dependencies , cups # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , cairo , glib , gtk2 @@ -48,7 +48,7 @@ let gtk3 ] ++ lib.optionals (gtkSupport && lib.versionOlder dist.jdkVersion "17") [ gtk2 - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) [ ffmpeg.lib ]; @@ -75,12 +75,12 @@ let nativeBuildInputs = [ unzip - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype @@ -92,9 +92,9 @@ let xorg.libXtst xorg.libXxf86vm zlib - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) runtimeDependencies; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) runtimeDependencies; - autoPatchelfIgnoreMissingDeps = if (stdenv.isLinux && enableJavaFX) then [ + autoPatchelfIgnoreMissingDeps = if (stdenv.hostPlatform.isLinux && enableJavaFX) then [ "libavcodec*.so.*" "libavformat*.so.*" ] else null; @@ -126,7 +126,7 @@ let cat <> $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # We cannot use -exec since wrapProgram is a function but not a command. # # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it @@ -138,14 +138,14 @@ let done '' # FIXME: move all of the above to installPhase. - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' find "$out" -name libfontmanager.so -exec \ patchelf --add-needed libfontconfig.so {} \; ''; # fixupPhase is moving the man to share/man which breaks it because it's a # relative symlink. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man ''; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix index 451353a341..d9a0182c26 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix @@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev" owner = "QuickChick"; inherit version; defaultVersion = lib.switch [ coq.coq-version ssreflect.version ] [ - { cases = [ (lib.versions.range "8.15" "8.19") lib.pred.true ]; out = "2.0.2"; } + { cases = [ (lib.versions.range "8.15" "8.20") lib.pred.true ]; out = "2.0.4"; } { cases = [ (lib.versions.range "8.13" "8.17") lib.pred.true ]; out = "1.6.5"; } { cases = [ "8.13" lib.pred.true ]; out = "1.5.0"; } { cases = [ "8.12" lib.pred.true ]; out = "1.4.0"; } @@ -18,6 +18,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev" { cases = [ "8.6" lib.pred.true ]; out = "20171102"; } { cases = [ "8.5" lib.pred.true ]; out = "20170512"; } ] null; + release."2.0.4".sha256 = "sha256-WD8B+n8gyGctHMO+M8201Ca3Uw8zCWYsOatSNGCf0/s="; release."2.0.2".sha256 = "sha256-xxKkwDRjB8nUiXNhein1Ppn0DP5FZ13J90xUPAnQBbs="; release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY="; release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix index 6f1f89ee62..7be4725255 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix @@ -3,15 +3,17 @@ mkCoqDerivation { pname = "autosubst"; - release."1.7".rev = "v1.7"; + releaseRev = v: "v${v}"; + release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; - release."1.8".rev = "v1.8"; release."1.8".sha256 = "sha256-n0lD8D+tjqkDDjFiE4CggxczOPS5TkEnxpB3zEwWZ2I="; + release."1.9".sha256 = "sha256-XiLZjMc+1iwRGOstfLm/WQRF6FTdX6oJr5urn3wmLlA="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.13"; out = "1.7"; } + { case = range "8.14" "8.20"; out = "1.9"; } { case = range "8.14" "8.18"; out = "1.8"; } + { case = range "8.10" "8.13"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix index a5418ce08d..e3fa7036a8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix @@ -6,9 +6,11 @@ repo = "coq-simple-io"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.17" "8.20"; out = "1.10.0"; } { case = range "8.11" "8.19"; out = "1.8.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; + release."1.10.0".sha256 = "sha256-67cBhLvRMWLWBL7NXK1zZTQC4PtSKu9qtesU4SqKkOw="; release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY="; release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci"; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; @@ -20,9 +22,7 @@ doCheck = true; checkTarget = "test"; - useDuneifVersion = v: - (lib.versionAtLeast v "1.8.0" || v == "dev") - && (lib.versionAtLeast coq.version "8.20" || coq.version == "dev"); + useDuneifVersion = v: (lib.versionAtLeast v "1.10.0" || v == "dev"); passthru.tests.HelloWorld = callPackage ./test.nix {}; diff --git a/third_party/nixpkgs/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix b/third_party/nixpkgs/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix new file mode 100644 index 0000000000..442bfb8a2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix @@ -0,0 +1,81 @@ +{ + cudaPackages, + lib, + writeGpuTestPython, + # Configuration flags + openCVFirst, + useOpenCVDefaultCuda, + useTorchDefaultCuda, +}: +let + inherit (lib.strings) optionalString; + + openCVBlock = '' + + import cv2 + print("OpenCV version:", cv2.__version__) + + # Ensure OpenCV can access the GPU. + assert cv2.cuda.getCudaEnabledDeviceCount() > 0, "No CUDA devices found for OpenCV" + print("OpenCV CUDA device:", cv2.cuda.printCudaDeviceInfo(cv2.cuda.getDevice())) + + # Ensure OpenCV can access the GPU. + print(cv2.getBuildInformation()) + + a = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1) + b = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1) + c = int(cv2.cuda.sum(cv2.cuda.add(a, b))[0]) # OpenCV returns a Scalar float object. + + assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} OpenCV, got {c}" + + ''; + + torchBlock = '' + + import torch + print("Torch version:", torch.__version__) + + # Set up the GPU. + torch.cuda.init() + # Ensure the GPU is available. + assert torch.cuda.is_available(), "CUDA is not available to Torch" + print("Torch CUDA device:", torch.cuda.get_device_properties(torch.cuda.current_device())) + + a = torch.ones(256, 256, dtype=torch.int32).cuda() + b = torch.ones(256, 256, dtype=torch.int32).cuda() + c = (a + b).sum().item() + assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} for Torch, got {c}" + + ''; + + content = if openCVFirst then openCVBlock + torchBlock else torchBlock + openCVBlock; + + torchName = "torch" + optionalString useTorchDefaultCuda "-with-default-cuda"; + openCVName = "opencv4" + optionalString useOpenCVDefaultCuda "-with-default-cuda"; +in +# TODO: Ensure the expected CUDA libraries are loaded. +# TODO: Ensure GPU access works as expected. +writeGpuTestPython { + name = if openCVFirst then "${openCVName}-then-${torchName}" else "${torchName}-then-${openCVName}"; + libraries = + # NOTE: These are purposefully in this order. + pythonPackages: + let + effectiveOpenCV = pythonPackages.opencv4.override (prevAttrs: { + cudaPackages = if useOpenCVDefaultCuda then prevAttrs.cudaPackages else cudaPackages; + }); + effectiveTorch = pythonPackages.torchWithCuda.override (prevAttrs: { + cudaPackages = if useTorchDefaultCuda then prevAttrs.cudaPackages else cudaPackages; + }); + in + if openCVFirst then + [ + effectiveOpenCV + effectiveTorch + ] + else + [ + effectiveTorch + effectiveOpenCV + ]; +} content diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix index 6c0a2885b4..d1be96454e 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { "-w" "-X github.com/arduino/arduino-language-server/version.versionString=${version}" "-X github.com/arduino/arduino-language-server/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix b/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix index ba1f42a90b..b6add8db9b 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ argtable libserialport - ] ++ lib.optional stdenv.isDarwin IOKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; cmakeFlags = [ "-DBLISP_BUILD_CLI=ON" "-DBLISP_USE_SYSTEM_LIBRARIES=ON" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix b/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix index 3f55ccdd2e..f50b91ddbb 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { wxGTK32 libX11 readline - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix index 28f06db9f3..4e9b8f1722 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 -t $out/bin easypdkprog - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules ''; diff --git a/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix b/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix index 570fda02d8..77ac437624 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix @@ -57,6 +57,6 @@ python3Packages.buildPythonPackage { xddxdd ]; # Case-sensitive files in 'Loader' submodule - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/embedded/elf2uf2-rs/default.nix b/third_party/nixpkgs/pkgs/development/embedded/elf2uf2-rs/default.nix index b3091df1e3..239ffbbeb9 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.isLinux udev - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation DiskArbitration Foundation diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/ecpdap/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/ecpdap/default.nix index ef1ba75c45..6d43f10756 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; postInstall = '' mkdir -p $out/etc/udev/rules.d diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/fujprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/fujprog/default.nix index 69c23f2a71..bdac103305 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/fujprog/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/fujprog/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb-compat-0_1 - ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; meta = with lib; { description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix index b652f57fa8..5726465311 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { cd libtrellis ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/bin/* ; do install_name_tool -change "$out/lib/libtrellis.dylib" "$out/lib/trellis/libtrellis.dylib" "$f" done diff --git a/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix b/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix index 366d1ed832..86dfd687ed 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optionals notWindows [ hidapi jimtcl libftdi1 libjaylink ] ++ # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ - lib.optional stdenv.isLinux libgpiod_1; + lib.optional stdenv.hostPlatform.isLinux libgpiod_1; configureFlags = [ "--disable-werror" @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" (lib.enableFeature notWindows "buspirate") (lib.enableFeature (notWindows && enableFtdi) "ftdi") - (lib.enableFeature stdenv.isLinux "linuxgpiod") - (lib.enableFeature stdenv.isLinux "sysfsgpio") + (lib.enableFeature stdenv.hostPlatform.isLinux "linuxgpiod") + (lib.enableFeature stdenv.hostPlatform.isLinux "sysfsgpio") (lib.enableFeature isWindows "internal-jimtcl") (lib.enableFeature isWindows "internal-libjaylink") ] ++ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0 ]); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p "$out/etc/udev/rules.d" rules="$out/share/openocd/contrib/60-openocd.rules" if [ ! -f "$rules" ]; then diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix index 6890a2b1b3..eb20e0f6a3 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix @@ -79,7 +79,7 @@ with python3Packages; buildPythonApplication rec { uvicorn wsproto zeroconf - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ chardet ]; diff --git a/third_party/nixpkgs/pkgs/development/emilua-plugins/botan/default.nix b/third_party/nixpkgs/pkgs/development/emilua-plugins/botan/default.nix new file mode 100644 index 0000000000..895e400281 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/emilua-plugins/botan/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + botan3, +}: + +stdenv.mkDerivation rec { + pname = "emilua-botan"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "botan"; + rev = "v${version}"; + hash = "sha256-5/vcm6vNucBhl1Aki+OFNjAU7Hvc7OLAAH4CYchlBIY="; + }; + + buildInputs = [ + emilua + liburing + fmt + botan3 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Securely clears secrets from memory in Emilua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/emilua-plugins/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/emilua-plugins/secp256k1/default.nix new file mode 100644 index 0000000000..6b83ed573d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/emilua-plugins/secp256k1/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + secp256k1, +}: + +stdenv.mkDerivation rec { + pname = "emilua-secp256k1"; + version = "0.5.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "secp256k1"; + rev = "v${version}"; + hash = "sha256-xbyDKxuU03U0k4YSD7Sahw2Z4ZSpQHwrpWcSN0F5CCw="; + }; + + buildInputs = [ + emilua + liburing + fmt + secp256k1 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Emilua bindings to libsecp256k1"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix index 66a6e82fff..a86fce043d 100644 --- a/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { platforms = platforms.unix; # rpcserver_aggregator.h:111:54: error: no template named 'unary_function' # in namespace 'std'; did you mean '__unary_function'? - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ mog ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix index dbf7513cac..663ffafd7f 100644 --- a/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -71,7 +71,7 @@ in mkDerivation { ] ++ lib.optionals (gnuradio.hasFeature "python-support") [ python.pkgs.numpy python.pkgs.pybind11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix index ff31b009da..3b6aa220ae 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Bindings to Libgcrypt for GNU Guile"; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix index b91d13a637..f092238929 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix index 1e5ddbd491..5143c959cc 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix index a1928c78ce..ad3a8c5474 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; # FAIL: server-client.scm - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' mv $out/bin/*.scm $out/share/guile-ssh diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 23139af6fd..e1d70248ac 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -12,8 +12,8 @@ { pkgs, haskellLib }: let - inherit (pkgs) fetchpatch fetchpatch2 lib; - inherit (lib) throwIfNot versionOlder versions; + inherit (pkgs) fetchpatch lib; + inherit (lib) throwIfNot versionOlder; in with haskellLib; @@ -387,7 +387,7 @@ self: super: { numerals-base = dontCheck (doJailbreak super.numerals-base); # This test keeps being aborted because it runs too quietly for too long - Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; + Lazy-Pbkdf2 = if pkgs.stdenv.hostPlatform.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; # check requires mysql server mysql-simple = dontCheck super.mysql-simple; @@ -901,12 +901,12 @@ self: super: { Cabal-ide-backend = dontCheck super.Cabal-ide-backend; # This package can't be built on non-Windows systems. - Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.isCygwin; }) super.Win32; + Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.hostPlatform.isCygwin; }) super.Win32; inline-c-win32 = dontDistribute super.inline-c-win32; Southpaw = dontDistribute super.Southpaw; # https://ghc.haskell.org/trac/ghc/ticket/9825 - vimus = overrideCabal (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }) super.vimus; + vimus = overrideCabal (drv: { broken = pkgs.stdenv.hostPlatform.isLinux && pkgs.stdenv.hostPlatform.isi686; }) super.vimus; # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; @@ -2649,7 +2649,7 @@ self: super: { purescript = lib.pipe (super.purescript.overrideScope purescriptOverlay) - ([ + [ # https://github.com/purescript/purescript/pull/4547 (appendPatches [ (pkgs.fetchpatch { @@ -2668,7 +2668,7 @@ self: super: { doJailbreak # Generate shell completions (self.generateOptparseApplicativeCompletions [ "purs" ]) - ]); + ]; purenix = lib.pipe diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 5933627583..0c5b910664 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -359,7 +359,7 @@ self: super: ({ ''; }) super.di-core; -} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # aarch64-darwin # Workarounds for justStaticExecutables on aarch64-darwin. Since dead code # elimination barely works on aarch64-darwin, any package that has a @@ -429,7 +429,7 @@ self: super: ({ rivet-adaptor-postgresql = dontCheck super.rivet-adaptor-postgresql; tmp-proc-postgres = dontCheck super.tmp-proc-postgres; -} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: # https://hydra.nixos.org/build/174540882/nixlog/9 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 8477d68dfa..6400e5246a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -300,7 +300,7 @@ self: super: builtins.intersectAttrs super { [ (disableHardening ["fortify"]) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) ] ++ - ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) + ( if pkgs.stdenv.hostPlatform.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) ); gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2; gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager; @@ -585,7 +585,7 @@ self: super: builtins.intersectAttrs super { # # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, # so disable this on Darwin only - ${if pkgs.stdenv.isDarwin then null else "GLUT"} = overrideCabal (drv: { + ${if pkgs.stdenv.hostPlatform.isDarwin then null else "GLUT"} = overrideCabal (drv: { pkg-configDepends = drv.pkg-configDepends or [] ++ [ pkgs.freeglut ]; @@ -823,9 +823,9 @@ self: super: builtins.intersectAttrs super { # https://git-annex.branchable.com/git-annex-shell/ passthru.shellPath = "/bin/git-annex-shell"; }) (super.git-annex.override { - dbus = if pkgs.stdenv.isLinux then self.dbus else null; - fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; - hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; + dbus = if pkgs.stdenv.hostPlatform.isLinux then self.dbus else null; + fdo-notify = if pkgs.stdenv.hostPlatform.isLinux then self.fdo-notify else null; + hinotify = if pkgs.stdenv.hostPlatform.isLinux then self.hinotify else self.fsnotify; }); # The test suite has undeclared dependencies on git. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index 23dc5054a8..92c2451a5d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -53,7 +53,7 @@ in # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) -, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin +, enableDeadCodeElimination ? (!stdenv.hostPlatform.isDarwin) # TODO: use -dead_strip for darwin # Disabling this for ghcjs prevents this crash: https://gitlab.haskell.org/ghc/ghc/-/issues/23235 , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isWasm || stdenv.hostPlatform.isGhcjs) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows @@ -242,8 +242,8 @@ let "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") - (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") + (optionalString (enableSharedExecutables && stdenv.hostPlatform.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.hostPlatform.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding (makeGhcOptions [ "-j$NIX_BUILD_CORES" "+RTS" "-A64M" "-RTS" ])) (optionalString useCpphs ("--with-cpphs=${cpphs}/bin/cpphs " + (makeGhcOptions [ "-cpp" "-pgmP${cpphs}/bin/cpphs" "-optP--cpp" ]))) (enableFeature enableLibraryProfiling "library-profiling") @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ # the `$out/lib/links` directory to read-only when the build is done after the # dist directory has already been exported, which triggers an unnecessary # rebuild of modules included in the exported dist directory. - + (optionalString (stdenv.isDarwin && (enableSharedLibraries || enableSharedExecutables) && !enableSeparateIntermediatesOutput) '' + + (optionalString (stdenv.hostPlatform.isDarwin && (enableSharedLibraries || enableSharedExecutables) && !enableSeparateIntermediatesOutput) '' # Work around a limit in the macOS Sierra linker on the number of paths # referenced by any one dynamic library: # diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix index 17d22a14ca..1cdf636991 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -69,7 +69,7 @@ resholve.mkDerivation rec { external = [ "greadlink" "shlock" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "pkill" # procps doesn't supply this on darwin ]; }; @@ -119,7 +119,7 @@ resholve.mkDerivation rec { "cannot:libexec/bats-core/bats-exec-file" "cannot:libexec/bats-core/bats-exec-suite" "cannot:libexec/bats-core/bats-gather-tests" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # checked invocations for exec "cannot:${procps}/bin/pkill" ]; @@ -196,7 +196,7 @@ resholve.mkDerivation rec { parallel # skips some tests if it can't detect flock # skips some tests if it can't detect procps - ] ++ lib.optionals stdenv.isDarwin [ lsof ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lsof ]; inherit doInstallCheck; installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows @@ -225,7 +225,7 @@ resholve.mkDerivation rec { # aren't massive builds) inherit bash-preexec locate-dominating-file packcc; resholve = resholve.tests.cli; - } // lib.optionalAttrs (!stdenv.isDarwin) { + } // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # TODO: kikit's kicad dependency is marked broken on darwin atm # may be able to fold this up if that resolves. inherit kikit; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bic/default.nix index 669cb4f723..1571e93e07 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bic/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bic/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ hexagonal-sun ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix index b220ed8340..9cdd21a6b9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { fixupPhase = '' wrapProgram "$out/bin/chibi-scheme" \ --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" \ - ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"} + ${lib.optionalString stdenv.hostPlatform.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"} for f in chibi-doc chibi-ffi snow-chibi; do substituteInPlace "$out/bin/$f" \ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix index f1cbd213b8..86e43de594 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix @@ -26,7 +26,7 @@ # Build with libc++ (LLVM) rather than stdlibc++ (GCC). # This is experimental and not all features work. -, useLLVMLibcxx ? clangStdenv.isDarwin +, useLLVMLibcxx ? clangStdenv.hostPlatform.isDarwin }: let @@ -97,7 +97,7 @@ let CPPFLAGS = if useLLVMLibcxx then [ "-stdlib=libc++" ] else []; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/share/Jupyter cp -r /build/clang/tools/cling/tools/Jupyter/kernel $out/share/Jupyter ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix index f6218ef8f3..c0f0e2c5c2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix @@ -33,7 +33,7 @@ "pcre" "rawsock" ] - ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "bindings/glibc" "zlib" ] ++ lib.optional x11Support "clx/new-clx" }: @@ -41,7 +41,7 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); let - ffcallAvailable = stdenv.isLinux && (libffcall != null); + ffcallAvailable = stdenv.hostPlatform.isLinux && (libffcall != null); # Some modules need autoreconf called in their directory. shouldReconfModule = name: name != "asdf"; in @@ -85,7 +85,7 @@ stdenv.mkDerivation { find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; - preConfigure = lib.optionalString stdenv.isDarwin ('' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ('' ( cd src autoreconf -f -i -I m4 -I glm4 @@ -121,7 +121,7 @@ stdenv.mkDerivation { (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + lib.concatMapStrings (x: " " + x) withModules); - env.NIX_CFLAGS_COMPILE = "-O0 -falign-functions=${if stdenv.is64bit then "8" else "4"}"; + env.NIX_CFLAGS_COMPILE = "-O0 -falign-functions=${if stdenv.hostPlatform.is64bit then "8" else "4"}"; meta = { description = "ANSI Common Lisp Implementation"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cyber/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cyber/default.nix index 2ef863de5d..19d266da0e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/cyber/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/cyber/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ figsoda ]; inherit (zig_0_11.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix index 643ee3a632..75a4b763ae 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix @@ -15,7 +15,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ libck ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ bootstrap ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ libck ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix index 75e49ed602..a607fb0fef 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; inherit (jdk.meta) platforms; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin }; } # TODO: Processing app diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index b5502a0362..38af8a6e09 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -74,7 +74,7 @@ , meta ? { } }: -assert wxSupport -> (if stdenv.isDarwin +assert wxSupport -> (if stdenv.hostPlatform.isDarwin then wxGTK != null else libGL != null && libGLU != null && wxGTK != null && xorg != null); @@ -84,7 +84,7 @@ assert ex_docSupport -> ex_doc != null; let inherit (lib) optional optionals optionalAttrs optionalString; - wxPackages2 = if stdenv.isDarwin then [ wxGTK ] else wxPackages; + wxPackages2 = if stdenv.hostPlatform.isDarwin then [ wxGTK ] else wxPackages; in stdenv.mkDerivation ({ @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional systemdSupport systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); + ++ optionals stdenv.hostPlatform.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; @@ -148,9 +148,9 @@ stdenv.mkDerivation ({ ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" ++ optional systemdSupport "--enable-systemd" - ++ optional stdenv.isDarwin "--enable-darwin-64bit" + ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit" # make[3]: *** [yecc.beam] Segmentation fault: 11 - ++ optional (stdenv.isDarwin && stdenv.isx86_64) "--disable-jit" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--disable-jit" ++ configureFlags; # install-docs will generate and install manpages and html docs diff --git a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 6d64e76b81..a95e45fc65 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; nativeBuildInputs = [ pkg-config makeWrapper cmake ]; - buildInputs = lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices Security ]; checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix index 7bf0ea7c75..3e35f7edc6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { homepage = "https://git.sr.ht/~ft/femtolisp"; license = with lib.licenses; [ mit bsd3 ]; maintainers = with lib.maintainers; [ moody ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = lib.platforms.unix; mainProgram = "flisp"; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gauche/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gauche/default.nix index 62903de6bb..3fb736ff7e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gauche/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gauche/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { zlib mbedtls cacert - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; autoreconfPhase = '' ./DIST gen diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix index 85e86de1d6..ee4d8482cd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-Wno-error=use-after-free" ]) ++ lib.optional stdenv.cc.isClang "-Wno-error=null-dereference"); - patchPhase = lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Free interpreter for the APL programming language"; homepage = "https://www.gnu.org/software/apl/"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix index 41f15afbee..d9acb974df 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -24,16 +24,16 @@ , libgeotiff , libjpeg # eccodes is broken on darwin -, enableGRIB ? stdenv.isLinux +, enableGRIB ? stdenv.hostPlatform.isLinux , eccodes -, enableGLPK ? stdenv.isLinux +, enableGLPK ? stdenv.hostPlatform.isLinux , glpk # We enable it in hdf4 and use libtirpc as a dependency here from the passthru # of hdf4 -, enableLibtirpc ? stdenv.isLinux +, enableLibtirpc ? stdenv.hostPlatform.isLinux , libtirpc , python3 -, enableMPI ? (stdenv.isLinux || stdenv.isDarwin) +, enableMPI ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) # Choose MPICH over OpenMPI because it currently builds on AArch and Darwin , mpi # Unfree optional dependency for hdf4 and hdf5 @@ -57,11 +57,11 @@ , plplot-forced ? null # wxWidgets is preferred over X11 for this project but we only have it on Linux # and Darwin. -, enableWX ? (stdenv.isLinux || stdenv.isDarwin) +, enableWX ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) , wxGTK32 , Cocoa # X11: OFF by default for platform consistency. Use X where WX is not available -, enableXWin ? (!stdenv.isLinux && !stdenv.isDarwin) +, enableXWin ? (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) }: let @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableGRIB eccodes ++ lib.optional enableGLPK glpk ++ lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa + ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa ++ lib.optional enableMPI mpi ++ lib.optional enableLibtirpc hdf4-custom.libtirpc ++ lib.optional enableSzip szip; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { # Tests are failing on Hydra: # ./src/common/dpycmn.cpp(137): assert ""IsOk()"" failed in GetClientArea(): invalid wxDisplay object - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; # Opt-out unstable tests # https://github.com/gnudatalanguage/gdl/issues/482 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix index 57ff880256..510834df40 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix @@ -79,7 +79,7 @@ builder rec { sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; })] ++ (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./filter-mkostemp-darwin.patch (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; @@ -92,11 +92,11 @@ builder rec { # don't have "libgcc_s.so.1" on darwin LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; + (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # @@ -159,7 +159,7 @@ builder rec { // -(lib.optionalAttrs (!stdenv.isLinux) { +(lib.optionalAttrs (!stdenv.hostPlatform.isLinux) { # Work around . SHELL = stdenv.shell; CONFIG_SHELL = stdenv.shell; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/2.2.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/2.2.nix index 9dd1020120..6c75540dae 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/guile/2.2.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/2.2.nix @@ -73,7 +73,7 @@ builder rec { # Read the header of the patch to more info ./eai_system.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -88,7 +88,7 @@ builder rec { configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix index f7797a7c8a..1eeda97b0f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix @@ -49,7 +49,7 @@ builder rec { libtool libunistring readline - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt ]; propagatedBuildInputs = [ @@ -62,7 +62,7 @@ builder rec { # flags, see below. libtool libunistring - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt ]; @@ -75,7 +75,7 @@ builder rec { patches = [ ./eai_system.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -90,7 +90,7 @@ builder rec { configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # @@ -105,7 +105,7 @@ builder rec { ] # At least on x86_64-darwin '-flto' autodetection is not correct: # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 - ++ lib.optional (stdenv.isDarwin) "--disable-lto"; + ++ lib.optional (stdenv.hostPlatform.isDarwin) "--disable-lto"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -129,7 +129,7 @@ builder rec { doInstallCheck = doCheck; # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; setupHook = ./setup-hook-3.0.sh; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix index f017e1a43c..6ecb4913db 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cp -r other/haxelib/* "${haxelibPath}" ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libhl.dylib $out/lib/libhl.dylib $out/bin/hl ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/hugs/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/hugs/default.nix index d8ee5726ef..ab48ef91b3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/hugs/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/hugs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "hugs"; homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix index e5c486ed8d..2ea8a20d4f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { let target = if withGraphics then "X-Configure" else "Configure"; platform = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macintosh" - else if stdenv.isBSD then "bsd" - else if stdenv.isCygwin then "cygwin" - else if stdenv.isSunOS then "solaris" + if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "macintosh" + else if stdenv.hostPlatform.isBSD then "bsd" + else if stdenv.hostPlatform.isCygwin then "cygwin" + else if stdenv.hostPlatform.isSunOS then "solaris" else throw "unsupported system"; in "make ${target} name=${platform}"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 34388c8c03..b171005ca2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -9,19 +9,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.35.2"; + version = "1.36.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-iqexxlBFM4ffxDsOdKMRJs/ufhKV0jvzqgZ3tH9S/k0="; + hash = "sha256-lAasSRQwqkc86jobSejLFGAiaCu+EM+2sc92Kc2KxMs="; }; postPatch = '' substituteInPlace janet.1 \ --replace /usr/local/ $out/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # error: Socket is not connected substituteInPlace meson.build \ --replace "'test/suite-ev.janet'," "" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix index d019743bfb..e11a683082 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; buildInputs = [ libedit zlib ncurses ] - ++ lib.optionals stdenv.isDarwin ([ + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ Accelerate - ] ++ lib.optionals stdenv.isx86_64 /* && isDarwin */ [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 /* && isDarwin */ [ CoreGraphics CoreVideo ]); @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "implicit-function-declaration" "gnu-variable-sized-type-not-at-end" "unused-result" - ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-fcommon" ]); patchPhase = '' substituteInPlace ./Makefile \ @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { # aarch64-linux seems hopeless, with over 2,000 warnings # generated? - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index 7f1e5ccb73..30ce00d44e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -86,7 +86,7 @@ rec { makeWrapper = makeBinaryWrapper; inherit passthruFun; - patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./5.4.darwin.patch; }; lua5_4_compat = lua5_4.override({ @@ -102,7 +102,7 @@ rec { inherit passthruFun; patches = - lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; + lib.optionals stdenv.hostPlatform.isDarwin [ ./5.2.darwin.patch ]; }; lua5_3_compat = lua5_3.override({ @@ -119,7 +119,7 @@ rec { inherit passthruFun; patches = [ ./CVE-2022-28805.patch - ] ++ lib.optional stdenv.isDarwin ./5.2.darwin.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./5.2.darwin.patch; }; lua5_2_compat = lua5_2.override({ @@ -134,7 +134,7 @@ rec { hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; makeWrapper = makeBinaryWrapper; inherit passthruFun; - patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) + patches = (lib.optional stdenv.hostPlatform.isDarwin ./5.1.darwin.patch) ++ [ ./CVE-2014-5461.patch ]; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix index 02716568ac..5f935626fe 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -2,7 +2,6 @@ { lua , lib , makeSetupHook -, findutils , runCommand }: diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix index 497307d57b..0f7b65df95 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: luaversion = lib.versions.majorMinor finalAttrs.version; - plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" - else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" - else if stdenv.isDarwin then "macosx" + plat = if (stdenv.hostPlatform.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" + else if (stdenv.hostPlatform.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" + else if stdenv.hostPlatform.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then "mingw" - else if stdenv.isFreeBSD then "freebsd" - else if stdenv.isSunOS then "solaris" + else if stdenv.hostPlatform.isFreeBSD then "freebsd" + else if stdenv.hostPlatform.isSunOS then "solaris" else if stdenv.hostPlatform.isBSD then "bsd" else if stdenv.hostPlatform.isUnix then "posix" else "generic"; @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: # abort if patching didn't work grep $out src/luaconf.h - '' + lib.optionalString (!stdenv.isDarwin && !staticOnly) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin && !staticOnly) '' # Add a target for a shared library to the Makefile. sed -e '1s/^/LUA_SO = liblua.so/' \ -e 's/ALL_T *= */&$(LUA_SO) /' \ @@ -96,10 +96,10 @@ stdenv.mkDerivation (finalAttrs: makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat compatFlags} $(${ if lib.versionAtLeast luaversion "5.2" then "SYSCFLAGS" else "MYCFLAGS"})' ) - makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) + makeFlagsArray+=(${lib.optionalString stdenv.hostPlatform.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ - TO_LIB="${if stdenv.isDarwin then "liblua.${finalAttrs.version}.dylib" + TO_LIB="${if stdenv.hostPlatform.isDarwin then "liblua.${finalAttrs.version}.dylib" else ("liblua.a" + lib.optionalString (!staticOnly) " liblua.so liblua.so.${luaversion} liblua.so.${finalAttrs.version}" )}" ) runHook postConfigure diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix index f5e25b6261..22574dd2b3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -58,7 +58,7 @@ let # TODO support also other build architectures. The ideal way would be to use # stdenv_32bit but that doesn't work due to host platform mismatch: # https://github.com/NixOS/nixpkgs/issues/212494 - buildStdenv = if buildPackages.stdenv.isx86_64 && stdenv.is32bit + buildStdenv = if buildPackages.stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.is32bit then buildPackages.pkgsi686Linux.buildPackages.stdenv else buildPackages.stdenv; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix index 4ad07f6a1e..6ccee2b8de 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix index 3d84ac9ba5..d010361a93 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cmake # required for libz-ng-sys ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; @@ -64,6 +64,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mpl20; maintainers = with maintainers; [ lammermann ]; # note: Undefined symbols for architecture x86_64 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix index f8d4e98c90..667c797cd0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; hardeningDisable = [ "stackprotector" ] ++ - lib.optionals stdenv.isi686 [ "pic" "fortify" ]; + lib.optionals stdenv.hostPlatform.isi686 [ "pic" "fortify" ]; # Fix for glibc-2.34, see # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix index 98ef61f821..df34036a94 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; # needed for select_poll_eintr test skippedTests = " -e select_poll_fd" - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback -e float_parse -e float_parse_doubleproc" - + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -e ffi_callback -e float_parse -e float_parse_doubleproc" + + lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) " -e float_parse" ; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix index 225146b33f..9bffafe4bd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix index 2022141daf..bde0104e6c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "0-unstable-2024-08-04"; + version = "0-unstable-2024-09-22"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "38c2d9ca14c992ddcd73f4067af8c6f37c550979"; - hash = "sha256-mpKGD9YP+D+1ySq+8lyRjXwptWL+uBG/p37bHDBoTJ8="; + rev = "ff7a42c275239933f6e615b2ad2e6a8d507afe7b"; + hash = "sha256-SQg7Z9Ag+UwIhrjgobAEiVEGu/GgFZKw3lquu4/4rHI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix index ed07f175b6..0408bf2431 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { }; }; in -if stdenv.isLinux then +if stdenv.hostPlatform.isLinux then buildFHSEnv { name = "nextflow"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix index 8bf1c43d12..7289591938 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -136,9 +136,9 @@ in stdenv.mkDerivation (finalAttrs: { libsForQt5.qscintilla ] ++ lib.optionals (enableJava) [ jdk - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.Cocoa @@ -153,12 +153,12 @@ in stdenv.mkDerivation (finalAttrs: { libsForQt5.qttools ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; enableParallelBuilding = true; # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lobjc"; # See https://savannah.gnu.org/bugs/?50339 F77_INTEGER_8_FLAG = lib.optionalString use64BitIdx "-fdefault-integer-8"; @@ -168,9 +168,9 @@ in stdenv.mkDerivation (finalAttrs: { "--with-lapack=lapack" (if use64BitIdx then "--enable-64" else "--disable-64") ] - ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-link-all-dependencies" ] ++ lib.optionals enableReadline [ "--enable-readline" ] - ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ] ++ lib.optionals enableQt [ "--with-qt=5" ] ; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix index 2afdcded3d..23336cb8f4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/interpreter.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (rec { # the libxcrypt port has been installed. # # Without libxcrypt, Perl will still find FreeBSD's crypt functions. - propagatedBuildInputs = lib.optional (enableCrypt && !stdenv.isFreeBSD) libxcrypt; + propagatedBuildInputs = lib.optional (enableCrypt && !stdenv.hostPlatform.isFreeBSD) libxcrypt; disallowedReferences = [ stdenv.cc ]; @@ -70,8 +70,8 @@ stdenv.mkDerivation (rec { ++ lib.optional (lib.versionOlder version "5.38.0") ./no-sys-dirs-5.31.patch ++ lib.optional (lib.versionAtLeast version "5.38.0") ./no-sys-dirs-5.38.0.patch - ++ lib.optional stdenv.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] + ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] ++ lib.optional crossCompiling ./cross.patch; # This is not done for native builds because pwd may need to come from @@ -107,7 +107,7 @@ stdenv.mkDerivation (rec { "-Dloclibpth=${libcLib}/lib" ] ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] - ++ lib.optional stdenv.isSunOS "-Dcc=gcc" + ++ lib.optional stdenv.hostPlatform.isSunOS "-Dcc=gcc" ++ lib.optional enableThreading "-Dusethreads" ++ lib.optional (!enableCrypt) "-A clear:d_crypt_r" ++ lib.optional stdenv.hostPlatform.isStatic "--all-static" @@ -116,7 +116,7 @@ stdenv.mkDerivation (rec { "-Dman1dir=${placeholder "out"}/share/man/man1" "-Dman3dir=${placeholder "out"}/share/man/man3" ] - ++ lib.optionals (stdenv.isFreeBSD && crossCompiling && enableCrypt) [ + ++ lib.optionals (stdenv.hostPlatform.isFreeBSD && crossCompiling && enableCrypt) [ # https://github.com/Perl/perl5/issues/22295 # configure cannot figure out that we have crypt automatically, but we really do "-Dd_crypt" @@ -157,7 +157,7 @@ stdenv.mkDerivation (rec { GZIP_OS_CODE = AUTO_DETECT USE_ZLIB_NG = False EOF - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + lib.optionalString (!enableThreading) '' # We need to do this because the bootstrap doesn't have a static libpthread diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix index 458804e2e5..13e10103f5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix @@ -58,7 +58,7 @@ let , zendSignalsSupport ? true , zendMaxExecutionTimersSupport ? false , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd - , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind + , valgrindSupport ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: @@ -213,7 +213,7 @@ let enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] - ++ lib.optional stdenv.isDarwin xcbuild; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = # PCRE extension @@ -285,7 +285,7 @@ let if [ -f "scripts/dev/genfiles" ]; then ./scripts/dev/genfiles fi - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace-fail "-lstdc++" "-lc++" ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix index d27efe1f2b..eaf08de7b9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=implicit-function-declaration" ]); @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Tests are currently broken on i686 see # https://hydra.nixos.org/build/24003763/nixlog/1 - doCheck = !stdenv.isi686 && !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch64; checkTarget = "test"; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index af9bbc4747..abb66b38e3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -137,14 +137,14 @@ let revert = true; hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw="; }) - ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ + ] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fix darwin build https://bugs.python.org/issue34027 ../3.7/darwin-libutil.patch - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since # ldconfig doesn't work on NixOS), and don't use @@ -188,7 +188,7 @@ let for i in Lib/plat-*/regen; do substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace Lib/multiprocessing/__init__.py \ --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")' @@ -205,7 +205,7 @@ let "--enable-unicode=ucs${toString ucsEncoding}" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-toolbox-glue" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python" @@ -240,7 +240,7 @@ let lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] ++ lib.optionals x11Support [ tcl tk libX11 ] - ++ lib.optional (stdenv.isDarwin && configd != null) configd; + ++ lib.optional (stdenv.hostPlatform.isDarwin && configd != null) configd; nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) @@ -264,7 +264,7 @@ in with passthru; stdenv.mkDerivation ({ inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags; - LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 56e0be3ea5..bb3dba534b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -70,7 +70,7 @@ , enableNoSemanticInterposition ? true # enabling LTO on 32bit arch causes downstream packages to fail when linking -, enableLTO ? stdenv.isDarwin || (stdenv.is64bit && stdenv.isLinux) +, enableLTO ? stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.is64bit && stdenv.hostPlatform.isLinux) # enable asserts to ensure the build remains reproducible , reproducibleBuild ? false @@ -95,7 +95,7 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert lib.assertMsg (enableFramework -> stdenv.isDarwin) +assert lib.assertMsg (enableFramework -> stdenv.hostPlatform.isDarwin) "Framework builds are only supported on Darwin."; assert lib.assertMsg (reproducibleBuild -> stripBytecode) @@ -152,7 +152,7 @@ let nativeBuildInputs = [ nukeReferences - ] ++ optionals (!stdenv.isDarwin) [ + ] ++ optionals (!stdenv.hostPlatform.isDarwin) [ autoconf-archive # needed for AX_CHECK_COMPILE_FLAG autoreconfHook pkg-config @@ -181,7 +181,7 @@ let ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ configd ] ++ optionals tzdataSupport [ tzdata @@ -293,9 +293,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { bash # only required for patchShebangs ] ++ buildInputs; - prePatch = optionalString stdenv.isDarwin '' + prePatch = optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"' - '' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) '' + '' + optionalString (pythonOlder "3.9" && stdenv.hostPlatform.isDarwin && x11Support) '' # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch substituteInPlace setup.py --replace-fail /Library/Frameworks /no-such-path ''; @@ -307,7 +307,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.isFreeBSD) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ # Cross compilation only supports a limited number of "known good" # configurations. If you're reading this and it's been a long time # since this diff, consider submitting this patch upstream! @@ -327,7 +327,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ./3.7/darwin-libutil.patch ] ++ optionals (pythonAtLeast "3.11") [ ./3.11/darwin-libutil.patch - ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ + ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch ] ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [ @@ -384,7 +384,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { env = { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); - LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}"; + LIBS = "${optionalString (!stdenv.hostPlatform.isDarwin) "-lcrypt"}"; NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({ "glibc" = "-lgcc_s"; "musl" = "-lgcc_eh"; @@ -414,7 +414,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { (enableFeature enableGIL "gil") ] ++ optionals enableOptimizations [ "--enable-optimizations" - ] ++ optionals (stdenv.isDarwin && configd == null) [ + ] ++ optionals (stdenv.hostPlatform.isDarwin && configd == null) [ # Make conditional on Darwin for now to avoid causing Linux rebuilds. "py_cv_module__scproxy=n/a" ] ++ optionals (sqlite != null) [ @@ -467,16 +467,16 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { for path in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace-warn $path /no-such-path done - '' + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.hostPlatform.isDarwin '' # Override the auto-detection in setup.py, which assumes a universal build - export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} + export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"} # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix. sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure '' + optionalString (pythonAtLeast "3.11") '' # Also override the auto-detection in `configure`. substituteInPlace configure \ - --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.isAarch64 then "uint128" else "x64"}' - '' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") '' + --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}' + '' + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") '' export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}" export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include" '' + optionalString stdenv.hostPlatform.isMusl '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index e70816a90e..3f8338845d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -139,7 +139,7 @@ in { hash = "sha256-3WHYjaJ0ws4s7HdmfUo9+aZSvMUOJvkJkdTdCvZrzPQ="; pythonVersion = "2.7"; - db = db.override { dbmSupport = !stdenv.isDarwin; }; + db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; inherit passthruFun; inherit (darwin) libunwind; @@ -156,7 +156,7 @@ in { hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo="; pythonVersion = "3.9"; - db = db.override { dbmSupport = !stdenv.isDarwin; }; + db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; python = __splicedPackages.pypy27; inherit passthruFun; inherit (darwin) libunwind; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index d75fea0eae..086ebfb3ed 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -307,7 +307,7 @@ let inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8"; # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index 0380c29e9e..3dcbce42cf 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -63,7 +63,7 @@ in with passthru; stdenv.mkDerivation rec { zlib ] ++ lib.optionals (lib.any (l: l == optimizationLevel) [ "0" "1" "2" "3"]) [ boehmgc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libunwind Security ]; @@ -132,9 +132,9 @@ in with passthru; stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = lib.optionalString (stdenv.isDarwin) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' mkdir -p $out/${executable}-c/pypy/bin mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable} ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index 4b47c642ec..95e392bc37 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -71,15 +71,15 @@ in with passthru; stdenv.mkDerivation { sqlite zlib stdenv.cc.cc.libgcc or null - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcl-8_5 tk-8_5 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl-8_6 tk-8_6 ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -88,7 +88,7 @@ in with passthru; stdenv.mkDerivation { echo "Moving files to $out" mv -t $out bin include lib mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' rm $out/bin/*.debug ''} @@ -101,12 +101,12 @@ in with passthru; stdenv.mkDerivation { runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/{lib,lib_pypy*} -name "*.so" \ -exec patchelf \ --replace-needed libtinfow.so.6 libncursesw.so.6 \ --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -change \ @rpath/lib${libPrefix}-c.dylib \ @@ -119,12 +119,12 @@ in with passthru; stdenv.mkDerivation { $out/bin/${libPrefix} install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ ${tcl-8_6}/lib/libtcl8.6.dylib \ $out/lib/${libPrefix}/_tkinter/*.so install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ ${tk-8_6}/lib/libtk8.6.dylib \ $out/lib/${libPrefix}/_tkinter/*.so ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 37a06f9f61..0d7e2d131a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -71,15 +71,15 @@ in with passthru; stdenv.mkDerivation { sqlite zlib stdenv.cc.cc.libgcc or null - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcl-8_5 tk-8_5 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl-8_6 tk-8_6 ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -88,7 +88,7 @@ in with passthru; stdenv.mkDerivation { echo "Moving files to $out" mv -t $out bin include lib-python lib_pypy site-packages mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mv lib/libffi.so.6* $out/lib/ rm $out/bin/*.debug ''} @@ -102,12 +102,12 @@ in with passthru; stdenv.mkDerivation { runHook postInstall ''; - preFixup = lib.optionalString (stdenv.isLinux) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' find $out/{lib,lib_pypy*} -name "*.so" \ -exec patchelf \ --replace-needed libtinfow.so.6 libncursesw.so.6 \ --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool \ -change \ @rpath/lib${executable}-c.dylib \ @@ -115,12 +115,12 @@ in with passthru; stdenv.mkDerivation { $out/bin/${executable} install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ ${tcl-8_6}/lib/libtcl8.6.dylib \ $out/lib_pypy/_tkinter/*.so install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ ${tk-8_6}/lib/libtk8.6.dylib \ $out/lib_pypy/_tkinter/*.so ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 0fb6a5d57f..427c942410 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -204,7 +204,7 @@ let inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8"; # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix index febb7f5cfa..98d3ed7c0e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # freeze the stdlib into the rustpython binary cargoBuildFlags = [ "--features=freeze-stdlib" ]; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; nativeCheckInputs = [ python3 ]; @@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec { # "_utimensat", referenced from: # rustpython_vm::function::builtin::IntoPyNativeFn::into_func::... in # rustpython-10386d81555652a7.rustpython_vm-f0b5bedfcf056d0b.rustpython_vm.7926b68e665728ca-cgu.08.rcgu.o.rcgu.o - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix index 99bc38890c..6574b62957 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -38,7 +38,7 @@ let is_nixenv = "False"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (!python.isPyPy && !stdenv.isDarwin) { + } // lib.optionalAttrs (!python.isPyPy && !stdenv.hostPlatform.isDarwin) { # Use virtualenv from a Nix env. # Fails on darwin with # virtualenv: error: argument dest: the destination . is not write-able at /nix/store @@ -106,7 +106,7 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (!python.isPyPy) ( - lib.optionalAttrs (python.isPy3k && !stdenv.isDarwin) { # darwin has no split-debug + lib.optionalAttrs (python.isPy3k && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug cpython-gdb = callPackage ./tests/test_cpython_gdb { interpreter = python; }; @@ -222,7 +222,7 @@ let } ) {}; pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); - in lib.optionalAttrs (python.isPy3k && stdenv.isLinux) + in lib.optionalAttrs (python.isPy3k && stdenv.hostPlatform.isLinux) { condaExamplePackage = runCommand "import-requests" {} '' ${pythonWithRequests.interpreter} -c "import requests" > $out diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix index 6f06b31b56..4a16416374 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -56,7 +56,7 @@ let readline sqlite ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU ] @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") ]; nativeBuildInputs = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { gtk3 ncurses ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation ]; @@ -141,15 +141,15 @@ stdenv.mkDerivation rec { cd src/build '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) ''; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic # linker environment variables like this are purged. # See: https://apple.stackexchange.com/a/212954/167199 @@ -163,14 +163,14 @@ stdenv.mkDerivation rec { export DYLD_FALLBACK_LIBRARY_PATH="${libPath}" ''; - shared = if stdenv.isDarwin then "dylib" else "shared"; + shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-strip" "--enable-xonx" ]; @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Programmable programming language"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix index 91f7654fca..c82d232e11 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") - (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") + (lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation") ]; nativeBuildInputs = [ @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation ]; @@ -110,14 +110,14 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) ''; - shared = if stdenv.isDarwin then "dylib" else "shared"; + shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; @@ -145,6 +145,6 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" ]; - broken = stdenv.isDarwin; # No support yet for setting FFI lookup path + broken = stdenv.hostPlatform.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix index e4b0da0362..5537f13041 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Configure.pl \ --replace '`/usr/bin/arch`' '"${stdenv.hostPlatform.darwinArch}"' \ --replace '/usr/bin/arch' "$(type -P true)" \ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace '`sw_vers -productVersion`' '"11.0"' ''; - buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite configureScript = "${perl}/bin/perl ./Configure.pl"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 73ff0b8851..542164aeeb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-zvFmh4Q1Q6gizxdCCoOX2hgQ7/f8ozczY7IwWqMKGSo="; + hash = "sha256-uMVfBptiCungO+XJMlwV2Fhs2jgVNDOqUFqgJPV5RhM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 596c778c0f..369d242192 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -78,7 +78,7 @@ let nativeBuildInputs = [ autoreconfHook bison removeReferencesTo ] ++ (op docSupport groff) - ++ (ops (dtraceSupport && stdenv.isLinux) [ systemtap libsystemtap ]) + ++ (ops (dtraceSupport && stdenv.hostPlatform.isLinux) [ systemtap libsystemtap ]) ++ ops yjitSupport [ rustPlatform.cargoSetupHook cargo rustc ] ++ op useBaseRuby baseRuby; buildInputs = [ autoconf ] @@ -92,8 +92,8 @@ let # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin - ++ op (!cursesSupport && stdenv.isDarwin) readline - ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ]; + ++ op (!cursesSupport && stdenv.hostPlatform.isDarwin) readline + ++ ops stdenv.hostPlatform.isDarwin [ libiconv libobjc libunwind Foundation ]; propagatedBuildInputs = op jemallocSupport jemalloc; enableParallelBuilding = true; @@ -156,7 +156,7 @@ let # overrides that by enabling `-O2` which is the minimum optimization # needed for `_FORTIFY_SOURCE`. ] ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3" ++ [ - ] ++ ops stdenv.isDarwin [ + ] ++ ops stdenv.hostPlatform.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed "--with-out-ext=tk" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix index f4dc8ef1f7..41d61aa9cc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yMqxd7PlpEEVS0jJwProaVjKUsU5TuebGTMrWiMFsM8="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/snobol4/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/snobol4/default.nix index 2d276e6a03..c0edda03dc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/snobol4/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/snobol4/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # enable all features (undocumented, based on manual review of configure script) buildInputs = [ bzip2 libffi openssl readline sqlite tcl xz zlib ] # ndbm compat library - ++ lib.optional stdenv.isLinux gdbm; + ++ lib.optional stdenv.hostPlatform.isLinux gdbm; configureFlags = lib.optional (tcl != null) "--with-tcl=${tcl}/lib/tclConfig.sh"; # INSTALL says "parallel make will fail" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix index cc1d3923fe..5feca82f6c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals (lib.versionOlder version "91") [ autoconf213 yasm # to buid icu? seems weird - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: rec { nspr readline zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc libiconv ]; @@ -213,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: rec { homepage = "https://spidermonkey.dev/"; license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. maintainers = with maintainers; [ abbradar lostnet catap ]; - broken = stdenv.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). + broken = stdenv.hostPlatform.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). platforms = platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix index 7eb0de6f68..344d007031 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib + ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib ++ lib.optional useSCEL emacs; hardeningDisable = [ "stackprotector" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index 63eafd9c3e..5df6fb28a3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -36,7 +36,7 @@ let # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" "tcl_cv_strtod_unbroken=ok" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix index de671bab57..de5f317450 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix @@ -41,7 +41,7 @@ tcl.mkTclDerivation rec { # The provided makefile leaves a wrong reference to /build/ in RPATH, # so we fix it after checking that everything is also present in $out - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' needed_libraries=$(ls .libs | grep '\.\(so\|la\)$') for lib in $needed_libraries; do if ! ls $out/lib | grep "$lib"; then diff --git a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix index f0a45495d7..4435b9c029 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Very high level, goal-directed, object-oriented, general purpose applications language"; maintainers = [ ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix index e5b9b904a0..36a484b2dd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" ]; sourceRoot = let - platform = if stdenv.isLinux then + platform = if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "unsupported platform"; in "${finalAttrs.src.name}/product-mini/platforms/${platform}"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix index 2256851c3d..64ff6306d2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix @@ -8,8 +8,8 @@ , CoreFoundation , SystemConfiguration , Security -, withLLVM ? !stdenv.isDarwin -, withSinglepass ? !(stdenv.isDarwin && stdenv.isx86_64) +, withLLVM ? !stdenv.hostPlatform.isDarwin +, withSinglepass ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) }: rustPlatform.buildRustPackage rec { @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.llvm libffi libxml2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation SystemConfiguration Security diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 8bcb83677b..dc4bfced92 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-pR6yjJf0szjB73+vqXT4d8P9WD+SIOkEOe4Wl6EgIqQ="; + hash = "sha256-3SircJsg/SFyPfIYLHiwXqkQAHXocnUyPYsMRnGaxsA="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-bZtBEmzmu63wNlGhYvN0gYKkLPxzBHZ1iO16BMPD3tE="; + cargoHash = "sha256-CvHrZYZVAY2ff3fSBDMeucOru6NkRRQPILBAC/YjfTA="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # rustfmt is brought into scope to fix the following # warning: cranelift-codegen@0.108.0: @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { install -d -m0755 $dev/include/wasmtime install -m0644 $src/crates/c-api/include/*.h $dev/include install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \ $dev/lib/libwasmtime.dylib \ $dev/lib/libwasmtime.dylib diff --git a/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix index 8a34168484..e4d86733ab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "LAStools"; @@ -19,6 +24,8 @@ stdenv.mkDerivation rec { "format" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; + nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 3b423e79ed..9e31915471 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -8,7 +8,7 @@ libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, openglSupport ? libGLSupported, libGL, - alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid, libX11, @@ -21,7 +21,7 @@ libXext, libXxf86vm, libXrandr, - waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, wayland, wayland-protocols, wayland-scanner, @@ -29,17 +29,18 @@ libdrm, mesa, libxkbcommon, - dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, dbus, - udevSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + udevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, udev, ibusSupport ? false, ibus, - libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libdecor, - pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, pipewire, # NOTE: must be built with SDL2 without pipewire support - pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + pulseaudioSupport ? + config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio, AudioUnit, Cocoa, @@ -112,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { dlopenPropagatedBuildInputs = [ ] # Propagated for #include in SDL_opengles.h. - ++ lib.optional (openglSupport && !stdenv.isDarwin) libGL + ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL # Propagated for #include and in SDL_syswm.h. ++ lib.optionals x11Support [ libX11 ]; @@ -153,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus ++ lib.optionals waylandSupport [ wayland-protocols ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit Cocoa CoreAudio @@ -169,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, # because they make the builds of downstream libs like `SDL_tff` diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix index 903364ea27..3ba1620fe8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; # Doesn't support all the flags patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang - ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix index 04af315371..0dfd60d175 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages # that require a different SDK other than the default one. ./cmake-core-foundation.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix index 62d98d77a3..5024372802 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7C/QIXYRyUyNVVE0tqmv8b5g/uWc58iBI5jzdtddQ+U="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages # that require a different SDK other than the default one. ./cmake-core-foundation.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix index 60de8957d0..eeb6c07bf1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic"; preConfigure = - lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; + lib.optionalString stdenv.hostPlatform.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; # Autogenerated headers miss interdependencies in Makefile, fail parallel build: # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329 @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { doCheck = false; postInstall = let suffix = lib.versions.majorMinor version; - in lib.optionalString stdenv.isDarwin '' + in lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libadns.so.${suffix} $out/lib/libadns.so.${suffix} ''; # darwin executables fail, but I don't want to fail the 100-500 packages depending on this lib - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = '' set -eo pipefail diff --git a/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix index 0a2f6fa8b8..c39c68cbce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix index e82c3c8dfe..eff94a276c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib curl expat openssl python3 ] ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = { homepage = "http://afflib.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix index bfa7449b04..020c2dce95 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype SDL - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (lib.strings.enableFeature stdenv.isLinux "platform") + (lib.strings.enableFeature stdenv.hostPlatform.isLinux "platform") "--enable-examples=no" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--x-includes=${lib.getDev libX11}/include" "--x-libraries=${lib.getLib libX11}/lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix index 94dd96dae0..ee337673ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { physfs texinfo zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpthreadstubs libpulseaudio diff --git a/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix index 1a6900d298..19f3b28262 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix index 9490ff1fb6..ea7c9cf8c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? true, db -, ldapSupport ? !stdenv.isCygwin, openldap +, ldapSupport ? !stdenv.hostPlatform.isCygwin, openldap , libiconv, libxcrypt , cyrus_sasl, autoreconfHook }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./fix-libxcrypt-build.patch # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. ./clang-bdb.patch - ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper autoreconfHook ]; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] - ++ lib.optional (!stdenv.isCygwin) "--with-crypto" + ++ lib.optional (!stdenv.hostPlatform.isCygwin) "--with-crypto" ++ lib.optional sslSupport "--with-openssl=${openssl.dev}" ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}" ++ lib.optional ldapSupport "--with-ldap=ldap" - ++ lib.optionals stdenv.isCygwin + ++ lib.optionals stdenv.hostPlatform.isCygwin [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3" "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optional sslSupport openssl ++ lib.optional bdbSupport db ++ lib.optional ldapSupport openldap - ++ lib.optional stdenv.isFreeBSD cyrus_sasl; + ++ lib.optional stdenv.hostPlatform.isFreeBSD cyrus_sasl; postInstall = '' for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do diff --git a/third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix index 743850c5fd..4079f62782 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ lib.optional stdenv.isDarwin xcbuild; - buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; + buildInputs = if stdenv.hostPlatform.isDarwin then [ PCSC ] else [ pcsclite ]; patches = let url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; buildFlags = - lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; + lib.optional stdenv.hostPlatform.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; meta = with lib; { description = "Sample implementation of the ARIB STD-B25 standard"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix index fc7a897f0d..77f9694e69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix @@ -1,29 +1,39 @@ -{ lib -, stdenv -, fetchFromGitLab -, cmake +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + cmake, -, arpa2cm -, doxygen -, e2fsprogs -, graphviz -, lmdb -, openssl -, pkg-config -, ragel + arpa2cm, + doxygen, + e2fsprogs, + graphviz, + libsodium, + lmdb, + openssl, + pkg-config, + ragel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arpa2common"; - version = "2.2.18"; + version = "2.6.2"; src = fetchFromGitLab { owner = "arpa2"; - repo = pname; - rev = "v${version}"; - hash = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; + repo = "arpa2common"; + rev = "v${finalAttrs.version}"; + hash = "sha256-eWfWaO6URCK2FWQ+NYAoeCONkovgsVDPSRQVCGFnW3s="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/arpa2/arpa2common/-/commit/13ea82df60b87a5367db00a8c6f3502e8ecb7298.patch"; + hash = "sha256-V9Dhr6PeArqXnuXmFuDjcirlGl7xovq7VQZsrbbMFSk="; + }) + ]; + nativeBuildInputs = [ cmake arpa2cm @@ -34,17 +44,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ e2fsprogs + libsodium lmdb openssl ragel ]; - # the project uses single argument `printf` throughout the program - hardeningDisable = [ "format" ]; - meta = { - description = - "ARPA2 ID and ACL libraries and other core data structures for ARPA2"; + changelog = "https://gitlab.com/arpa2/arpa2common/-/blob/v${finalAttrs.version}/CHANGES"; + description = "ARPA2 ID and ACL libraries and other core data structures for ARPA2"; longDescription = '' The ARPA2 Common Library package offers elementary services that can benefit many software packages. They are designed to be easy to @@ -53,8 +61,13 @@ stdenv.mkDerivation rec { liberate users. ''; homepage = "https://gitlab.com/arpa2/arpa2common"; - license = with lib.licenses; [ bsd2 cc-by-sa-40 cc0 isc ]; + license = with lib.licenses; [ + bsd2 + cc-by-sa-40 + cc0 + isc + ]; maintainers = with lib.maintainers; [ fufexan ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix index 5ea144ef9b..eb928f99e8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix @@ -29,7 +29,7 @@ , cpuSupport ? true , cudaSupport ? config.cudaSupport # OpenCL needs mesa which is broken on Darwin -, openclSupport ? !stdenv.isDarwin +, openclSupport ? !stdenv.hostPlatform.isDarwin # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by # telling Nix where to find the drivers. If you know the version of the # Nvidia driver that is installed on your system, you can do: diff --git a/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix index cb9f1eb302..44dd9e0568 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; - broken = stdenv.isDarwin && lib.versionOlder version "1.16.1"; + broken = stdenv.hostPlatform.isDarwin && lib.versionOlder version "1.16.1"; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix index dd7033b191..478e847838 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix @@ -9,10 +9,10 @@ , AudioUnit , CoreAudio , CoreServices -, lazyLoad ? !stdenv.isDarwin +, lazyLoad ? !stdenv.hostPlatform.isDarwin }: -assert lib.assertMsg (stdenv.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; +assert lib.assertMsg (stdenv.hostPlatform.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; let backendLibs = [ @@ -39,7 +39,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ speexdsp ] ++ ( - if stdenv.isDarwin then [ AudioUnit CoreAudio CoreServices ] + if stdenv.hostPlatform.isDarwin then [ AudioUnit CoreAudio CoreServices ] else backendLibs ); diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix index 94b8d1cbc3..050f475454 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # it doesn't. disallowedReferences = [ stdenv.cc.cc ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix index a08b93a9b0..500533ce82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -10,7 +10,7 @@ , portaudio , libsndfile , flac -, usePulseAudio ? config.pulseaudio or stdenv.isLinux +, usePulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix index 8391c93cc5..c9ddffbff2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "-Dtests=disabled" # Avoid heavyweight python dependencies. "-Ddocs=disabled" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dlv2dir=${placeholder "out"}/lib/lv2" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix index 350adc8a45..099c3ca427 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix @@ -18,7 +18,7 @@ gtk3, withQt5 ? true, qt5, - withX11 ? !stdenv.isDarwin, + withX11 ? !stdenv.hostPlatform.isDarwin, }: let diff --git a/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix index f9974e2ca2..3a65f2535b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { version = "0.3.6"; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix index 95f82d8def..3e9be1f5fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { expat libiconv libevent - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ libpcap ] ++ lib.optionals gtk3Support [ gtk3 @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=no" ] ++ lib.optionals withLibdnssdCompat [ "--enable-compat-libdns_sd" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # autoipd won't build on darwin "--disable-autoipd" ]; @@ -183,7 +183,7 @@ stdenv.mkDerivation rec { "sysconfdir=${placeholder "out"}/etc" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '20 i\ #define __APPLE_USE_RFC_2292' \ avahi-core/socket.c diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix index a62d0449b3..53f1d4430c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.3"; + version = "1.12.0"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-chfKrPt9XzRhF2ZHOmbC4nm8e/rxuimMfwSzsvulc2U="; + sha256 = "sha256-dDM9QxB5w113DO9plstN4EBY0Z6BvQuaNjvP04V1A38="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 631c5a90fa..6e549526a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp # TestRandomURLMultiThreaded fails rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' # EPSILON is exceeded rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp ''; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl zlib - ] ++ lib.optionals (stdenv.isDarwin && + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/azmq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/azmq/default.nix index 7317c51aab..83bbd9f98f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/azmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/azmq/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; # Broken for some reason on this platform. - doCheck = !(stdenv.isAarch64 && stdenv.isLinux); + doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); meta = with lib; { homepage = "https://github.com/zeromq/azmq"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix index d486698454..4351e0ac72 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { cmakeFlags = optional enablePadding "-DARRAY_LENGTH_PADDING=ON" ++ optional enableSerialization "-DENABLE_SERIALISATION=ON" - ++ optional stdenv.is64bit "-DBZ_FULLY64BIT=ON"; + ++ optional stdenv.hostPlatform.is64bit "-DBZ_FULLY64BIT=ON"; # FIXME ++ optional doCheck "-DBUILD_TESTING=ON"; # skip broken library name detection - ax_boost_user_serialization_lib = lib.optionalString stdenv.isDarwin "boost_serialization"; + ax_boost_user_serialization_lib = lib.optionalString stdenv.hostPlatform.isDarwin "boost_serialization"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix index 2bf2e2c614..50d080b9bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation ( finalAttrs: { # ensure we have the right install id set. Otherwise the library # wouldn't be found during install. The alternative would be to work - # lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib"; + # lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib"; # into the setup.sh - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libblst.dylib $out/lib/libblst.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix index 4362bdcb6d..9c6fb3e672 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -52,7 +52,7 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared); + needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.hostPlatform.isDarwin && enableShared); b2Args = lib.concatStringsSep " " ([ "--includedir=$dev/include" @@ -107,7 +107,7 @@ stdenv.mkDerivation { patchFlags = []; patches = patches - ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-no-system-python.patch ++ [ ./cmake-paths-173.patch ] ++ lib.optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; @@ -177,7 +177,7 @@ stdenv.mkDerivation { # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, # otherwise the dynamic linker is unable to resolve the reference to @rpath # when the boost libraries want to load each other at runtime. - + lib.optionalString (stdenv.isDarwin && enableShared) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && enableShared) '' cat << EOF >> user-config.jam using clang-darwin : : ${stdenv.cc.targetPrefix}c++ : "-rpath $out/lib/" @@ -214,7 +214,7 @@ stdenv.mkDerivation { ''; env = { - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; # copyPkgconfigItems will substitute these in the pkg-config file includedir = "${placeholder "dev"}/include"; libdir = "${placeholder "out"}/lib"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 9bb0967bd5..01c3884c42 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -41,7 +41,7 @@ buildGoModule { ''; # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux. - cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; + cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; installPhase = '' mkdir -p $bin/bin $dev $out/lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix index 81c38c2d98..976144b1b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix @@ -50,7 +50,7 @@ let bzip2 zlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreServices diff --git a/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix index a445a0c533..acc2d96caf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr xorgproto libXi - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa Kernel OpenGL ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/brunsli/default.nix b/third_party/nixpkgs/pkgs/development/libraries/brunsli/default.nix index 03c9b02f7f..e9d379a74d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/brunsli/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/brunsli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postPatch = '' rm -r third_party - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' rm -r build ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix index 5ba9186dca..4a161423c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bullet/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ]; postPatch = '' substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \ --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" diff --git a/third_party/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix b/third_party/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix index c5f6f3a436..bcc963f5b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" @@ -53,6 +53,6 @@ stdenv.mkDerivation { platforms = platforms.unix; # /tmp/nix-build-bullet-2019-03-27.drv-0/source/src/Bullet3Common/b3Vector3.h:297:7: error: argument value 10880 is outside the valid range [0, 255] [-Wargument-outside-range] # y = b3_splat_ps(y, 0x80); - broken = (stdenv.isDarwin && stdenv.isx86_64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index 854032d561..9180457a31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix index 28809ade8a..4368965d4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3 , docbook_xsl, fontconfig, freetype, libpng, pixman, zlib -, x11Support? !stdenv.isDarwin || true, libXext, libXrender +, x11Support? !stdenv.hostPlatform.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb , darwin @@ -34,7 +34,7 @@ in { buildInputs = [ docbook_xsl - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText ApplicationServices @@ -87,7 +87,7 @@ in { # `-I' flags to be propagated. sed -i "$out/lib/pkgconfig/cairo.pc" \ -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; + '' + lib.optionalString stdenv.hostPlatform.isDarwin glib.flattenInclude; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix b/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix index 83428f0fef..cd561d0091 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost # for tests fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; # Tests fail on Darwin, possibly because of sandboxing. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C++ bindings for the Cairo vector graphics library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix index 957cfa26ac..382770e144 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost # for tests fontconfig - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "-Dbuild-tests=true" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C++ bindings for the Cairo vector graphics library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/capstone/4.nix b/third_party/nixpkgs/pkgs/development/libraries/capstone/4.nix index dd31e9feaf..836bb47568 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/capstone/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/capstone/4.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix index b78b007bc5..1aed26cec8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix index 3824cf046b..ca0d22ff00 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cudart @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc"; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isLinux "-fuse-ld=lld"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isLinux "-fuse-ld=lld"; NIX_LDFLAGS = "-lc -lm"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix index 5985ec519a..c7d2296d96 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCATCH_DEVELOPMENT_BUILD=ON" "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}" - ] ++ lib.optionals (stdenv.isDarwin && doCheck) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [ # test has a faulty path normalization technique that won't work in # our darwin build environment https://github.com/catchorg/Catch2/issues/1691 "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; - env = lib.optionalAttrs stdenv.isx86_32 { + env = lib.optionalAttrs stdenv.hostPlatform.isx86_32 { # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 NIX_CFLAGS_COMPILE = "-msse2 -mfpmath=sse"; } // lib.optionalAttrs (stdenv.hostPlatform.isRiscV || stdenv.hostPlatform.isAarch32) { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix index 238821b6af..8b37633acf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # Tests are broken on Darwin (linking issue) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Detection of CCTag markers made up of concentric circles"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cctz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cctz/default.nix index c0f8a58a18..4ad0bf6b80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cctz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cctz/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Foundation; installTargets = [ "install_hdrs" ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix index 3de126d111..3c63b23d1c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] # we don't want to appear to be a catalyst build; # we are a TARGET_OS_MAC - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_MACCATALYST=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_MACCATALYST=0"; meta = with lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix index af52aabca7..e92ddafc43 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { freetype boost expat - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Foundation libiconv diff --git a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix index 14b4e54926..10030f5653 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Unit testing framework for C"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix index 934a4b04a9..e264693cea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix b/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix index bbe342d981..0442c7d212 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite"; meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix index 824449b0fa..5843c1b1fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fftw fftwFloat boost ] - ++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ] - ++ lib.optionals stdenv.isDarwin [ OpenCL ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ opencl-clhpp ocl-icd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; # https://github.com/clMathLibraries/clFFT/issues/237 CXXFLAGS = "-std=c++98"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix index d6049d2845..6fc4ac2896 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # required for darwin and linux-musl ./pthread-include.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./fix-darwin.patch # see https://bugs.gentoo.org/869170 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; # see https://github.com/macports/macports-ports/commit/236d43f2450c6be52dc42fd3a2bbabbaa5136201 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/shared/CMakeLists.txt --replace 'fstati64;_fstati64;fstat64;fstat;_fstat' 'fstat;_fstat' substituteInPlace src/shared/CMakeLists.txt --replace 'stati64;_stati64;stat64;stat;_stat' 'stat;_stat' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix index d6720eb181..bb7ddf0895 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { atk json-glib gobject-introspection - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libGL libGLU @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" # needed by muffin AFAIK - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--without-x" "--enable-x11-backend=no" "--enable-quartz-backend=yes" diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix index a118ecf1ad..83407c6438 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = let - lib_path = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + lib_path = if stdenv.hostPlatform.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' export ${lib_path}=$(readlink -f ./src) ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix index 20782c8499..81224c0fda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withBlas [ blas - ] ++ lib.optionals (withBlas && stdenv.isDarwin) [ + ] ++ lib.optionals (withBlas && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.CoreVideo diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmrt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmrt/default.nix index 87c692b42c..2e3fc7a3a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://01.org/linuxmedia"; description = "Intel C for Media Runtime"; longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix index b233113e95..db34dc1669 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # Force linking against libGL. # Otherwise, it tries to load it from the runtime library path. "LIBS=-lGL" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-glx" "--without-x" ] ++ lib.optionals gstreamerSupport [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { glib gdk-pixbuf gobject-introspection - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland mesa libGL @@ -82,10 +82,10 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; env = { - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.hostPlatform.isDarwin && pangoSupport) [ "-I${pango.dev}/include/pango-1.0" "-I${cairo.dev}/include/cairo" "-I${harfbuzz.dev}/include/harfbuzz" diff --git a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 3261a848e3..a0d1ae07d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { boost libGL libGLU - ] ++ lib.optional stdenv.isLinux libX11; + ] ++ lib.optional stdenv.hostPlatform.isLinux libX11; cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index d2fbecf8e6..1d838b0ba2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ cppunit ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ) ''; # tests fail on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://github.com/Martchus/cpp-utilities"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix index 2ccb298830..bc69141bb9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hash = "sha256-cAw5YMplCx6vAhfWmskZuBHyB1o4dGd7hMceOG3V51Y="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Fixes build failure on Darwin due to missing byte order functions. # https://github.com/cracklib/cracklib/pull/96 (fetchpatch2 { diff --git a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix index 3b27601bcb..07da71e326 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc"; cmakeFlags = [ "-DCRC32C_INSTALL=1" diff --git a/third_party/nixpkgs/pkgs/development/libraries/crocoddyl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crocoddyl/default.nix deleted file mode 100644 index 046a6a014d..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/crocoddyl/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, example-robot-data -, pinocchio -, pythonSupport ? false -, python3Packages -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "crocoddyl"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "loco-3d"; - repo = "crocoddyl"; - rev = "v${finalAttrs.version}"; - hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - ]; - - propagatedBuildInputs = lib.optionals (!pythonSupport) [ - example-robot-data - pinocchio - ] ++ lib.optionals pythonSupport [ - python3Packages.example-robot-data - python3Packages.pinocchio - ]; - - cmakeFlags = lib.optionals (!pythonSupport) [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_PYTHON_INTERFACE=OFF" - ]; - - prePatch = '' - substituteInPlace \ - examples/CMakeLists.txt \ - examples/log/check_logfiles.sh \ - --replace /bin/bash ${stdenv.shell} - ''; - - doCheck = true; - pythonImportsCheck = [ - "crocoddyl" - ]; - checkInputs = lib.optionals pythonSupport [ - python3Packages.scipy - ]; - - meta = with lib; { - description = "Crocoddyl optimal control library"; - homepage = "https://github.com/loco-3d/crocoddyl"; - license = licenses.bsd3; - maintainers = with maintainers; [ nim65s wegank ]; - platforms = platforms.unix; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix index c4c015d924..cd8f95957c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isLinux libuuid; + buildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index 4668404f97..b126cff5b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "-DWITH_RUY=${cmakeBool withRuy}" "-DWITH_MKL=${cmakeBool withMkl}" ] - ++ lib.optional stdenv.isDarwin "-DWITH_ACCELERATE=ON"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DWITH_ACCELERATE=ON"; buildInputs = lib.optionals withMkl [ mkl @@ -67,10 +67,10 @@ stdenv.mkDerivation rec { oneDNN ] ++ lib.optionals withOpenblas [ openblas - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp darwin.apple_sdk.frameworks.Accelerate - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.CoreVideo ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index 0b151bfc71..60a0d8569a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db gettext libkrb5 libxcrypt ] ++ lib.optional enableLdap openldap - ++ lib.optional stdenv.isLinux pam; + ++ lib.optional stdenv.hostPlatform.isLinux pam; configureFlags = [ "--with-openssl=${openssl.dev}" @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "CFLAGS=-DTIME_WITH_SYS_TIME" ]; - installFlags = lib.optionals stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; + installFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; passthru.tests = { inherit (nixosTests) parsedmarc postfix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix index d715c1ffc8..936aed633a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (rec { (if compat185 then "--enable-compat185" else "--disable-compat185") ] ++ lib.optional dbmSupport "--enable-dbm" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix index cb5fe9e4fb..017c83c5b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -13,7 +13,7 @@ , xmlto , autoreconfHook , autoconf-archive -, x11Support ? (stdenv.isLinux || stdenv.isDarwin) +, x11Support ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) , xorg }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; }; - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = lib.optional stdenv.hostPlatform.isSunOS ./implement-getgrouplist.patch; postPatch = '' substituteInPlace bus/Makefile.am \ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { libICE libSM ]) ++ lib.optional enableSystemd systemdMinimal - ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ audit libapparmor ]; # ToDo: optional selinux? __darwinAllowLocalNetworking = true; @@ -84,10 +84,10 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-apparmor" "--enable-libaudit" ] ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ]; - NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-Wl,--as-needed"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix index ac2664a1c9..34340a406a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patchPhase = '' substituteInPlace Makefile \ --replace "gcc" "cc" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix index 0dddcb5d64..1aad769c6d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { dbus # for dbus-daemon ]; - doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; postPatch = '' chmod +x meson_post_install.py tests/test-dconf.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix index f0c60e9506..05837c823c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ rapidjson - ] ++ lib.optional stdenv.isDarwin AppKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" diff --git a/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix index 212b854c1e..857bb48c11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (! enableStatic) "-DBUILD_SHARED_LIBS=ON"; # Case sensitivity issue - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' rm BUILD ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix index c222b117ff..ea7b2535f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -98,12 +98,12 @@ stdenv.mkDerivation (finalAttrs: { # wants http connection "test/sql/copy/csv/recursive_query_csv.test" "test/sql/copy/csv/test_mixed_lines.test" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" "test/sql/aggregate/aggregates/test_skewness.test" "test/sql/function/list/aggregates/skewness.test" ]); - LD_LIBRARY_PATH = lib.optionalString stdenv.isDarwin "DY" + "LD_LIBRARY_PATH"; + LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; in '' runHook preInstallCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix index 0923d2b450..a3b891253b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; env.NIX_CFLAGS_COMPILE = "-std=c++14" + - lib.optionalString stdenv.isLinux " -pthread"; + lib.optionalString stdenv.hostPlatform.isLinux " -pthread"; postInstall = '' mkdir -p $out/include cp ../src/easylogging++.cc $out/include diff --git a/third_party/nixpkgs/pkgs/development/libraries/edencommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/edencommon/default.nix index fa10344826..ce26bc6f71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/edencommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/edencommon/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg="; }; - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Test discovery timeout is bizarrely flaky on `x86_64-darwin` ./increase-test-discovery-timeout.patch ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index b53be3ae7c..f45ea3dc7d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] - ++ lib.optionals stdenv.isDarwin [ glib ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ]; meta = with lib; { description = "High performance ray tracing kernels from Intel"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 69cab2ca5b..dbd7cefacb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -14,12 +14,12 @@ , withAspell ? true , withHunspell ? true , withNuspell ? true -, withAppleSpell ? stdenv.isDarwin +, withAppleSpell ? stdenv.hostPlatform.isDarwin , Cocoa }: -assert withAppleSpell -> stdenv.isDarwin; +assert withAppleSpell -> stdenv.hostPlatform.isDarwin; stdenv.mkDerivation rec { pname = "enchant"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix index 96d8d1db7a..ccdd0048e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ expat zlib boost ] - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; - doCheck = stdenv.isLinux && stdenv.is64bit; + doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit; dontDisableStatic = doCheck; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 1591b80215..56edbdab5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { removeReferencesTo ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # Fix tests on arm # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib export LC_ALL=C diff --git a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix index bb97ca8728..50ae45f38e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool diff --git a/third_party/nixpkgs/pkgs/development/libraries/fb303/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fb303/default.nix index 059e666027..659497d690 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fb303/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fb303/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DPYTHON_EXTENSIONS=OFF" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix index 5ac08f2c6c..04bce085c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.isDarwin then "OFF" else "ON"}" - ] ++ lib.optionals stdenv.isDarwin [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isDarwin then "OFF" else "ON"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 65c29f9319..1d8c87ba45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 4e8226c190..dc47194465 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -33,14 +33,14 @@ , fetchpatch2 # Feature flags -, withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT +, withAlsa ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Alsa in/output supporT , withAmf ? lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding , withAom ? withHeadlessDeps # AV1 reference encoder -, withAppKit ? withHeadlessDeps && stdenv.isDarwin # Apple AppKit framework +, withAppKit ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AppKit framework , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering -, withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox -, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework +, withAudioToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AudioToolbox +, withAvFoundation ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AVFoundation framework , withAvisynth ? withFullDeps # AviSynth script files reading , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library @@ -49,12 +49,12 @@ , withCelt ? withHeadlessDeps # CELT decoder , withChromaprint ? withFullDeps # Audio fingerprinting , withCodec2 ? withFullDeps # codec2 en/decoding -, withCoreImage ? withHeadlessDeps && stdenv.isDarwin # Apple CoreImage framework +, withCoreImage ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple CoreImage framework , withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps , withCuvid ? withHeadlessDeps && withNvcodec , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) -, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) +, withDc1394 ? withFullDeps && !stdenv.hostPlatform.isDarwin # IIDC-1394 grabbing (ieee 1394) , withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support , withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing , withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing @@ -71,14 +71,14 @@ , withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter , withIconv ? withHeadlessDeps , withIlbc ? withFullDeps # iLBC de/encoding -, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio +, withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin # Jack audio , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding , withLadspa ? withFullDeps # LADSPA audio filtering , withLcms2 ? withFullDeps # ICC profile support via lcms2 , withLzma ? withHeadlessDeps # xz-utils , withMetal ? false # Unfree and requires manual downloading of files , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx -, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support +, withModplug ? withFullDeps && !stdenv.hostPlatform.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer , withNvdec ? withHeadlessDeps && withNvcodec @@ -88,21 +88,21 @@ , withOpencl ? withFullDeps , withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder , withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder -, withOpengl ? withFullDeps && !stdenv.isDarwin # OpenGL rendering +, withOpengl ? withFullDeps && !stdenv.hostPlatform.isDarwin # OpenGL rendering , withOpenh264 ? withFullDeps # H.264/AVC encoder , withOpenjpeg ? withHeadlessDeps # JPEG 2000 de/encoder , withOpenmpt ? withFullDeps # Tracked music files decoder , withOpus ? withHeadlessDeps # Opus de/encoder -, withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library -, withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support +, withPlacebo ? withFullDeps && !stdenv.hostPlatform.isDarwin # libplacebo video processing library +, withPulse ? withSmallDeps && stdenv.hostPlatform.isLinux # Pulseaudio input support , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation , withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) , withRtmp ? withFullDeps # RTMP[E] support , withRubberband ? withFullDeps && withGPL # Rubberband filter -, withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol +, withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3 # Samba protocol , withSdl2 ? withSmallDeps -, withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" +, withShaderc ? withFullDeps && !stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "5.0" , withShine ? withFullDeps # Fixed-point MP3 encoding , withSnappy ? withFullDeps # Snappy compression, needed for hap encoding , withSoxr ? withHeadlessDeps # Resampling via soxr @@ -110,22 +110,22 @@ , withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol , withSsh ? withHeadlessDeps # SFTP protocol , withSvg ? withFullDeps # SVG protocol -, withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) +, withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support (Increases closure size by ~390 MiB) , withTheora ? withHeadlessDeps # Theora encoder , withTwolame ? withFullDeps # MP2 encoding -, withV4l2 ? withHeadlessDeps && stdenv.isLinux # Video 4 Linux support +, withV4l2 ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration -, withVideoToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple VideoToolbox +, withVideoToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple VideoToolbox , withVidStab ? withFullDeps && withGPL # Video stabilization -, withVmaf ? withFullDeps && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpl ? false # Hardware acceleration via intel libvpl , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding -, withVulkan ? withSmallDeps && !stdenv.isDarwin +, withVulkan ? withSmallDeps && !stdenv.hostPlatform.isDarwin , withWebp ? withHeadlessDeps # WebP encoder , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder @@ -827,7 +827,7 @@ stdenv.mkDerivation (finalAttrs: { # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnv = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; libsToLink = [ ] ++ optional buildAvcodec "libavcodec" ++ optional buildAvdevice "libavdevice" @@ -856,7 +856,7 @@ stdenv.mkDerivation (finalAttrs: { # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addDriverRunpath. - postFixup = optionalString (stdenv.isLinux && withLib) '' + postFixup = optionalString (stdenv.hostPlatform.isLinux && withLib) '' addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so addDriverRunpath ${placeholder "lib"}/lib/libavutil.so '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix index 7c06a346e4..b6107f3ef9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (precision != "double") "--enable-${precision}" # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html # FFTW will try to detect at runtime whether the CPU supports these extensions - ++ lib.optional (stdenv.isx86_64 && (precision == "single" || precision == "double")) + ++ lib.optional (stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma" ++ lib.optional enableMpi "--enable-mpi" # doc generation causes Fortran wrapper generation which hard-codes gcc diff --git a/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix index cc7a249cf7..4c38c54316 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix index edbebdb1b8..777bef9246 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - "-Dtests=${lib.boolToString (finalAttrs.finalPackage.doCheck && stdenv.isLinux)}" + "-Dtests=${lib.boolToString (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform.isLinux)}" ]; # backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4: diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index 532fc48477..8a601382f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { libunwind fmt_8 zstd - ] ++ lib.optional stdenv.isLinux jemalloc; + ] ++ lib.optional stdenv.hostPlatform.isLinux jemalloc; # jemalloc headers are required in include/folly/portability/Malloc.h - propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux jemalloc; env.NIX_CFLAGS_COMPILE = toString [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ @@ -66,13 +66,13 @@ stdenv.mkDerivation rec { # temporary hack until folly builds work on aarch64, # see https://github.com/facebook/folly/issues/1880 - "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" + "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.hostPlatform.isx86_64 then "x86_64" else "dummy"}" # ensure correct dirs in $dev/lib/pkgconfig/libfolly.pc # see https://github.com/NixOS/nixpkgs/issues/144170 "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index 83c5e3afc2..4f7f3c0fe1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ expat - ] ++ lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; propagatedBuildInputs = [ freetype diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index ff0d95ba44..669b66267f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -9,13 +9,13 @@ let fontconfig_ = fontconfig; in # nix user profile "~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts" ] - ++ lib.optional stdenv.isDarwin "~/Library/Fonts" + ++ lib.optional stdenv.hostPlatform.isDarwin "~/Library/Fonts" ++ [ # FHS paths for non-NixOS platforms "/usr/share/fonts" "/usr/local/share/fonts" ] # darwin paths - ++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] # nix default profile ++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix b/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix index 4ceb626123..e10d01d2c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXext libXft libGLU libGL libXfixes xinput - ] ++ lib.optional stdenv.isDarwin CoreServices; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; doCheck = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; branch = "1.6"; description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix index dbae2b20b6..2f98b1c8e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ openal - ] ++ lib.optional stdenv.isDarwin + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.OpenAL ; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix index c3a0fdb797..590167fc70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGLU ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGLX.dev}/include" "-DOPENGL_gl_LIBRARY:FILEPATH=${libGLX}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix index 20ced14ace..dd63935b23 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix @@ -30,22 +30,22 @@ stdenv.mkDerivation (finalAttrs: { --replace "pkg-config" "$PKG_CONFIG" substituteInPlace Makefile.gnu \ --replace "pkg-config" "$PKG_CONFIG" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # Upstream Makefile hardcodes i386 and x86_64 architectures only substituteInPlace Makefile.osx --replace "x86_64" "arm64" ''; nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; - postBuild = lib.optionalString (!stdenv.isDarwin) '' + postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -f Makefile.fip ''; @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $INCDIR $INSTALLDIR '' # Workaround for Makefiles.osx not using ?= - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" ) ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -f Makefile.fip install - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix index 4be38fbef0..f58785c1e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb1 libglut libGLU libGL libXi libXmu ] - ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix index 8ff0005d0f..34e156256a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config which ] ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - ++ lib.optional (!stdenv.isLinux) gnumake; + ++ lib.optional (!stdenv.hostPlatform.isLinux) gnumake; patches = [ ./enable-table-validation.patch @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; # The asm for armel is written with the 'asm' keyword. - CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99" + CFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-std=gnu99" + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freexl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freexl/default.nix index 74d4a646b0..ffcf81e92f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freexl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freexl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { expat minizip zlib - ] ++ lib.optional stdenv.isDarwin libiconv; + ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix index f5d6bcc7df..691b826e3a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ meson ninja pkg-config ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix b/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix index 7ff0c20706..6f6560ea9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ "-DDO_SSE_AUTODETECT=OFF" "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}" "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}" @@ -43,6 +43,6 @@ mkDerivation rec { maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; # fatal error: 'qglviewer.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix index 8b54cfb7b8..add2445f44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw fftwFloat ] ++ lib.optional enablePython pythonPackages.python - ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp ; propagatedBuildInputs = lib.optionals enablePython [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; preCheck = '' - ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} + ${if stdenv.hostPlatform.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} ${lib.optionalString enablePython "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh"} ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin && enablePython) '' install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix index e183a24c81..2c5740692f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index bf60ec5e42..be39b0d7cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; # Tests fail on 32-bit due to not enough precision - doCheck = stdenv.is64bit; + doCheck = stdenv.hostPlatform.is64bit; passthru.tests = { inherit prometheus-cpp; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix b/third_party/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix index 48a034aebc..455c84e5dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -114,6 +114,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix index 0a74d6122e..6b1a471d4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--enable-gd-formats" ] # -pthread gets passed to clang, causing warnings - ++ lib.optional stdenv.isDarwin "--enable-werror=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-werror=no"; nativeBuildInputs = [ autoconf automake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index cf2ff67acf..18f82b99af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , useMinimalFeatures ? false -, useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) +, useTiledb ? (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) , useLibHEIF ? (!useMinimalFeatures) , useLibJXL ? (!useMinimalFeatures) , useMysql ? (!useMinimalFeatures) @@ -107,9 +107,9 @@ stdenv.mkDerivation (finalAttrs: { "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optionals finalAttrs.doInstallCheck [ "-DBUILD_TESTING=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ] ++ lib.optionals (!useTiledb) [ "-DGDAL_USE_TILEDB=OFF" @@ -145,8 +145,8 @@ stdenv.mkDerivation (finalAttrs: { netCdfDeps = lib.optionals useNetCDF [ netcdf ]; armadilloDeps = lib.optionals useArmadillo [ armadillo ]; - darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; - nonDarwinDeps = lib.optionals (!stdenv.isDarwin) ([ + darwinDeps = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ([ # tests for formats enabled by these packages fail on macos openexr xercesc @@ -256,10 +256,10 @@ stdenv.mkDerivation (finalAttrs: { # failing with PROJ 9.3.1 # https://github.com/OSGeo/gdal/issues/8908 "test_osr_esri_28" - ] ++ lib.optionals (!stdenv.isx86_64) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on macos "test_rda_download_queue" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix index 33afe0ea7c..50ad7bdd9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional stdenv.isDarwin DarwinTools; + ] ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; buildInputs = [ expat @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals enableVTK [ vtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Cocoa libiconv @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "TestSCUValidation" # errors because 3 classes not wrapped: "TestWrapPython" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "TestRescaler2" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index 59760504f9..b7ba122453 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { # for man pages docutils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals withIntrospection [ gi-docgen @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # The fixDarwinDylibNames hook doesn't patch binaries. - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/bin/* $dev/bin/*; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f done @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = { updateScript = gnome.updateScript { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix index addc4a9dbe..95cdef4734 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { gexiv2 openexr suitesparse - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { ''; # tests fail to connect to the com.apple.fonts daemon in sandboxed mode - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Graph-based image processing framework"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index 8a895c36e8..6a183035ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; meta = with lib; { description = "General Stream I/O"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix index 3c6a40eeb5..84fa20f8ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { avahi ] ++ lib.optionals withDemoAgent [ libnotify gdk-pixbuf - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ modemmanager ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { "-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c" "-Ddbus-srv-user=geoclue" "-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-D3g-source=false" "-Dcdma-source=false" "-Dmodem-gps-source=false" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin && withDemoAgent; + broken = stdenv.hostPlatform.isDarwin && withDemoAgent; description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin mimame ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geogram/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geogram/default.nix index 619b5dfcdf..444975de85 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geogram/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ./replace-bundled-zlib.patch ]; - postPatch = lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace cmake/platforms/*/config.cmake \ --replace "-m64" "" ''; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { # Broken on aarch64-linux as of version 1.8.3 # See https://github.com/BrunoLevy/geogram/issues/74 - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ tmarkus ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix index fb3eccf997..32e1f39965 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix index 849fe64634..0cd143a1de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix index 69d7f17daf..b85dc689d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix @@ -62,7 +62,7 @@ in rec { nativeBuildInputs = [ cmake doxygen yq ]; buildInputs = [ getdns libyaml openssl systemd ] - ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; postInstall = '' rm -r $out/share/doc diff --git a/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix index abb692aebc..0518a40c29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; configureFlags = [ "--disable-csharp" @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ bash ] - ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isCygwin) [ # HACK, see #10874 (and 14664) libiconv ]; @@ -102,6 +102,6 @@ stdenv.mkDerivation rec { }; } -// lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.hostPlatform.isDarwin { makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index c560a3fc10..7a0e61cbf2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = let - libSuffix = if stdenv.isDarwin then "2.dylib" else "so.2"; + libSuffix = if stdenv.hostPlatform.isDarwin then "2.dylib" else "so.2"; in '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running unit tests, the library is not yet installed, diff --git a/third_party/nixpkgs/pkgs/development/libraries/gfxstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gfxstream/default.nix index e3164c95a4..6dd5a11e84 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gfxstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gfxstream/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ]; # Ensure that meson can find an Objective-C compiler on Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace meson.build \ --replace-fail "project('gfxstream_backend', 'cpp', 'c'" "project('gfxstream_backend', 'cpp', 'c', 'objc'" ''; @@ -30,7 +30,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ meson ninja pkg-config python3 ]; buildInputs = [ aemu libglvnd vulkan-headers vulkan-loader xorg.libX11 ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.IOKit @@ -39,7 +39,7 @@ stdenv.mkDerivation { darwin.apple_sdk.frameworks.QuartzCore ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = toString [ "-framework Cocoa" "-framework IOKit" @@ -51,7 +51,7 @@ stdenv.mkDerivation { }; # dlopens libvulkan. - preConfigure = lib.optionalString (!stdenv.isDarwin) '' + preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mesonFlagsArray=(-Dcpp_link_args="-Wl,--push-state -Wl,--no-as-needed -lvulkan -Wl,--pop-state") ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix index cc5ef6f643..c6dd7c8183 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ./mingw-install-exes.patch ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix index 44fe143968..a77cc10e2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 604435cee5..99fb182bc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -83,11 +83,11 @@ in stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ] ++ lib.optionals (!stdenv.isLinux || stdenv.hostPlatform.isMusl) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [ "-Dprofiler=disabled" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' patchShebangs build/choose-tests-locale.sh @@ -130,7 +130,7 @@ in stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = { tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gl2ps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gl2ps/default.nix index f1d67c8c88..eec23cef70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gl2ps/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gl2ps/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU libglut - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix b/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix index 5d8f155a5c..a675eebaa3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = if stdenv.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; - propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = if stdenv.hostPlatform.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; + propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix index 5b774f5871..8d68ad0867 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix @@ -8,7 +8,7 @@ , libXi , libXext , OpenGL -, enableEGL ? (!stdenv.isDarwin) +, enableEGL ? (!stdenv.hostPlatform.isDarwin) , testers , mesa }: @@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libXmu libXi libXext ]; - propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libXmu libXi libXext ]; + propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h cmakeDir = "cmake"; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index 22df229d47..f44b6385b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -30,7 +30,7 @@ stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian }: -assert stdenv.isLinux -> util-linuxMinimal != null; +assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null; let # Some packages don't get "Cflags" from pkg-config correctly @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JOApxd/JtE5Fc2l63zMHipgnxIk4VVAEs7kJb6TqA08="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin-compilation.patch # FIXME: remove when https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4088 is merged and is in the tagged release (fetchpatch { @@ -142,10 +142,10 @@ stdenv.mkDerivation (finalAttrs: { bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux util-linuxMinimal # for libmount - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation ]); @@ -185,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" ] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [ "-Dlibelf=disabled" - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ "-Db_lundef=false" "-Dxattr=false" ]; @@ -291,7 +291,7 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/libglib-${librarySuffix} ''; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = rec { gioModuleDir = "lib/gio/modules"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index be55dd89b7..6ab9d2bed5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -205,7 +205,7 @@ stdenv.mkDerivation ({ env = { linuxHeaders = lib.optionalString withLinuxHeaders linuxHeaders; - inherit (stdenv) is64bit; + inherit (stdenv.hostPlatform) is64bit; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux # bootstrap. diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix index acace1c6a5..7662e5f7f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix index f9f8a4568a..668f60ec10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ glib libsigcxx ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix index 53377022ad..ac42509212 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # Clang optimizes an expected allocation away. # See https://github.com/google/glog/issues/937 "DeathNoAllocNewHook.logging" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" ]; in @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { checkPhase = let - excludedTests = lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [ "mock-log" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "logging" # works around segfaults on aarch64-darwin for now ]; excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix index 0d1997cf1a..f21dd724c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { substituteInPlace tests/testsuite.c \ --replace /bin/rm rm '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # This specific test fails on darwin for some unknown reason substituteInPlace tests/test-filters.c \ --replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' "" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix b/third_party/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix index e809ed926e..9d014c2667 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmp/4.3.2.nix @@ -24,13 +24,13 @@ let self = stdenv.mkDerivation rec { # addition, `configfsf.guess' would return `i386-apple-darwin10.2.0' on # `x86_64-darwin', leading to a 32-bit ABI build, which is undesirable. preConfigure = - if !stdenv.isDarwin + if !stdenv.hostPlatform.isDarwin then "ln -sf configfsf.guess config.guess" else ''echo "Darwin host is `./config.guess`."''; configureFlags = [ (lib.enableFeature cxx "cxx") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "ac_cv_build=x86_64-apple-darwin13.4.0" "ac_cv_host=x86_64-apple-darwin13.4.0" ]; @@ -72,7 +72,7 @@ let self = stdenv.mkDerivation rec { platforms = lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; # never built on aarch64-darwin, aarch64-linux since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; }; in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix index e4fb89d054..43e3ca9759 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix @@ -24,7 +24,7 @@ let self = stdenv.mkDerivation rec { patches = [ ./5.1.3-CVE-2021-43618.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./need-size-t.patch ]; @@ -36,13 +36,13 @@ let self = stdenv.mkDerivation rec { # See , for instance. # # no darwin because gmp uses ASM that clang doesn't like - (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. "--build=${stdenv.buildPlatform.config}" - ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" + ] ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64" ; doCheck = true; @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation rec { platforms = platforms.all; badPlatforms = [ "x86_64-darwin" ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }; in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix index 3187b529aa..e1a8ff0ecd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix @@ -38,13 +38,13 @@ let self = stdenv.mkDerivation rec { # See , for instance. # # no darwin because gmp uses ASM that clang doesn't like - (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. "--build=${stdenv.buildPlatform.config}" - ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" + ] ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64" # to build a .dll on windows, we need --disable-static + --enable-shared # see https://gmplib.org/manual/Notes-for-Particular-Systems.html ++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix index db95029c80..381da5b8f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-QsdzdF2EuhS8HPHExvRgYUiAOlzTN5QcY5ZHlfPFnUI="; }; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { gtk3 gtk4 glib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap wayland libseccomp @@ -78,12 +78,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Ddesktop_docs=false" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dsystemd=disabled" "-Dudev=disabled" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = { updateScript = gnome.updateScript { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index dc797dd02d..8a1773612f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -8,7 +8,7 @@ , ninja , libxslt , gtk4 -, enableBackend ? stdenv.isLinux +, enableBackend ? stdenv.hostPlatform.isLinux , json-glib , libadwaita , librest_1_0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix index f1ecc1e993..3e9395668c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -52,7 +52,7 @@ let # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin + doCheck = !stdenv.hostPlatform.isFreeBSD && !stdenv.hostPlatform.isDarwin && stdenv.buildPlatform == stdenv.hostPlatform; inherit (stdenv.hostPlatform) isDarwin; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh ''; @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { "--with-unbound-root-key-file=${dns-root-data}/root.key" (lib.withFeature withP11-kit "p11-kit") (lib.enableFeature cxxBindings "cxx") - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-ktls" ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "--disable-doc" @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit - ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; + ++ lib.optional (tpmSupport && stdenv.hostPlatform.isLinux) trousers; nativeBuildInputs = [ perl pkg-config texinfo ] ++ [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index d58bdd2e78..a76764a49a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages pythonModules) ]; - nativeCheckInputs = lib.optionals stdenv.isDarwin [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools # for otool ]; @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dgi_cross_use_prebuilt_gi=true" ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; # During configurePhase, two python scripts are generated and need this. See # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692 diff --git a/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix index 96b1f3ae13..0df28ac88d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; # Success is more likely on x86_64 - doCheck = stdenv.isx86_64; + doCheck = stdenv.hostPlatform.isx86_64; passthru = { updateScript = gnome.updateScript { diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index 4d8ef68212..e8caeadcd3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ]; # https://hydra.nixos.org/build/222679737/nixlog/3/tail - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=maybe-uninitialized"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=maybe-uninitialized"; doInstallCheck = true; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { "$PWD/google/cloud/storage/benchmarks" "$PWD/google/cloud/testing_util" ]; - ldLibraryPathName = "${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH"; + ldLibraryPathName = "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH"; in lib.optionalString doInstallCheck ( lib.optionalString (!staticOnly) '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix index e76c033c70..62e7ecbb0e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix @@ -31,18 +31,18 @@ stdenv.mkDerivation rec { # tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux buildInputs = [ perl ] - ++ lib.optional (stdenv.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind; + ++ lib.optional (stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 configureFlags = lib.optional stdenv.hostPlatform.isAarch "--disable-general-dynamic-tls"; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_XOPEN_SOURCE"; # some packages want to link to the static tcmalloc_minimal diff --git a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix index fa4bb1be6d..45df332bc0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { # which has a path length limit. Nix on darwin is using a build directory # that already has quite a long path and the resulting socket path doesn't # fit in the limit. https://github.com/NixOS/nix/pull/1085 - ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ]; env.NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix index 0364b9ecfa..803f31efa4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "introspection" withIntrospection) "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # the box test is failing with SIGBUS on armv7l-linux # https://github.com/ebassi/graphene/issues/215 "-Darm_neon=false" diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 2110755a17..35ae5284af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc; propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; buildInputs = [ openssl protobuf ] - ++ lib.optionals stdenv.isLinux [ libnsl ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Workaround for https://github.com/llvm/llvm-project/issues/48757 "-Wno-elaborated-enum-base" ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsl-lite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsl-lite/default.nix index fcab020952..03fc5587f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsl-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsl-lite/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; # Building tests is broken on Darwin. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix index 2211f2d0d9..aeb95476b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' + preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.hostPlatform.isDarwin) then '' MACOSX_DEPLOYMENT_TARGET=10.16 '' else null; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix index ae2c489fe8..5905fdff7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix @@ -4,7 +4,7 @@ }: let - inherit (stdenv) isDarwin; + inherit (stdenv.hostPlatform) isDarwin; inherit (lib) optional optionalString; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix index 42d22c2bd5..1271c52a4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, withShishi ? !stdenv.isDarwin +, withShishi ? !stdenv.hostPlatform.isDarwin , shishi }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withShishi shishi; # ./stdint.h:89:5: error: expected value in expression - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export GNULIBHEADERS_OVERRIDE_WINT_T=0 ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix b/third_party/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix index 468c2a84ca..d52c90b41b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix index 939fb0e7b4..c42b6f9580 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' # Move developer documentation to devdoc output. diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index bf27c6f25d..3ab9c896b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -104,7 +104,7 @@ , Foundation , MediaToolbox , enableGplPlugins ? true -, bluezSupport ? stdenv.isLinux +, bluezSupport ? stdenv.hostPlatform.isLinux # Causes every application using GstDeviceMonitor to send mDNS queries every 2 seconds , microdnsSupport ? false # Checks meson.is_cross_build(), so even canExecute isn't enough. @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc - ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [ wayland-scanner ]; @@ -214,11 +214,11 @@ stdenv.mkDerivation rec { libmicrodns ] ++ lib.optionals openh264Support [ openh264 - ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin mjpegtools @@ -245,9 +245,9 @@ stdenv.mkDerivation rec { libGLU ] ++ lib.optionals guiSupport [ gtk3 - ] ++ lib.optionals (stdenv.isLinux && guiSupport) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && guiSupport) [ directfb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # For unknown reasons the order is important, e.g. if # VideoToolbox is last, we get: # fatal error: 'VideoToolbox/VideoToolbox.h' file not found @@ -306,14 +306,14 @@ stdenv.mkDerivation rec { (lib.mesonEnable "openh264" openh264Support) (lib.mesonEnable "doc" enableDocumentation) ] - ++ lib.optionals (!stdenv.isLinux) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Dnvcodec=disabled" # Linux-only - ] ++ lib.optionals (!stdenv.isLinux || !gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !gst-plugins-base.waylandEnabled) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` - ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !guiSupport) [ "-Ddirectfb=disabled" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Daja=disabled" "-Dchromaprint=disabled" "-Dflite=disabled" @@ -327,7 +327,7 @@ stdenv.mkDerivation rec { "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf - ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64 || !gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isx86_64 || !gst-plugins-base.waylandEnabled) [ "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ "-Dgl=disabled" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 3d55425190..9932c37a72 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -20,23 +20,23 @@ , tremor # provides 'virbisidec' , libGL , gobject-introspection -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux , libXext , libXi , libXv , libdrm -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland-scanner , wayland , wayland-protocols -, enableAlsa ? stdenv.isLinux +, enableAlsa ? stdenv.hostPlatform.isLinux , alsa-lib # TODO: fix once x86_64-darwin sdk updated -, enableCocoa ? (stdenv.isDarwin && stdenv.isAarch64) +, enableCocoa ? (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) , Cocoa , OpenGL , enableGl ? (enableX11 || enableWayland || enableCocoa) -, enableCdparanoia ? (!stdenv.isDarwin) +, enableCdparanoia ? (!stdenv.hostPlatform.isDarwin) , cdparanoia , glib , testers @@ -91,11 +91,11 @@ stdenv.mkDerivation (finalAttrs: { libjpeg tremor pango - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm libGL libvisual - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ] ++ lib.optionals enableAlsa [ alsa-lib @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ gstreamer - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm ]; @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!enableGl) "-Dgl=disabled" ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Ddrm=disabled" "-Dlibvisual=disabled" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index d1094cfc87..7eba093ab9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { glib bash-completion rustc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap # for setcap binary ] ++ lib.optionals withIntrospection [ gobject-introspection @@ -74,13 +74,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bash-completion - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ] ++ lib.optionals withLibunwind [ libunwind - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 40c9cbc769..ec474972ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -39,9 +39,9 @@ , qt6Support ? false, qt6 , raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 -, enableX11 ? stdenv.isLinux, xorg +, enableX11 ? stdenv.hostPlatform.isLinux, xorg , ncurses -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland , wayland-protocols , libgudev @@ -54,7 +54,7 @@ # MMAL is not supported on aarch64, see: # https://github.com/raspberrypi/userland/issues/688 -assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); +assert raspiCameraSupport -> (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; @@ -147,9 +147,9 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtwayland - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdrm libGL libv4l @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { "-Dximagesrc=disabled" # Linux-only ] ++ lib.optionals (!enableJack) [ "-Djack=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddv1394=disabled" # Linux only "-Doss4=disabled" # Linux only "-Doss=disabled" # Linux only diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index 3e8eec7b8a..187d1a0486 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -57,15 +57,15 @@ let mp4 = [ ]; # net - aws = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + aws = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; hlssink3 = [ ]; ndi = [ ]; onvif = [ pango ]; raptorq = [ ]; - reqwest = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + reqwest = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; rtp = [ ]; - webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; # text textahead = [ ]; @@ -110,9 +110,9 @@ let [ "csound" # tests have weird failure on x86, does not currently work on arm or darwin "livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357 - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "raptorq" # pointer alignment failure in tests on aarch64 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "reqwest" # tests hang on darwin "threadshare" # tests cannot bind to localhost on darwin "webp" # not supported on darwin (upstream crate issue) @@ -200,13 +200,13 @@ stdenv.mkDerivation (finalAttrs: { cargo cargo-c' nasm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ] ++ lib.optionals enableDocumentation [ hotdoc ]; - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; buildInputs = [ gstreamer diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 6f8ac715af..f6a0ee93d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libmad libmpeg2 x264 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index db154403ff..d7d788787a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { xorg.libICE nasm libvpx - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix index 3657f62f92..c94a3ae15d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" + "-Dgtk_doc=${if stdenv.hostPlatform.isDarwin then "false" else "true"}" # Data for examples is useless when the example programs are not installed. "-Dexamples=false" ]; @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix index b3edf0ba48..69af8b3187 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { }; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index ed0900ee1a..cb4b6955de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -25,9 +25,9 @@ , testers , AppKit , Cocoa -, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" -, cupsSupport ? config.gtk2.cups or stdenv.isLinux -, xineramaSupport ? stdenv.isLinux +, gdktarget ? if stdenv.hostPlatform.isDarwin then "quartz" else "x11" +, cupsSupport ? config.gtk2.cups or stdenv.hostPlatform.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch"; hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch # Fixes an incompatible function pointer conversion and implicit int errors with clang 16. @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf glib pango - ] ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) [ libXcomposite libXcursor libXi @@ -91,14 +91,14 @@ stdenv.mkDerivation (finalAttrs: { libXrender ] ++ lib.optional xineramaSupport libXinerama ++ lib.optional cupsSupport cups - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libXdamage AppKit Cocoa ]; preConfigure = - lib.optionalString (stdenv.isDarwin + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") "MACOSX_DEPLOYMENT_TARGET=10.16"; @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" "--with-gdktarget=${gdktarget}" "--with-xinput=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-glibtest" "--disable-introspection" "--disable-visibility" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index ed0612bf2e..7f3717c8a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -33,15 +33,15 @@ , gnome , gsettings-desktop-schemas , sassc -, trackerSupport ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) +, trackerSupport ? stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) , tracker -, x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libGL , wayland , wayland-protocols -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux +, cupsSupport ? stdenv.hostPlatform.isLinux , cups , AppKit , Cocoa @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals trackerSupport [ tracker @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libXrender pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # explicitly propagated, always needed Cocoa QuartzCore @@ -166,13 +166,13 @@ stdenv.mkDerivation (finalAttrs: { "-Dtracker3=${lib.boolToString trackerSupport}" "-Dbroadway_backend=${lib.boolToString broadwaySupport}" "-Dx11_backend=${lib.boolToString x11Support}" - "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" + "-Dquartz_backend=${lib.boolToString (stdenv.hostPlatform.isDarwin && !x11Support)}" "-Dintrospection=${lib.boolToString withIntrospection}" ]; doCheck = false; # needs X11 - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs ''${files[@]} ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk-update-icon-cache "$out" # Launcher @@ -219,14 +219,14 @@ stdenv.mkDerivation (finalAttrs: { ''; # Wrap demos - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}" done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # a comment created a cycle between outputs sed '/^# ModulesPath =/d' -i "$out"/lib/gtk-*/*/immodules.cache ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 3a144b2de3..8b3ef020bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -32,13 +32,13 @@ , gsettings-desktop-schemas , gst_all_1 , sassc -, trackerSupport ? stdenv.isLinux +, trackerSupport ? stdenv.hostPlatform.isLinux , tracker -, x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libGL # experimental and can cause crashes in inspector -, vulkanSupport ? stdenv.isLinux +, vulkanSupport ? stdenv.hostPlatform.isLinux , shaderc , vulkan-loader , vulkan-headers @@ -46,8 +46,8 @@ , wayland , wayland-protocols , wayland-scanner -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux +, cupsSupport ? stdenv.hostPlatform.isLinux , compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , cups , AppKit @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { libXi libXrandr libXrender - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals trackerSupport [ tracker @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXinerama ] ++ lib.optionals cupsSupport [ cups - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo @@ -175,13 +175,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "vulkan" vulkanSupport) (lib.mesonEnable "print-cups" cupsSupport) (lib.mesonBool "x11-backend" x11Support) - ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ "-Dmedia-gstreamer=disabled" # requires gstreamer-gl ]; doCheck = false; # needs X11 - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options @@ -218,7 +218,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' PATH="$OLD_PATH" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk4-update-icon-cache "$out" # Launcher @@ -234,7 +234,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Wrap demos - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' demos=(gtk4-demo gtk4-demo-application gtk4-icon-browser gtk4-widget-factory) for program in ''${demos[@]}; do diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix index 36ff98d9f1..64ec9e9ac2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pangomm_2_48 ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin)[ + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin)[ xvfb-run ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${lib.optionalString (!stdenv.isDarwin) "xvfb-run -s '-screen 0 800x600x24'"} \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run -s '-screen 0 800x600x24'"} \ meson test --print-errorlogs runHook postCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index fb5c72e8b3..41999f5538 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index f1a12eb0de..a57881ff55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # The 10.12 SDK used by x86_64-darwin requires defining `_POSIX_C_SOURCE` to use `strnlen`. - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_POSIX_C_SOURCE=200809L"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-D_POSIX_C_SOURCE=200809L"; nativeBuildInputs = [ meson @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { "-Ddocumentation=true" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix index 08b2925b0e..5fa0df3142 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ]; # Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { updateScript = gnome.updateScript { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 7c5cdca3f6..4b4da283dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -8,7 +8,7 @@ , gettext , dbus , glib -, udevSupport ? stdenv.isLinux +, udevSupport ? stdenv.hostPlatform.isLinux , libgudev , udisks2 , libgcrypt diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 12297a5da6..15208becc3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/*.py test - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ --replace '#pragma GCC diagnostic error "-Wcast-align"' "" @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString withIcu '' rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.dylib ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.0.dylib ''} diff --git a/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix index 05b915efb8..6e537e8b74 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ libusb1 udev ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 udev ]; enableParallelBuilding = true; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa IOKit ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ prusnak ]; # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) license = with licenses; [ bsd3 /* or */ gpl3Only ] ; - pkgConfigModules = lib.optionals stdenv.isDarwin [ + pkgConfigModules = lib.optionals stdenv.hostPlatform.isDarwin [ "hidapi" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "hidapi-hidraw" "hidapi-libusb" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix index d8e320a44c..c85790408b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) - ++ lib.optionals stdenv.isDarwin [ libintl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix index 6ba2b8fc1a..69cf2ab210 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ ./enable-static-shared.patch - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # https://github.com/nodejs/http-parser/pull/510 (fetchpatch { url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix index f2316ab657..f71fa4aca8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { buildInputs = [ expat ncurses ] ++ lib.optionals x11Support [ cairo libX11 ] - ++ lib.optionals stdenv.isLinux [ numactl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ]; # Since `libpci' appears in `hwloc.pc', it must be propagated. - propagatedBuildInputs = lib.optional stdenv.isLinux pciutils; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux pciutils; enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' if [ -d "${numactl}/lib64" ]; then numalibdir="${numactl}/lib64" else diff --git a/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index 0b9765dac4..cdb578ba08 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_AVX512=ON" ] - ++ lib.optional (!stdenv.isDarwin) "-DFAT_RUNTIME=ON" + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON" ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix index 575f184c16..52b083995e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix @@ -31,7 +31,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + lib.optionalString stdenv.isAarch32 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; @@ -39,7 +39,7 @@ let dontDisableStatic = withStatic; configureFlags = [ "--disable-debug" ] - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" + ++ lib.optional (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isDarwin) "--enable-rpath" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}" ++ lib.optional withStatic "--enable-static"; @@ -74,7 +74,7 @@ let postInstall = lib.optionalString withStatic '' mkdir -p $static/lib mv -v lib/*.a $static/lib - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc '' + (let replacements = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index 63ca16e19d..0501fe4ac2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \ --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\"" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix index 219d961f9f..dc075e4356 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" # at least on i686. spooky! - doCheck = stdenv.isx86_64; + doCheck = stdenv.hostPlatform.isx86_64; preConfigure = '' # Need to cd after patches for openexr patches to apply. diff --git a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix index 1b33c1c74f..315a731710 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -26,15 +26,15 @@ IMGUI_BUILD_DX10_BINDING ? false, IMGUI_BUILD_DX11_BINDING ? false, IMGUI_BUILD_DX12_BINDING ? false, - IMGUI_BUILD_GLFW_BINDING ? !stdenv.isDarwin, + IMGUI_BUILD_GLFW_BINDING ? !stdenv.hostPlatform.isDarwin, IMGUI_BUILD_GLUT_BINDING ? false, - IMGUI_BUILD_METAL_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_METAL_BINDING ? stdenv.hostPlatform.isDarwin, IMGUI_BUILD_OPENGL2_BINDING ? false, IMGUI_BUILD_OPENGL3_BINDING ? IMGUI_BUILD_SDL2_BINDING || IMGUI_BUILD_GLFW_BINDING || IMGUI_BUILD_GLUT_BINDING, - IMGUI_BUILD_OSX_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_OSX_BINDING ? stdenv.hostPlatform.isDarwin, IMGUI_BUILD_SDL2_BINDING ? - !IMGUI_BUILD_GLFW_BINDING && !stdenv.isDarwin, + !IMGUI_BUILD_GLFW_BINDING && !stdenv.hostPlatform.isDarwin, IMGUI_BUILD_SDL2_RENDERER_BINDING ? IMGUI_BUILD_SDL2_BINDING, IMGUI_BUILD_VULKAN_BINDING ? false, IMGUI_BUILD_WIN32_BINDING ? false, diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 6f7a14a616..cea3f45f9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors - configureFlags = optional stdenv.isDarwin "--enable-amd64=no" + configureFlags = optional stdenv.hostPlatform.isDarwin "--enable-amd64=no" ++ optional (!svgSupport) "--without-svg" ++ optional (!heifSupport) "--without-heif" ++ optional (!x11Support) "--without-x"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imtui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imtui/default.nix index a4f477543b..ac1791126b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imtui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imtui/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withEmscripten emscripten ++ lib.optional withCurl curl ++ lib.optional withNcurses ncurses - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; postPatch = '' cp -r ${imgui.src}/* third-party/imgui/imgui diff --git a/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix index f74cfdec93..1c8cca6af7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix @@ -24,14 +24,14 @@ in sha256 = "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28"; }; - nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "doc" ]; enableParallelBuilding = true; preConfigure = '' cd ./INCHI_API/libinchi/gcc - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace makefile \ --replace ",--version-script=libinchi.map" "" \ --replace "LINUX_Z_RELRO = ,-z,relro" "" \ @@ -56,7 +56,7 @@ in runHook postInstall ''; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames $(find "$out" -name "*.so.*") ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 5b5cfac9e0..4803f6ecf3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -8,7 +8,7 @@ , libpciaccess , intel-gmmlib , libdrm -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux , libX11 # for passhtru.tests , pkgsi686Linux diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix index fa5d2b3b0c..6711622a2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace source/Irrlicht/Makefile \ --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0" ''; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm - ] ++ lib.optional stdenv.isAarch64 zlib; + ] ++ lib.optional stdenv.hostPlatform.isAarch64 zlib; meta = { homepage = "https://irrlicht.sourceforge.io/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/isa-l/default.nix b/third_party/nixpkgs/pkgs/development/libraries/isa-l/default.nix index 9a112fb1c4..6ae04b0b26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/isa-l/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/isa-l/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/isa-l"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; - broken = stdenv.isDarwin && stdenv.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang? + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang? }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix index 7ac9d6d8fb..d4ece7d311 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix @@ -13,6 +13,7 @@ castxml, swig, expat, + eigen, fftw, gdcm, hdf5-cpp, @@ -106,9 +107,7 @@ stdenv.mkDerivation { "-DBUILD_SHARED_LIBS=ON" "-DITK_FORBID_DOWNLOADS=ON" "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. - # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, - # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" - # when compiling c3d, but maybe an ITK 5.2/eigen version issue: + "-DITK_USE_SYSTEM_EIGEN=ON" "-DITK_USE_SYSTEM_EIGEN=OFF" "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 "-DITK_USE_SYSTEM_GDCM=ON" @@ -144,10 +143,11 @@ stdenv.mkDerivation { buildInputs = [ + eigen libX11 libuuid ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals enablePython [ python ] ++ lib.optionals withVtk [ vtk ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 diff --git a/third_party/nixpkgs/pkgs/development/libraries/jabcode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jabcode/default.nix index 1fc0e6fd08..d735937b93 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jabcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jabcode/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix index dddcfd1fa3..fe5a0c5535 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Java Foreign Function Interface"; homepage = "https://github.com/jnr/jffi"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix index 7541e6b0c1..9d3bfd1d9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix @@ -41,19 +41,19 @@ stdenv.mkDerivation rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ lib.optionals (stdenv.isAarch32 && lib.versionOlder version "5") [ + ++ lib.optionals (stdenv.hostPlatform.isAarch32 && lib.versionOlder version "5") [ "--disable-thp" "je_cv_thp=no" ] # AArch64 has configurable page size up to 64k. The default configuration # for jemalloc only supports 4k page sizes. - ++ lib.optional stdenv.isAarch64 "--with-lg-page=16" + ++ lib.optional stdenv.hostPlatform.isAarch64 "--with-lg-page=16" # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--with-lg-vaddr=48" + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--with-lg-vaddr=48" ; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=array-bounds"; # Tries to link test binaries binaries dynamically and fails doCheck = !stdenv.hostPlatform.isStatic; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 0ad7cfbbb7..4e9a2a4652 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, mkDerivation, propagate, extra-cmake-modules, kcoreaddons, qttools, - enablePolkit ? stdenv.isLinux, polkit-qt + enablePolkit ? stdenv.hostPlatform.isLinux, polkit-qt }: mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 4b52cd95b7..d40c5a0a95 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -22,7 +22,7 @@ mkDerivation { outputs = [ "out" "dev" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ] # kf.doctools.core: Error: Could not find kdoctools catalogs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { name = "kdoctools-relocate-datapath.patch"; url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 1bd1f115c6..32d01b2614 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -18,7 +18,7 @@ mkDerivation { pname = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ attr ] ++ [ ebook_tools diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 1f2620c566..fb18cfb287 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -21,7 +21,7 @@ mkDerivation { CXXFLAGS = [ ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"'' ]; setupHook = writeScript "setup-hook.sh" '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index 522c27bf56..89f341f997 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -15,14 +15,14 @@ mkDerivation { karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras kcrash libkrb5 - ] ++ lib.lists.optionals stdenv.isLinux [ + ] ++ lib.lists.optionals stdenv.hostPlatform.isLinux [ acl attr # both are needed for ACL support util-linux # provides libmount ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice kxmlgui qtbase qttools solid - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ kded ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix index 5284d673d8..d9d5a6f703 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -11,7 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index ccc9f76b23..23abe70fed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -15,7 +15,7 @@ mkDerivation ({ editorconfig-core-c ]; propagatedBuildInputs = [ kparts ]; -} // lib.optionalAttrs stdenv.isDarwin { +} // lib.optionalAttrs stdenv.hostPlatform.isDarwin { postPatch = '' substituteInPlace src/part/CMakeLists.txt \ --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop" diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix index 27160c3bda..e26f8bfa9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -8,8 +8,8 @@ mkDerivation { pname = "solid"; patches = [ ./fix-search-path.patch ]; nativeBuildInputs = [ bison extra-cmake-modules flex ] - ++ lib.optionals stdenv.isLinux [ media-player-info ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; - propagatedUserEnvPkgs = lib.optionals stdenv.isLinux [ media-player-info ]; + propagatedUserEnvPkgs = lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix index 60b3ad00ae..ab9a107cd4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix @@ -32,10 +32,10 @@ , nixosTests , withCJSON ? true -, withCapNG ? stdenv.isLinux +, withCapNG ? stdenv.hostPlatform.isLinux # libmicrohttpd should theoretically work for darwin as well, but something is broken. # It affects tests check-bx509d and check-httpkadmind. -, withMicroHTTPD ? stdenv.isLinux +, withMicroHTTPD ? stdenv.hostPlatform.isLinux , withOpenLDAP ? true , withOpenLDAPAsHDBModule ? false , withOpenSSL ? true @@ -71,7 +71,7 @@ stdenv.mkDerivation { ++ (with perlPackages; [ JSON ]); buildInputs = [ db libedit pam ] - ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ CoreFoundation Security SystemConfiguration ] ++ lib.optionals (withCJSON) [ cjson ] ++ lib.optionals (withCapNG) [ libcap_ng ] ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ] @@ -132,7 +132,7 @@ stdenv.mkDerivation { # (test_cc) heimdal uses librokens implementation of `secure_getenv` on darwin, # which expects either USER or LOGNAME to be set. - preCheck = lib.optionalString (stdenv.isDarwin) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export USER=nix-builder ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index f48a2136ad..a384d49fed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time. # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737 ++ lib.optionals staticOnly [ "--enable-static" "--disable-shared" ] - ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS='' + ++ lib.optional stdenv.hostPlatform.isFreeBSD ''WARN_CFLAGS='' ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ byacc perl pkg-config ] # Provides the mig command used by the build scripts - ++ lib.optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; buildInputs = [ openssl ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withLibedit [ libedit ] ++ lib.optionals withVerto [ libverto ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk; [ libs.xpc frameworks.Kerberos ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix index 5c5ab34bc2..ebe783ae8b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TIXXNmaNgpIL/b25KsPWa32xEI8JWBp2ndkWCgLe80k="; }; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace kccommon.h \ --replace tr1/unordered_map unordered_map \ --replace tr1/unordered_set unordered_set \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix index 80a3f725f9..65fc10c92a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "LDAP-like embedded database"; homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix index ae071a7271..4e96e9f4c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # error: no viable conversion from ... - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; patches = [ # error: ISO C++17 does not allow 'register' storage class specifier diff --git a/third_party/nixpkgs/pkgs/development/libraries/lensfun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lensfun/default.nix index 766a1161e2..8972485bb2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lensfun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lensfun/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { buildInputs = [ glib zlib libpng ]; - cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" "-DCMAKE_BUILD_TYPE=RELEASE" ]; + cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; meta = with lib; { platforms = platforms.linux ++ platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix index 12cd3f074f..41af5b44a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which gnuplot ]; # Fails on pngio_reg for unknown reason - doCheck = false; # !stdenv.isDarwin; + doCheck = false; # !stdenv.hostPlatform.isDarwin; meta = { description = "Image processing and analysis library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index 4bf0a9d3f9..8b87f0af9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.17.28"; + version = "1.17.42"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-rgQ7B3RZemlcurEQ8bwvlvJAypzHTOBqpowasziZCiQ="; + hash = "sha256-IjYRzjC7CUPDdVBVoWSZtUQaY7QtSfS/Nej/2BdVziY="; }; nativeBuildInputs = [ cmake addDriverRunpath ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix index f5e7e2a638..9d2dfe4680 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames ++ [ cmake ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ [ cmake ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix index e0db2b76f1..eedb433e61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let disabledTests = - lib.optionals stdenv.isAarch64 [ + lib.optionals stdenv.hostPlatform.isAarch64 [ # Broken on all platforms, test just accidentally passes on some. # https://gitlab.com/inkscape/lib2geom/-/issues/63 "elliptical-arc-test" diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index 2436fbc002..df88534bc6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libzip gtest openssl - ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); + ] ++ (if stdenv.hostPlatform.isDarwin then [ libossp_uuid ] else [ libuuid ]); postPatch = '' # This lets us build the tests properly on aarch64-darwin. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix index b92d9161c1..f9bd013065 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libad9361/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libad9361/default.nix index f370870f71..96f1e877d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libad9361/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libad9361/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiio ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix iio include path on darwin to match linux for i in test/*.c; do substituteInPlace $i \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 924b8884df..bd51a9a124 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ appstream fribidi - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ adwaita-icon-theme - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ xvfb-run ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { # # not ok /Adwaita/ButtonContent/style_class_button - Gdk-FATAL-CRITICAL: # gdk_macos_monitor_get_workarea: assertion 'GDK_IS_MACOS_MONITOR (self)' failed - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; separateDebugInfo = true; checkPhase = '' @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { # Tests need a cache directory "HOME=$TMPDIR" ) - env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \ + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run"} \ meson test --print-errorlogs runHook postCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix b/third_party/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix index 0582019d72..8fa18093aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Tests for libagar"; mainProgram = "agartest"; homepage = "http://libagar.org/index.html"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix index f61c0bfafc..622dabd823 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; - configureFlags = lib.optional stdenv.is64bit "--enable-64bit" + configureFlags = lib.optional stdenv.hostPlatform.is64bit "--enable-64bit" # libantlr3c wrongly emits the abi flags -m64 and -m32 which imply x86 archs # https://github.com/antlr/antlr3/issues/205 ++ lib.optional (!stdenv.hostPlatform.isx86) "--disable-abiflags"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libao/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libao/default.nix index b920fe9c3b..6c6743b2b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libao/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libao/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ lib.optional usePulseAudio libpulseaudio ++ - lib.optionals stdenv.isLinux [ alsa-lib libcap ] ++ - lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libcap ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreServices AudioUnit ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix index 8f4afbf5a3..01f361d054 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DCONFIG_TUNE_VMAF=1" ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # armv7l-hf-multiplatform does not support NEON # see lib/systems/platform.nix "-DENABLE_NEON=0" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaosd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaosd/default.nix index 540fc10998..8068ae3edd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaosd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaosd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { composited rendering via XComposite, as well as support for rendering Cairo and Pango layouts. ''; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/atheme-legacy/libaosd"; license = licenses.mit; maintainers = with maintainers; [ unode ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix index 6e2ef83c5e..ccd8166ca4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix index 3c3fa3ee70..db5603ac4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fribidi harfbuzz ] ++ lib.optional fontconfigSupport fontconfig - ++ lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.CoreFoundation diff --git a/third_party/nixpkgs/pkgs/development/libraries/libasyncns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libasyncns/default.nix index 09e056373d..77c998f421 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libasyncns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libasyncns/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libasyncns/asyncns.c \ --replace '' '' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix index bf83a9e845..a9fc75558e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isCygwin [ autoconf automake libtool ]; - preConfigure = lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am ./autogen.sh ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix index 1be572671e..60c7ede099 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { (lib.enableFeature enableShared "shared") ]; - doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl; + doCheck = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl; passthru = { updateScript = unstableGitUpdater { }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix index 94d1257d0e..77e72d22db 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 buildInputs = [ tecla libusb1 ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ ncurses ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ]; # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DOCUMENTATION=ON" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" "-DBLADERF_GROUP=bladerf" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix index 672908281b..c31c05920e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig ] ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype - ++ lib.optional stdenv.isDarwin DiskArbitration; + ++ lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; propagatedBuildInputs = lib.optional withAACS libaacs; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbtbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbtbb/default.nix index e0e70005e2..9ea153fab6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbtbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbtbb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; # https://github.com/greatscottgadgets/libbtbb/issues/63 postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbutl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbutl/default.nix index 65fe845ff2..aaf78cec08 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbutl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbutl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ build2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # but especially important when bootstrapping disallowedReferences = [ build2 ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libbutl/uuid-linux.cxx \ --replace '"libuuid.so' '"${lib.getLib libuuid}/lib/libuuid.so' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix index 5f987943d8..1dd07a9d6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+79N6Mt9tb3/XstnL/Db5pOfufNEuQDVG6YpUymjMuc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/--version-script/d' Makefile.in sed -i 's/^vflag = .*$/vflag = ""/' meson.build ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix index 0a9aabf731..7f164c18b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix @@ -2,7 +2,7 @@ , gtk2-x11, gtk3-x11 , gtkSupport ? null , libpulseaudio, gst_all_1, libvorbis, libcap, systemd , Carbon, CoreServices, AppKit -, withAlsa ? stdenv.isLinux, alsa-lib }: +, withAlsa ? stdenv.hostPlatform.isLinux, alsa-lib }: stdenv.mkDerivation rec { pname = "libcanberra"; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 - ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices AppKit ] - ++ lib.optionals stdenv.isLinux [ libcap systemd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices AppKit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap systemd ] ++ lib.optional withAlsa alsa-lib; configureFlags = [ "--disable-oss" ] - ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; + ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; patches = [ (fetchpatch { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310"; sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/patch-configure.diff"; sha256 = "sha256-pEJy1krciUEg5BFIS8FJ4BubjfS/nt9aqi6BLnS1+4M="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix index b6fd599e0d..93b3cb91ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,26 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, - libiconv, IOKit, DiskArbitration}: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libcdio, + pkg-config, + libiconv, + IOKit, + DiskArbitration, +}: stdenv.mkDerivation rec { pname = "libcdio-paranoia"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "rocky"; repo = "libcdio-paranoia"; rev = "release-10.2+${version}"; - hash = "sha256-kNGhhslp5noAVeho0kBVfyvb4kQpDY56nyL3a4aFgjE="; + hash = "sha256-n05PSVgh6z7BFPq4CjJa5DqCO7Huj8Bsg0x3HQPsbeI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libcdio ] ++ - lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; - - propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration; - - configureFlags = lib.optionals stdenv.isDarwin [ - "--disable-ld-version-script" + nativeBuildInputs = [ + autoreconfHook + pkg-config ]; + buildInputs = + [ libcdio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + IOKit + DiskArbitration + ]; + + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; + + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-ld-version-script" ]; meta = with lib; { description = "CD paranoia on top of libcdio"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix index 820ac97a43..9f0d8689f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config help2man ]; buildInputs = [ libcddb libiconv ncurses ] - ++ lib.optionals stdenv.isDarwin [ Carbon IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon IOKit ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Library for OS-independent CD-ROM and CD image access"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix index 78746cf012..4116f2a017 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUX_API=1" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix index c33fdcf00f..93aec103bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ] # Build mixes up dylibs/frameworks if one is not explicitly specified. - ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-config" "qt_framework" ]; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index 4f813d74a8..f3decde56c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Running tests in parallel does not work enableParallelChecking = false; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C client library for Couchbase"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index c947079038..08b286c825 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 dbus glib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "-Denable_gtk_doc=true" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix index 0163eb9015..fc33817a85 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libusb1 ] - ++ lib.optional stdenv.isLinux libraw1394 - ++ lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.hostPlatform.isLinux libraw1394 + ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Capture and control API for IIDC compliant cameras"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix index bfefe90487..53944f5a5e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] ++ lib.optionals withXorg [ libX11 libGL ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix index 926973bb57..2c4e7de008 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit"; meta = with lib; { description = "C library for creating MusicBrainz DiscIDs from audio CDs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix index 49c2ab1bdf..da69eedb28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Disable priority scheduling on Darwin because it doesn’t support sched_setscheduler. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace encodedv/dvconnect.c \ --replace '#ifdef _SC_PRIORITY_SCHEDULING' '#if 0' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix index 6c832250fc..2e1cc41c5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libdvdcss"; version = "1.4.3"; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdwg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdwg/default.nix index 969b5d9636..741d848c47 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdwg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdwg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix index f771ad140b..5ff8055ced 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix @@ -10,7 +10,7 @@ , libX11 , Carbon , OpenGL -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.hostPlatform.isDarwin , testers }: @@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/*.py '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" '' # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace test/meson.build \ --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace test/meson.build \ --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; @@ -47,23 +47,23 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = lib.optionals (x11Support && !stdenv.isDarwin) [ + buildInputs = lib.optionals (x11Support && !stdenv.hostPlatform.isDarwin) [ libGL ] ++ lib.optionals x11Support [ libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon OpenGL ]; mesonFlags = [ - "-Degl=${if (x11Support && !stdenv.isDarwin) then "yes" else "no"}" + "-Degl=${if (x11Support && !stdenv.hostPlatform.isDarwin) then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-Dx11=${lib.boolToString x11Support}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.hostPlatform.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix index 167371e287..ab443dfac8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optional sslSupport openssl - ++ lib.optional stdenv.isCygwin findutils; + ++ lib.optional stdenv.hostPlatform.isCygwin findutils; doCheck = false; # needs the net diff --git a/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix index 6c149b0186..3bfd958bfd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ] - ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ]; # cannot run test program while cross compiling configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix index d947534cb2..e154eebc48 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch2, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, pkg-config -, rpmSupport ? stdenv.isLinux, rpm +, rpmSupport ? stdenv.hostPlatform.isLinux, rpm , gstreamerSupport ? true, gst_all_1 # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. doCheck = false; - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = "make check"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix index 658e380d21..6fabadf5f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -3,9 +3,9 @@ , fetchFromGitHub , pkg-config , autoreconfHook -, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) +, enablePsm2 ? (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux) , libpsm2 -, enableOpx ? (stdenv.isx86_64 && stdenv.isLinux) +, enableOpx ? (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux) , libuuid , numactl }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix index af2191fb41..5277337500 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DWITH_PROCPS=Off" ] - ++ lib.optionals stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ]; + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ]; postPatch = lib.optionalString (!enableStatic) '' substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix b/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix index 50bec9edd0..d8dd3fa47d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ armeenm ]; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix index 04bfadeef9..1a68b5eb6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libcbor zlib ] - ++ lib.optionals stdenv.isDarwin [ hidapi ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals (stdenv.isLinux && withPcsclite) [ pcsclite ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hidapi ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [ pcsclite ]; propagatedBuildInputs = [ openssl ]; @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DUSE_HIDAPI=1" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DNFC_LINUX=1" - ] ++ lib.optionals (stdenv.isLinux && withPcsclite) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [ "-DUSE_PCSC=1" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 4076e5325c..bbbcb81797 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext gnutls nettle libxcrypt ] - ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ApplicationServices ]; - preBuild = lib.optionalString (stdenv.isDarwin) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export MACOSX_DEPLOYMENT_TARGET=11.0 ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix index c7915ae676..490f695fc1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; buildInputs = [ eigen zlib libpng boost guile python qtbase ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; preConfigure = '' substituteInPlace studio/src/guile/interpreter.cpp \ @@ -57,7 +57,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DGUILE_CCACHE_DIR=${placeholder "out"}/${guile.siteCcacheDir}" - ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ # warning: 'aligned_alloc' is only available on macOS 10.15 or newer "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion"; }; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # No rules to install the mac app, so do it manually. mkdir -p $out/Applications cp -r studio/Studio.app $out/Applications/Studio.app diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfixposix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfixposix/default.nix index 3d451de582..3eb1dceffd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfixposix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfixposix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]; meta = with lib; { homepage = "https://github.com/sionescu/libfixposix"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix index 64928de4d4..ff08294bdb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; description = "Glib-based library for file management"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfpx/default.nix index 6f79ec1b94..82785a4d0f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfpx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Darwin gets misdetected as Windows without this - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D__unix"; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix index cfc1202445..7a59cde843 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace '-soname' '-install_name' \ --replace 'lib$(NAME).so' 'lib$(NAME).dylib' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfreefare/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfreefare/default.nix index b05ea5bbe2..90e6f29c9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfreefare/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfreefare/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; meta = with lib; { description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix index 27b23f9d54..18dab4e340 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; - buildInputs = [ libusb-compat-0_1 ] ++ lib.optionals stdenv.isDarwin [ libobjc Security IOKit ]; + buildInputs = [ libusb-compat-0_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security IOKit ]; propagatedBuildInputs = [ libusb-compat-0_1 ]; - configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode"; + configureFlags = lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix index 2f0f3b4fd0..720c376d02 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix @@ -10,7 +10,7 @@ , rsyslog }: -assert enableCapabilities -> stdenv.isLinux; +assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index ffe9f42326..ad360dab55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -11,7 +11,7 @@ , rsyslog }: -assert enableCapabilities -> stdenv.isLinux; +assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpg-error ] - ++ lib.optional stdenv.isDarwin gettext + ++ lib.optional stdenv.hostPlatform.isDarwin gettext ++ lib.optional enableCapabilities libcap; strictDeps = true; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # TODO: figure out why this is even necessary and why the missing dylib only crashes # random instead of every test - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $lib/lib cp src/.libs/libgcrypt.20.dylib $lib/lib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix index a8af4d9b48..b6a64c4b7a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # as mentioned in https://github.com/GNOME/libgda/blob/95eeca4b0470f347c645a27f714c62aa6e59f820/libgda/sqlite/README#L31, # which references the paper https://web.archive.org/web/20100610151539/http://lattice.umiacs.umd.edu/files/functions_tr.pdf # See also https://github.com/Homebrew/homebrew-core/blob/104f9ecd02854a82372b64d63d41356555378a52/Formula/libgda.rb - "--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}" + "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix index 4d315b042e..63efe54305 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: { [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] - ++ lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix index e110ceb67a..af0ae5f73a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib libssh2 openssl pcre llhttp ] ++ lib.optional withGssapi krb5 - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; doCheck = true; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index d3e85c012c..c3667d6647 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config python3 addDriverRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/GLX/Makefile.am \ --replace "-Wl,-Bsymbolic " "" substituteInPlace src/EGL/Makefile.am \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgourou/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgourou/default.nix index bfd483e5d3..ba64735f87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgourou/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgourou/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ autumnal ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index 9920a54e04..2dee6c721b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation (rec { # ./config.status[1401]: shift: (null): bad number # (See .) # Thus, re-run it with Bash. - lib.optionalString stdenv.isSunOS '' + lib.optionalString stdenv.hostPlatform.isSunOS '' ${stdenv.shell} config.status '' # ./configure errorneous decides to use weak symbols on pkgsStatic, diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix index ce0c6e14ed..c6de97101b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { glib libxml2 libsoup - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix index 42b9272115..b07051358b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" (lib.mesonBool "introspection" withIntrospection) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dc_args=-D_DARWIN_C_SOURCE" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix index d25335c891..c20a8382b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "-Dintrospection=enabled" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' NO_AT_BRIDGE=1 \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix index a43ee0986b..829de78a6a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix index c64c8e6e29..93524afabe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ curl openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; cmakeFlags = [ "-DENABLE_UDS=ON" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index 9d5db75bb1..f6a0555f34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; nativeInstallCheckInputs = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { # Musl does not support TZDIR. doInstallCheck = !stdenv.hostPlatform.isMusl; enableParallelChecking = false; - preInstallCheck = if stdenv.isDarwin then '' + preInstallCheck = if stdenv.hostPlatform.isDarwin then '' for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do for lib in $(cd lib && ls *.3.dylib); do install_name_tool -change $lib $out/lib/$lib $testexe diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix index b59887381f..9bb60501a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.enableFeature enableStatic "static") (lib.enableFeature enableShared "shared") - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; passthru = { inherit setupHooks; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix index 916d6d0ad6..bafb2fff27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix index bfe9c2a242..90c7198757 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # The above patch causes the documentation to be regenerated, so the # documentation tools are required. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ help2man texinfo ]; - buildInputs = [ libunistring ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ help2man texinfo ]; + buildInputs = [ libunistring ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; depsBuildBuild = [ buildPackages.stdenv.cc ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix index 8adc015120..023dfce86b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { libxml2 libusb1 ] ++ lib.optional avahiSupport avahi - ++ lib.optional stdenv.isLinux libaio - ++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ]; + ++ lib.optional stdenv.hostPlatform.isLinux libaio + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CFNetwork CoreServices ]; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index 0e81f32beb..88b9391d4b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { libtasn1 libusbmuxd libimobiledevice-glue - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiodbc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiodbc/default.nix index 6d6d7d4657..c059d619cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiodbc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals useGTK [ gtk2 ] - ++ lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix index 61ec0ce67d..060f6a8035 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isFreeBSD freebsd.libstdthreads; + buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD freebsd.libstdthreads; meta = with lib; { description = "Intel Processor Trace decoder library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix index f6f918c1d5..741c8d8a74 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv libintl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix index 1008037c60..2a0d722c3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - env = lib.optionalAttrs (stdenv.is32bit || stdenv.isDarwin) { + env = lib.optionalAttrs (stdenv.hostPlatform.is32bit || stdenv.hostPlatform.isDarwin) { # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] NIX_CFLAGS_COMPILE = "-Wno-error=format"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix index 4122d4f576..cc6311f024 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux libuuid - ++ lib.optional stdenv.isDarwin libossp_uuid; + ++ lib.optional stdenv.hostPlatform.isLinux libuuid + ++ lib.optional stdenv.hostPlatform.isDarwin libossp_uuid; passthru = { tests.freeswitch = freeswitch; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Foundational support for signalwire C products"; homepage = "https://github.com/signalwire/libks"; maintainers = with lib.maintainers; [ misuzu ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblastfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblastfm/default.nix index 7dcc3b0d0c..060839326b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblastfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblastfm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 449792a07e..31da8305be 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "lib" "predict" "train" ]; installPhase = '' - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' install -D liblinear.so.${soVersion} $out/lib/liblinear.${soVersion}.dylib ln -s $out/lib/liblinear.${soVersion}.dylib $out/lib/liblinear.dylib '' else '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix index 6b8c2ebeaa..f2f6497b67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Carbon AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon AppKit ]; propagatedBuildInputs = [ glib ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblxi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblxi/default.nix index 24c454d4ee..887c751ad4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblxi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblxi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libtirpc avahi ] ++ [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix index cd30b61f1c..594ba202a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.7"; + version = "0.2.9"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-zd1cAqExBywZxs3m8sss1X6ufay1DRTDN+/ZgLqlGlE="; + hash = "sha256-KTZr5UUvYKdMZfxk/+LXTt3U5uaCTCzvpWekO9kraI8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix index 6a4b0adfef..3ed85fad55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; - buildInputs = lib.optional stdenv.isDarwin cctools; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin cctools; configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmemcached/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmemcached/default.nix index 07fe854c77..053cd91be2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmemcached/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmemcached/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { # https://bugs.launchpad.net/libmemcached/+bug/1281907 # Fix building on macOS (patch from Homebrew) # https://bugs.launchpad.net/libmemcached/+bug/1245562 - patches = lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch - ++ lib.optional stdenv.isDarwin (fetchpatch { + patches = lib.optional stdenv.hostPlatform.isLinux ./libmemcached-fix-linking-with-libpthread.patch + ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8"; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix index 128975246a..6ac53d3d5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/profanity-im/libmesode/"; license = with licenses; [ gpl3Only mit]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ devhell ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmikmod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmikmod/default.nix index f3122d8ab2..6e3f7eee3c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmikmod/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmikmod/default.nix @@ -13,14 +13,14 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optional stdenv.isLinux alsa-lib - ++ optional stdenv.isDarwin CoreAudio; + ++ optional stdenv.hostPlatform.isLinux alsa-lib + ++ optional stdenv.hostPlatform.isDarwin CoreAudio; propagatedBuildInputs = - optional stdenv.isLinux libpulseaudio; + optional stdenv.hostPlatform.isLinux libpulseaudio; outputs = [ "out" "dev" "man" ]; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound"; + NIX_LDFLAGS = optionalString stdenv.hostPlatform.isLinux "-lasound"; postInstall = '' moveToOutput bin/libmikmod-config "$dev" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmilter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmilter/default.nix index a06f3d4dec..10a0986936 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmilter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmilter/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ./sharedlib.patch ./darwin.patch ]; - nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames $out/lib/libmilter.*.1 ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix index 189d2b12e5..b270b8eb56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { "-DLIBMINC_USE_SYSTEM_NIFTI=ON" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # -j1: see https://github.com/BIC-MNI/libminc/issues/110 checkPhase = '' ctest -j1 --output-on-failure diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmongocrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmongocrypt/default.nix index f45d41fed6..0c88752730 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmongocrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmongocrypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ mongoc openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix index baada92d43..13fce96373 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Otherwise clang fails with 'duplicate symbol ___sputc' - buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; + buildFlags = lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-std=gnu89"; meta = { homepage = "http://libmpeg2.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix index ea61234333..320873c979 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { configurePlatforms = [ "build" "host" ]; - makeFlags = lib.optionals (stdenv.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "MTP_HOTPLUG=${buildPackages.libmtp}/bin/mtp-hotplug" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index 49e89b9734..13128e8123 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "CC:=$(CC)" ]; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postFixup = '' chmod +x $out/lib/* diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix index 88bc909ea0..8fb983333c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "sysconfdir=/etc" ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNFC_DRIVER_PN532_I2C=OFF" "-DLIBNFC_DRIVER_PN532_SPI=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix index 3578441dd6..0270050cd0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!withNgshared) [ libXaw libXext - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix index b7dddd1667..ec5f6d8924 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; - buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = { description = "Opensource implementation of the Open Financial eXchange specification"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liboil/default.nix index 4b112b70e7..2abbaa66f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liboil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liboil/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors - configureFlags = lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--build=x86_64"; + configureFlags = lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--build=x86_64"; # fixes a cast in inline asm: easier than patching - buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; + buildFlags = lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-fheinous-gnu-extensions"; meta = with lib; { description = "Library of simple functions that are optimized for various CPUs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix index 236b302606..2d8cec21b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ (if stdenv.isDarwin then [ + ] ++ (if stdenv.hostPlatform.isDarwin then [ Accelerate AGL Cocoa diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopenshot/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopenshot/default.nix index 0d83fa659e..231b0cd109 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopenshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopenshot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Darwin requires both Magick++ and MagickCore for a successful linkage ./0001-link-magickcore.diff ]; @@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtmultimedia zeromq - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix index a283df1bba..267829d2ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "ac_cv_va_copy=yes" - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; patches = [ ./shtool.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix index 7256e49226..bfc2e3af7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation rec { hash = "sha256-7RmgOD+tcuOtQ1/SOdfNgNZJFrhyaVUBWdIORxYOvl8="; }; - buildInputs = lib.optionals stdenv.isLinux [ libnl ] + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libnl ] ++ lib.optionals withRemote [ libxcrypt ]; nativeBuildInputs = [ flex bison ] - ++ lib.optionals stdenv.isLinux [ pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] ++ lib.optionals withBluez [ bluez.dev ]; # We need to force the autodetection because detection doesn't # work in pure build environments. configureFlags = [ - "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" - ] ++ lib.optionals stdenv.isDarwin [ + "--with-pcap=${if stdenv.hostPlatform.isLinux then "linux" else "bpf"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-universal" ] ++ lib.optionals withRemote [ "--enable-remote" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix index 5e23947ed3..616b5de5de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { boost icu protobuf - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix index 3aeb79b46a..885c904433 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uLRRlJiQIqeewTF/ZKKnWxVRsqVb6gb2dwTLKi5GkLA="; }; - patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./fix-on-osx.patch ]; # necessary to build on FreeBSD native pending inclusion of # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 0ffa7b2828..159037bec8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead (lib.mesonEnable "vk-proc-addr" vulkanSupport) (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix index 11e3fb3160..57b75a949b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" - + lib.optionalString stdenv.isFreeBSD '' + + lib.optionalString stdenv.hostPlatform.isFreeBSD '' sed -i 1i'int feenableexcept(int __mask);' contrib/libtests/pngvalid.c ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix index fd10ccc537..ec2234bb9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase libGLU ] - ++ lib.optional stdenv.isDarwin AGL; + ++ lib.optional stdenv.hostPlatform.isDarwin AGL; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraqm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraqm/default.nix index 98769f2e37..9899c70b80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libraqm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libraqm/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libraqm"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "HOST-Oman"; repo = "libraqm"; rev = "v${version}"; - sha256 = "sha256-H9W+7Mob3o5ctxfp5UhIxatSdXqqvkpyEibJx9TO7a8="; + sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4="; }; buildInputs = [ freetype harfbuzz fribidi ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librasterlite2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librasterlite2/default.nix index de9fa02d44..a1655dc6a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librasterlite2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librasterlite2/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { proj sqlite zstd - ] ++ lib.optional stdenv.isDarwin ApplicationServices; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ApplicationServices; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix index fa419830f3..ebdf2ec4d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 6eb06a1ebe..aff1fc1a1d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp ${printVersion} build-aux/git-version-gen ''; - preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && enablePython) '' # prevent configure picking up stack_size from distutils.sysconfig export PYTHON_EXTRA_LDFLAGS=" " ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional (!enablePython) "--disable-python"; # FAIL: alive.test - doCheck = !stdenv.isLinux; + doCheck = !stdenv.hostPlatform.isLinux; # the "xmlsuite" test requires the libxml2 c library as well as the python module nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libremidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libremidi/default.nix index 48014bea07..6717b97203 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libremidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libremidi/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreFoundation CoreMIDI diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix index 9629c0e961..f6cf4a6e62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -8,7 +8,7 @@ }: let - ldLibPathEnvName = if stdenv.isDarwin + ldLibPathEnvName = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix index d9dc209a71..4a995cbbe8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ KarlJoad ]; platforms = platforms.all; # ./rsb_common.h:56:10: fatal error: 'omp.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index e8426b97ce..932d0f19a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { pango libintl vala # for share/vala/Makefile.vapigen - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation libobjc @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature withIntrospection "vala") "--enable-always-build-tests" - ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-Bsymbolic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { # librsvg only links Foundation, but it also requiers libobjc. The Framework.tbd in the 11.0 SDK # reexports libobjc, but the one in the 10.12 SDK does not, so link it manually. - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { NIX_LDFLAGS = "-lobjc"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix index dabb5e62e4..a8366f8a92 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; meta = with lib; { description = "Highly optimized library for processing RAW images"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix index 45cd9d091d..ec4da5a347 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ] - ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; + ++ optionals stdenv.hostPlatform.isDarwin [ ApplicationServices CoreServices ]; configureFlags = [ "--disable-fftw" ]; outputs = [ "dev" "out" ]; - postConfigure = optionalString stdenv.isDarwin '' + postConfigure = optionalString stdenv.hostPlatform.isDarwin '' # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsbsms/common.nix b/third_party/nixpkgs/pkgs/development/libraries/libsbsms/common.nix index f206f68de4..7215c23667 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsbsms/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsbsms/common.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Fix buidling on platforms other than x86 (substituteAll { src = ./configure.patch; - msse = lib.optionalString stdenv.isx86_64 "-msse"; + msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libscrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libscrypt/default.nix index 6adc2124a3..4f8f0deba9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libscrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libscrypt/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE="; }; - buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= LDFLAGS_EXTRA= CFLAGS_EXTRA="; + buildFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS= LDFLAGS_EXTRA= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; - installTargets = lib.optional stdenv.isDarwin "install-osx"; + installTargets = lib.optional stdenv.hostPlatform.isDarwin "install-osx"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix index d0b1515d0b..8ae0754a0a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "gtk_doc" withIntrospection) ]; - doCheck = stdenv.isLinux && withIntrospection; + doCheck = stdenv.hostPlatform.isLinux && withIntrospection; separateDebugInfo = true; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix index 58896c3e2b..e9f014381c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"; nativeBuildInputs = [ meson diff --git a/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix index 38f7d1c5d9..9c61d6a407 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libserdes"; - version = "7.7.0"; + version = "7.7.1"; src = fetchFromGitHub { owner = "confluentinc"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix index 79f46ffca1..0b3314d9b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.isLinux udev - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; meta = with lib; { description = "Cross-platform shared library for serial port access"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix index 17783999b5..f449c5e1c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { "-Ddemos=true" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index a1ffdae6bb..ad3ab58b0e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; buildInputs = [ flac lame libmpg123 libogg libopus libvorbis ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle - preConfigure = lib.optionalString stdenv.isDarwin + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix index 044450c182..a9de633d46 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; - separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; + separateDebugInfo = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix index a0f5cd610e..df40a06339 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -10,7 +10,7 @@ , zchunk , zstd , expat -, withRpm ? !stdenv.isDarwin +, withRpm ? !stdenv.hostPlatform.isDarwin , rpm , db , withConda ? true diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoundio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoundio/default.nix index b7de8bf04e..c4b5016282 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoundio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoundio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjack2 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] - ++ lib.optional stdenv.isDarwin AudioUnit; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib ] + ++ lib.optional stdenv.hostPlatform.isDarwin AudioUnit; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DBUILD_TESTS=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-strict-prototypes"; meta = with lib; { description = "Cross platform audio input and output"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 4d5f30cf0b..b0588373de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { glib.out brotli libnghttp2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsysprof-capture ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { (lib.mesonEnable "docs" withIntrospection) (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "sysprof" stdenv.isLinux) + (lib.mesonEnable "sysprof" stdenv.hostPlatform.isLinux) (lib.mesonEnable "vapi" withIntrospection) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index e92c59bc2f..a88cd93553 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libpsl glib.out brotli - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsysprof-capture ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dsysprof=disabled" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix index 98d184ae70..8eeec2dbfe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { proj sqlite zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/mod_spatialite.{so,dylib} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix index d67b12a726..6a60bdb7f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"; }; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libX11 ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix index abda8137f5..9b45ffb58c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VoiqSmhVR9cXSoo3PqnY7pJ+dm48wwK97jRSPCxdbBE="; }; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix index 9d58109fa8..1fd5141c90 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; installPhase = let libSuff = stdenv.hostPlatform.extensions.sharedLibrary; soVersion = "3"; - libName = if stdenv.isDarwin then "libsvm.${soVersion}${libSuff}" else "libsvm${libSuff}.${soVersion}"; + libName = if stdenv.hostPlatform.isDarwin then "libsvm.${soVersion}${libSuff}" else "libsvm${libSuff}.${soVersion}"; in '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix index 3c630bac63..069d8706e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texinfo perl ]; doCheck = true; - preCheck = if stdenv.isDarwin then + preCheck = if stdenv.hostPlatform.isDarwin then "export DYLD_LIBRARY_PATH=`pwd`/lib/.libs" else null; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix index 2488a5bbb0..551bfed8fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { libticables2 xz bzip2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix index cd198dac30..149f5e65fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libkate pango cairo ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; meta = { homepage = "https://code.google.com/archive/p/libtiger/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix index 2a32900040..568d1a22c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin # upgrades to a newer SDK. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtommath/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtommath/default.nix index 2501bc827f..56225f96de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtommath/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtommath/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makefile = "makefile.shared"; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-DTARGET_OS_IPHONE=0"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix index e48748308b..1a3a89a2d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { done ''; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-Wno-error=gnu-folding-constant" ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 1b54ea948d..12f2105931 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = !stdenv.isi686; # tests fail on i686 + doCheck = !stdenv.hostPlatform.isi686; # tests fail on i686 meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix index a798977b1f..7719798634 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let - backend = if stdenv.isDarwin then "darwin" else "unix"; + backend = if stdenv.hostPlatform.isDarwin then "darwin" else "unix"; in stdenv.mkDerivation rec { @@ -15,20 +15,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - propagatedBuildInputs = lib.optional stdenv.isLinux gtk3 - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt ''; installPhase = '' mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mv ./out/libui.so.0 $out/lib/ ln -s $out/lib/libui.so.0 $out/lib/libui.so - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mv ./out/libui.A.dylib $out/lib/ ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib '' + '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --subst-var-by out $out \ --subst-var-by version "${version}" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix index 4fe42dad6c..7d58b78149 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - if stdenv.isDarwin then [ AppKit ApplicationServices Carbon ] + if stdenv.hostPlatform.isDarwin then [ AppKit ApplicationServices Carbon ] else [ libX11 libxkbcommon diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix index d73bed773d..c53196afe4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "-flto" "" \ --replace "AppleClang" "Clang" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix index 13ffffe6aa..abf5f0df25 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - buildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix index bd8561e0e8..f03ae09b28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , doxygen , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, enableUdev ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic , udev , libobjc , IOKit @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withDocs [ doxygen ]; propagatedBuildInputs = lib.optional enableUdev udev ++ - lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; dontDisableStatic = withStatic; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusbsio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusbsio/default.nix index 090683898a..21c7e3f139 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libusbsio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libusbsio/default.nix @@ -28,17 +28,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ libusb1 - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit - ]) ++ lib.optionals stdenv.isLinux [ + ]) ++ lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal # libudev ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix index a4254921e1..8d1d36344d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { "tcp_bind6_error_addrinuse" "tcp_bind_error_addrinuse_listen" # https://github.com/libuv/libuv/pull/4075#issuecomment-1935572237 "thread_priority" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should # be much more robust. @@ -71,10 +71,10 @@ stdenv.mkDerivation (finalAttrs: { "fs_event_watch_dir_recursive" "fs_event_watch_file" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" "process_priority" "udp_create_early_bad_bind" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # fail on macos < 10.15 (starting in libuv 1.47.0) "fs_write_alotof_bufs_with_offset" "fs_write_multiple_bufs" "fs_read_bufs" - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # I observe this test failing with some regularity on ARMv7: # https://github.com/libuv/libuv/issues/1871 "shutdown_close_pipe" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/1.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/1.nix index 1a9c7309e5..15e4d0a9e8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/1.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # TODO: share libs between minimal and !minimal - perhaps just symlink them # Add FHS paths for non-NixOS applications. - configureFlags = lib.optionals stdenv.isLinux [ "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] + configureFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index 8a41c60b16..f88404682b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libX11 libXext libXfixes wayland libffi libGL ]; - mesonFlags = lib.optionals stdenv.isLinux [ + mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [ # Add FHS and Debian paths for non-NixOS applications "-Ddriverdir=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvdpau/default.nix index 8c1c3b7c5e..75c6199507 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvdpau/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvdpau/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; - mesonFlags = lib.optionals stdenv.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" ]; + mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lX11"; meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/VDPAU/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index b01a9a788b..c750d2a255 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvirt libxml2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 56b0b0a390..f6e5807f69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -72,14 +72,14 @@ , enableIscsi ? false , openiscsi , libiscsi -, enableXen ? stdenv.isLinux && stdenv.isx86_64 +, enableXen ? stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 , xen -, enableZfs ? stdenv.isLinux +, enableZfs ? stdenv.hostPlatform.isLinux , zfs }: let - inherit (stdenv) isDarwin isLinux isx86_64; + inherit (stdenv.hostPlatform) isDarwin isLinux isx86_64; binPath = lib.makeBinPath ([ dnsmasq ] ++ lib.optionals isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix index a6c78c3262..e6b5bf4acb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libpng ] ++ lib.optionals withSystemd [ systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix index ef0929a841..4f6c91d65c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -43,7 +43,7 @@ }: let - inherit (stdenv) is64bit isMips isDarwin isCygwin; + inherit (stdenv.hostPlatform) is64bit isMips isDarwin isCygwin; inherit (lib) enableFeature optional optionals; # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) @@ -66,8 +66,8 @@ let kernel = # Build system doesn't understand BSD, so pretend to be Linux. - /**/ if stdenv.isBSD then "linux" - else if stdenv.isDarwin then "darwin${darwinVersion}" + /**/ if stdenv.hostPlatform.isBSD then "linux" + else if stdenv.hostPlatform.isDarwin then "darwin${darwinVersion}" else stdenv.hostPlatform.parsed.kernel.name; isGeneric = @@ -76,7 +76,7 @@ let || stdenv.hostPlatform.isRiscV; target = - /**/ if (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then + /**/ if (stdenv.hostPlatform.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") else null; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwnck/2.nix b/third_party/nixpkgs/pkgs/development/libraries/libwnck/2.nix index bc5a89dc12..890b1a7651 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwnck/2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwnck/2.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ johnazoidberg ]; # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found # #include - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix index 1abefa8f43..69b4ec4a32 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$(out)" - ] ++ lib.optional (!stdenv.isi686) "BACKEND=x86emu"; + ] ++ lib.optional (!stdenv.hostPlatform.isi686) "BACKEND=x86emu"; preBuild = '' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index 6994398eaa..9a0ebd6d59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -14,7 +14,7 @@ # To enable the "interactive-wayland" subcommand of xkbcli. This is the # wayland equivalent of `xev` on X11. , xorg -, withWaylandTools ? stdenv.isLinux +, withWaylandTools ? stdenv.hostPlatform.isLinux , wayland , wayland-protocols , wayland-scanner diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix index 3fa295279f..b6a217d9fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./honor-XKB_CONFIG_ROOT.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://gitlab.freedesktop.org/archived-projects/libxklavier/-/commit/1387c21a788ec1ea203c8392ea1460fc29d83f70.patch"; sha256 = "sha256-fyWu7sVfDv/ozjhLSLCVsv+iNFawWgJqHUsQHHSkQn4="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 82176e4fab..66f16b11a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { gettext ] ++ lib.optionals (pythonSupport && python?isPy3 && python.isPy3) [ ncurses - ] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ libintl ]; propagatedBuildInputs = [ findXMLCatalogs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals icuSupport [ icu @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && stdenv.hostPlatform.libc != "musl"; - preCheck = lib.optional stdenv.isDarwin '' + preCheck = lib.optional stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix index f86c6068e2..3409264906 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxml2.dev libxcrypt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ] ++ lib.optionals pythonSupport [ libxml2.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix index eeb9dcf71b..3276354240 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; mainProgram = "libxsmm_gemm_generator"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix index 68d3b5ff27..1062d527fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; # NEON does not work on aarch64, we disable it - cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; buildInputs = [ libjpeg ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix index 1f7e8fdf2c..1e9a95bc4e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { scikit-build-core ]; - env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); + env.CXXFLAGS = toString (lib.optional stdenv.hostPlatform.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); postBuild = '' pushd ../api/python diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix index 4aa28f6461..934b0cab5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] ++ lib.optionals openclSupport [ opencl-headers ocl-icd boost ] ++ lib.optionals mpiSupport [ openmpi ] ++ lib.optionals hdfsSupport [ hadoop ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix index ed199914e6..f9258f9913 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" diff --git a/third_party/nixpkgs/pkgs/development/libraries/linenoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/linenoise/default.nix index a525a3da9a..13891d08f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/linenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/linenoise/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ validatePkgConfig ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix index 6667aa4882..0700b645e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; }; - configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; nativeBuildInputs = [ autoreconfHook ] - ++ lib.optionals stdenv.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; meta = { homepage = "https://liquidsdr.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix index 7c907e9ef7..69100b9dff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] - ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so" + ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so" ++ lib.optionals stdenv.hostPlatform.isWindows [ "SOEXT=.dll" "BINEXT=.exe" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix index 21dd9db279..e949cd57e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix index 7f65505793..93bcb8a624 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix @@ -4,7 +4,6 @@ , cmake , nix-update-script , testers -, magic-enum }: stdenv.mkDerivation rec{ pname = "magic-enum"; @@ -29,7 +28,6 @@ stdenv.mkDerivation rec{ passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = magic-enum; }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix index ed7406cc52..1381a48315 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ libetpan cyrus_sasl libctemplate libuchardet html-tidy libxml2 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib icu libuuid - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { --replace buffio.h tidybuffio.h substituteInPlace src/core/basetypes/MCString.cpp \ --replace "xmlErrorPtr" "const xmlError *" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace src/core/basetypes/MCICUTypes.h \ --replace "__CHAR16_TYPE__ UChar" "char16_t UChar" ''; - cmakeFlags = lib.optionals (!stdenv.isDarwin) [ + cmakeFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { cp src/libMailCore.* $out/lib ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' ( cd unittest diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapnik/catch2-src.patch b/third_party/nixpkgs/pkgs/development/libraries/mapnik/catch2-src.patch deleted file mode 100644 index 04c6f7add2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/mapnik/catch2-src.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 0705ddce1..771291b88 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -7,8 +7,7 @@ include(FetchContent) - - FetchContent_Declare( - Catch2 -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG v2.13.7) -+ SOURCE_DIR @catch2_src@) - FetchContent_MakeAvailable(Catch2) - - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0") diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix index c41ebde024..2038a185ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix @@ -1,29 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildPackages -, cmake -, pkg-config -, substituteAll -, boost -, cairo -, freetype -, gdal -, harfbuzz -, icu -, libjpeg -, libpng -, libtiff -, libwebp -, libxml2 -, proj -, python3 -, sqlite -, zlib -, catch2 -, postgresql -, protozero -, sparsehash +{ + lib, + stdenv, + fetchFromGitHub, + buildPackages, + cmake, + pkg-config, + boost, + cairo, + freetype, + gdal, + harfbuzz, + icu, + libjpeg, + libpng, + libtiff, + libwebp, + libxml2, + proj, + python3, + sqlite, + zlib, + catch2, + postgresql, + protozero, + sparsehash, }: stdenv.mkDerivation rec { @@ -56,18 +56,16 @@ stdenv.mkDerivation rec { # Upstream HarfBuzz wants to drop CMake support anyway. # See discussion: https://github.com/mapnik/mapnik/issues/4265 ./cmake-harfbuzz.patch - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./catch2-src.patch; - catch2_src = catch2.src; - }) # Account for full paths when generating libmapnik.pc ./export-pkg-config-full-paths.patch # Use 'sparsehash' package. ./use-sparsehash-package.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ boost @@ -99,7 +97,9 @@ stdenv.mkDerivation rec { # Use 'protozero' package. (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) # macOS builds fail when using memory mapped file cache. - (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.isDarwin)) + (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.hostPlatform.isDarwin)) + # don't try to download sources for catch2, use our own + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CATCH2" "${catch2.src}") ]; doCheck = true; @@ -122,7 +122,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; - maintainers = with maintainers; [ hrdinka hummeltech ]; + maintainers = with maintainers; [ + hrdinka + hummeltech + ]; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix index 63e9861421..c0b068499c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nodejs ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/libraries/medfile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/medfile/default.nix index 8c07b2aad3..296317788d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/medfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/medfile/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/*/*.c --replace-warn \ "#if H5_VERS_MINOR > 12" \ "#if H5_VERS_MINOR > 14" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Some medfile test files #define _a, which # breaks system header files that use _a as a function parameter substituteInPlace tests/c/*.c \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/memorymapping/default.nix b/third_party/nixpkgs/pkgs/development/libraries/memorymapping/default.nix index 91af205f03..1b3c17bc4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/memorymapping/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/memorymapping/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { # Uses BSD-style funopen() to implement glibc-style fmemopen(). # Add more BSDs if you need to. platforms = platforms.darwin; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index 138e7f247c..bbcc0bb99a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - mesonFlags = lib.optionals stdenv.isDarwin [ + mesonFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-Dgl_provider=gl" # glvnd is default ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index 94a72143a7..80eacadd87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -55,13 +55,13 @@ "svga" # VMWare virtualized GPU "virgl" # QEMU virtualized GPU (aka VirGL) "zink" # generic OpenGL over Vulkan, experimental - ] ++ lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [ "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) "lima" # ARM Mali 4xx "panfrost" # ARM Mali Midgard and up (T/G series) "vc4" # Broadcom VC4 (Raspberry Pi 0-3) - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "tegra" # Nvidia Tegra SoCs "v3d" # Broadcom VC5 (Raspberry Pi 4) ] ++ lib.optionals stdenv.hostPlatform.isx86 [ @@ -78,7 +78,7 @@ # QEMU virtualized GPU (aka VirGL) # Requires ATOMIC_INT_LOCK_FREE == 2. "virtio" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) "imagination-experimental" # PowerVR Rogue (currently N/A) @@ -203,7 +203,7 @@ in stdenv.mkDerivation { # Enable Intel RT stuff when available (lib.mesonBool "install-intel-clc" true) - (lib.mesonEnable "intel-rt" stdenv.isx86_64) + (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") # Clover, old OpenCL frontend diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 29fd2b662e..e8259541c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isStatic; preCheck = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnv = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}" ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = let rel = lib.versions.majorMinor version; - suffix = if stdenv.isLinux then "${soext}.${rel}" else ".${rel}${soext}"; + suffix = if stdenv.hostPlatform.isLinux then "${soext}.${rel}" else ".${rel}${soext}"; in '' # first, move headers and cmake files, that's easy mkdir -p $dev/lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix index 668b2fdf10..33b6e1b8ca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch"; sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI="; }) - ] ++ lib.optional stdenv.isAarch64 ./narrowing.patch; + ] ++ lib.optional stdenv.hostPlatform.isAarch64 ./narrowing.patch; meta = with lib; { description = "MIME handling library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix index ebb0f28897..3438cb9290 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # remove the -arch flags which are set by default in the build - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--with-archflags=\"-mmacosx-version-min=10.14\"" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix index fde280137e..b15997cb43 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DMZ_LIB_SUFFIX='-ng'" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # missing header file "-DMZ_LIBCOMP=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix index 2ca4e6b46d..c3fa572049 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -23,7 +23,7 @@ , darwin , cudaSupport ? config.cudaSupport , cudaPackages ? { } -, enableJackrack ? stdenv.isLinux +, enableJackrack ? stdenv.hostPlatform.isLinux , glib , ladspa-sdk , ladspaPlugins @@ -31,7 +31,7 @@ , python3 , swig , qt ? null -, enableSDL1 ? stdenv.isLinux +, enableSDL1 ? stdenv.hostPlatform.isLinux , SDL , enableSDL2 ? true , SDL2 @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.26.0"; + version = "7.28.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-MC7D7bgguDFZi8Dyip1wAa2zxxkpLupl05xFiDc8Byw="; + hash = "sha256-rXxjHXXIFFggd2v9ZlNBs0XUDmvJxLvR2JfGkTxDYEA="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { rubberband sox vid-stab - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Accelerate ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart diff --git a/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix index b881a527fb..fc967445d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.27.6"; + version = "1.28.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-771DZ+8cr0iHHcs4TZVEkTP6qWK1bMzOxlG4OS14t28="; + hash = "sha256-cfet+A2i33iHbVRouPS4Ul8TmHolrcIMTRba6Olqfeg="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { icu cyrus_sasl snappy - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix index 5659043e2f..415e7ca96e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix @@ -10,7 +10,7 @@ , darwin }: -let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in +let stdenv = if pkgs.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in stdenv.mkDerivation (finalAttrs: { pname = "mongocxx"; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mongoc openssl cyrus_sasl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" diff --git a/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix index d2cd26f38b..55a4ec2602 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { SDL2 fftw gtest - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.libobjc ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libepoxy ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-framework OpenGL"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix index a4716a47bb..4af559b507 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran python3 ]; buildInputs = [ perl openssh hwloc ] - ++ lib.optional (!stdenv.isDarwin) ch4backend + ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend ++ lib.optional pmixSupport pmix - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation; # test_double_serializer.test fails on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preFixup = '' # Ensure the default compilers are the ones mpich was built with diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix index 26f22fd996..9857317ea1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-cxx" ] - ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ]; meta = { description = "Highly optimised library for bignum arithmetic forked from GMP"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mvfst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mvfst/default.nix index 0a784fff33..7c9d2e8da4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mvfst/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mvfst/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix index c785e640cc..d52eadbba6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { ois ] ++ lib.optionals withOgre [ ogre - ] ++ lib.optionals (!withOgre && stdenv.isLinux) [ + ] ++ lib.optionals (!withOgre && stdenv.hostPlatform.isLinux) [ libGL libGLU - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix index ae82d0490b..f431133c25 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "-DNCNN_PYTHON=0" # Should be an attribute ] # Requires setting `Vulkan_LIBRARY` on Darwin. Otherwise the build fails due to missing symbols. - ++ lib.optionals stdenv.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ vulkan-headers vulkan-loader glslang opencv protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix index 1b5dced4e8..3affdfbf57 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/bin/mv" "${coreutils}/bin/mv" ''; - makeFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix index 95b427a7ba..2a4e89d7f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]); # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: - CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; - buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; + buildInputs = lib.optional (mouseSupport && stdenv.hostPlatform.isLinux) gpm; preConfigure = '' export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig" @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR" ) '' - + lib.optionalString stdenv.isSunOS '' + + lib.optionalString stdenv.hostPlatform.isSunOS '' sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \ -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ configure @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; postFixup = let - abiVersion-extension = if stdenv.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in + abiVersion-extension = if stdenv.hostPlatform.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix index b691f2b10a..78a4f808b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -3,10 +3,10 @@ let versionJSON = lib.importJSON ./version.json; ndiPlatform = - if stdenv.isAarch64 then "aarch64-rpi4-linux-gnueabi" - else if stdenv.isAarch32 then "arm-rpi2-linux-gnueabihf" - else if stdenv.isx86_64 then "x86_64-linux-gnu" - else if stdenv.isi686 then "i686-linux-gnu" + if stdenv.hostPlatform.isAarch64 then "aarch64-rpi4-linux-gnueabi" + else if stdenv.hostPlatform.isAarch32 then "arm-rpi2-linux-gnueabihf" + else if stdenv.hostPlatform.isx86_64 then "x86_64-linux-gnu" + else if stdenv.hostPlatform.isi686 then "i686-linux-gnu" else throw "unsupported platform for NDI SDK"; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix index 3185ff4158..6bff584dda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-SHLhL4Alct7dSwL4cAZYFLLVFB99va9wju2rgmtRpYo="; }; - patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; + patches = optionals stdenv.hostPlatform.isDarwin [ ./darwin-fix-configure.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl bash] diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix index 08f812a272..606e8a86b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = lib.licenses.free; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix b/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix index 0edc956eee..d9a80768bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; buildInputs = [ netcdf hdf5 curl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CoreServices SystemConfiguration ]; - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-F${CoreServices}/Library/Frameworks" "-F${SystemConfiguration}/Library/Frameworks" ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix index 44afdf4551..b1cf1f5f6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { # /usr/include/mp.h from OpenSolaris. See # # for details. - ++ lib.optional stdenv.isSunOS "--with-include-path=${gmp.dev}/include"; + ++ lib.optional stdenv.hostPlatform.isSunOS "--with-include-path=${gmp.dev}/include"; - doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin); + doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.hostPlatform.isDarwin); enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix index 15a8347098..d8adcf63b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { unset CPP ''; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-nls" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libnewt.so.${version} $out/lib/libnewt.so.${version} install_name_tool -change libnewt.so.${version} $out/lib/libnewt.so.${version} $out/bin/whiptail ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index fbe3e2a92f..19265cbe16 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { (lib.enableFeature enableHttp3 "http3") ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-faligned-allocation" ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 2a264dbe6c..a325385601 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index 8e17a3394d..aa5ebc6fbb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libev nghttp3 quictls - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ] ++ lib.optional withJemalloc jemalloc; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index 1cf06ecb83..31f69e8219 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ cunit ] - ++ lib.optional stdenv.isDarwin ncurses; + ++ lib.optional stdenv.hostPlatform.isDarwin ncurses; passthru.tests = knot-dns.passthru.tests; # the only consumer so far diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix index 2fae17a232..4995d98adc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o="; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildInputs = [ octave ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix index 586c4ddb94..efea4a4cc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = '' cd nspr - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace '@executable_path/' "$out/lib/" substituteInPlace configure.in --replace '@executable_path/' "$out/lib/" ''; @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-optimize" "--disable-debug" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; postInstall = '' find $out -name "*.a" -delete moveToOutput share "$dev" # just aclocal ''; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix index 7ef488cca4..9e54ddda86 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { --enable-libpkix \ -j $NIX_BUILD_CORES \ ${lib.optionalString enableFIPS "--enable-fips"} \ - ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "--clang"} \ ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} runHook postBuild @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do libfile="$out/lib/lib$libname${stdenv.hostPlatform.extensions.sharedLibrary}"'' + - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then '' DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '' else '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix index 9bec1886ab..378ebf54c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix index e04d2ae435..e1726a874f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; buildInputs = [ libgcrypt libgpg-error libksba zlib ] - ++ lib.optional stdenv.isDarwin gettext; + ++ lib.optional stdenv.hostPlatform.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev diff --git a/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix index b8dea0f366..34dd82c150 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_MULTIPLE_TEST=ON" ]; - doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isStatic; + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic; postInstall = '' substituteInPlace $out/share/NumCpp/cmake/NumCppConfig.cmake \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix index 54e821b178..10b44bdac5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://oatpp.io/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix index 8b42665414..2906c34283 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-uode3RZFcJWHle6qcPFIU7/DTMmHH4rd6NpH4SvVRnk="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.GLUT ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix index 92b943dbdf..831c8a4e2a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation { sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ oracle-instantclient ] - ++ lib.optionals stdenv.isLinux [ libaio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ]; dontPatchELF = true; makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; postFixup = '' - ${lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.hostPlatform.isLinux) '' patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} - ${lib.optionalString (stdenv.isDarwin) '' + ${lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix index a77529a427..0643fabdd8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -74,7 +74,7 @@ let ois pugixml zziplib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libglut libGL libGLU @@ -88,7 +88,7 @@ let libXt libXxf86vm xorgproto - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optionals withNvidiaCg [ nvidia_cg_toolkit @@ -97,7 +97,7 @@ let cmakeFlags = [ (lib.cmakeBool "OGRE_BUILD_DEPENDENCIES" false) (lib.cmakeBool "OGRE_BUILD_SAMPLES" withSamples) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false) ]; @@ -112,11 +112,11 @@ let in { ogre_14 = common { - version = "14.2.6"; - hash = "sha256-kxvrRigSe6sPa3lAH+6zKTY4YEU9javlKHK8Zf6jxZE="; - # https://github.com/OGRECave/ogre/blob/v14.2.5/Components/Overlay/CMakeLists.txt - imguiVersion = "1.90.4"; - imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; + version = "14.3.0"; + hash = "sha256-SQ0Ij04W/KgonHDLFEPFDhXb/TDkT8I6W8J7hz3gtrg="; + # https://github.com/OGRECave/ogre/blob/v14.3.0/Components/Overlay/CMakeLists.txt + imguiVersion = "1.91.2"; + imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI="; }; ogre_13 = common { diff --git a/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix index 0a384b03bb..435509dee2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa IOKit Kernel ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix index b7a75ad6d1..06f980e718 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoVendorDir = "vendor"; doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' cp -r include $out diff --git a/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix index 6002ea4646..9360b0fdd1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3; maintainers = with maintainers; [ lurkki ]; # Darwin build fails due to hfst not being found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index bb344664e6..9ac43cc4b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -149,7 +149,7 @@ effectiveStdenv.mkDerivation rec { numpy pybind11 packaging - ]) ++ lib.optionals effectiveStdenv.isDarwin [ + ]) ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ Foundation libiconv ] ++ lib.optionals cudaSupport (with cudaPackages; [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix index 496b7ac60f..15a33af177 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, removeReferencesTo -, alsaSupport ? !stdenv.isDarwin, alsa-lib -, dbusSupport ? !stdenv.isDarwin, dbus -, pipewireSupport ? !stdenv.isDarwin, pipewire -, pulseSupport ? !stdenv.isDarwin, libpulseaudio +, alsaSupport ? !stdenv.hostPlatform.isDarwin, alsa-lib +, dbusSupport ? !stdenv.hostPlatform.isDarwin, dbus +, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire +, pulseSupport ? !stdenv.hostPlatform.isDarwin, libpulseaudio , CoreServices, AudioUnit, AudioToolbox }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ lib.optional dbusSupport dbus ++ lib.optional pipewireSupport pipewire ++ lib.optional pulseSupport libpulseaudio - ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit AudioToolbox ]; cmakeFlags = [ # Automatically links dependencies without having to rely on dlopen, thus diff --git a/third_party/nixpkgs/pkgs/development/libraries/openbsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openbsm/default.nix index f30fcac869..32d7bf0743 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openbsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openbsm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; - patches = lib.optionals stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./bsm-add-audit_token_to_pid.patch ]; preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index a09cacaf39..e9f3e0794d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libXext libXmu libXi - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix index 341c3f3ecf..a4d2f115cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix @@ -73,7 +73,7 @@ let # fix not be able to find clang from PATH substituteInPlace cl_headers/CMakeLists.txt \ --replace " NO_DEFAULT_PATH" "" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Uses linker flags that are not supported on Darwin. sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt substituteInPlace CMakeLists.txt \ @@ -107,6 +107,6 @@ stdenv.mkDerivation { maintainers = [ ]; platforms = platforms.all; # error: invalid value 'CL3.0' in '-cl-std=CL3.0' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencollada/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencollada/default.nix index 6ecb76c0ee..67f18a4a27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencollada/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencollada/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); propagatedBuildInputs = [ libxml2 pcre ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Drop blanket -Werror as it tends to fail on newer toolchain for # minor warnings. In this case it was gcc-13 build failure. substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ --replace math.h cmath ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix index 63098028fc..7d1839163e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # TODO: Investigate whether git can be dropped: It's only used to apply patches nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.isDarwin boost; + buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.hostPlatform.isDarwin boost; postPatch = '' substituteInPlace src/core/CMakeLists.txt --replace "-Werror" "" @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { "-DUSE_EXTERNAL_TINYXML=ON" # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" - ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DOCIO_USE_BOOST_PTR=ON" ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF" - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; postInstall = '' moveToOutput bin "$bin" diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 3e9302e025..76d2b06150 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ./line-numbers.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # these tests don't like being run headless on darwin. no builtin # way of skipping tests so this is what we're reduced to. substituteInPlace tests/cpu/Config_tests.cpp \ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # precision issues on non-x86 - doCheck = stdenv.isx86_64; + doCheck = stdenv.hostPlatform.isx86_64; # Tends to fail otherwise. enableParallelChecking = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencsg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencsg/default.nix index 6ac83dfa7d..5aea0da273 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencsg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencsg/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ glew ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL libglut libXmu libXext libX11 ] - ++ lib.optional stdenv.isDarwin GLUT; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut libXmu libXext libX11 ] + ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; doCheck = false; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' install -D copying.txt "$out/share/doc/opencsg/copying.txt" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix index e4b6110e1c..c8cc99b3f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/OpenSC/openct/"; license = licenses.lgpl21; description = "Drivers for several smart card readers"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index cca9e8ae1c..3d5c0ac870 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -26,7 +26,7 @@ , libtiff , enableWebP ? true , libwebp -, enableEXR ? !stdenv.isDarwin +, enableEXR ? !stdenv.hostPlatform.isDarwin , openexr , ilmbase , enableJPEG2000 ? true @@ -35,7 +35,7 @@ , eigen , enableBlas ? true , blas -, enableVA ? !stdenv.isDarwin +, enableVA ? !stdenv.hostPlatform.isDarwin , libva , enableContrib ? true @@ -97,6 +97,12 @@ }@inputs: let + inherit (lib.attrsets) mapAttrsToList optionalAttrs; + inherit (lib.lists) last optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) cmakeBool cmakeFeature cmakeOptionType concatStrings concatStringsSep optionalString; + inherit (lib.trivial) flip; + version = "4.9.0"; # It's necessary to consistently use backendStdenv when building with CUDA @@ -228,26 +234,23 @@ let }; # See opencv/cmake/OpenCVDownload.cmake - installExtraFiles = extra: '' - mkdir -p "${extra.dst}" - '' + lib.concatStrings (lib.flip lib.mapAttrsToList extra.files (name: md5: '' - ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" + installExtraFiles = {dst, files, src, ...}: '' + mkdir -p "${dst}" + '' + concatStrings (flip mapAttrsToList files (name: md5: '' + ln -s "${src}/${name}" "${dst}/${md5}-${name}" '')); - installExtraFile = extra: '' - mkdir -p "${extra.dst}" - ln -s "${extra.src}" "${extra.dst}/${extra.md5}-${extra.name}" + installExtraFile = {dst, md5, name, src, ...}: '' + mkdir -p "${dst}" + ln -s "${src}" "${dst}/${md5}-${name}" ''; - opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; - - printEnabled = enabled: if enabled then "ON" else "OFF"; withOpenblas = (enableBlas && blas.provider.pname == "openblas"); #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests #https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) cudaFlags cudaVersion; - inherit (cudaFlags) cudaCapabilities; + inherit (cudaPackages) cudaFlags; + inherit (cudaFlags) cmakeCudaArchitecturesString cudaCapabilities; in @@ -258,20 +261,21 @@ effectiveStdenv.mkDerivation { outputs = [ "out" "cxxdev" - ] ++ lib.optionals (runAccuracyTests || runPerformanceTests) [ + ] ++ optionals (runAccuracyTests || runPerformanceTests) [ "package_tests" ]; cudaPropagateToOutput = "cxxdev"; - postUnpack = lib.optionalString buildContrib '' + postUnpack = optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch - ] ++ lib.optionals enableContrib [ - ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; + ] ++ optionals enableCuda [ + ./cuda_opt_flow.patch + ]; # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) @@ -281,8 +285,8 @@ effectiveStdenv.mkDerivation { preConfigure = installExtraFile ade + - lib.optionalString enableIpp (installExtraFiles ippicv) + ( - lib.optionalString buildContrib '' + optionalString enableIpp (installExtraFiles ippicv) + ( + optionalString buildContrib '' cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib") ${installExtraFiles vgg} @@ -304,35 +308,35 @@ effectiveStdenv.mkDerivation { pcre2 protobuf_21 zlib - ] ++ lib.optionals enablePython [ + ] ++ optionals enablePython [ pythonPackages.python - ] ++ lib.optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ + ] ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ hdf5 - ] ++ lib.optionals enableGtk2 [ + ] ++ optionals enableGtk2 [ gtk2 - ] ++ lib.optionals enableGtk3 [ + ] ++ optionals enableGtk3 [ gtk3 - ] ++ lib.optionals enableVtk [ + ] ++ optionals enableVtk [ vtk - ] ++ lib.optionals enableJPEG [ + ] ++ optionals enableJPEG [ libjpeg - ] ++ lib.optionals enablePNG [ + ] ++ optionals enablePNG [ libpng - ] ++ lib.optionals enableTIFF [ + ] ++ optionals enableTIFF [ libtiff - ] ++ lib.optionals enableWebP [ + ] ++ optionals enableWebP [ libwebp - ] ++ lib.optionals enableEXR [ + ] ++ optionals enableEXR [ openexr ilmbase - ] ++ lib.optionals enableJPEG2000 [ + ] ++ optionals enableJPEG2000 [ openjpeg - ] ++ lib.optionals enableFfmpeg [ + ] ++ optionals enableFfmpeg [ ffmpeg - ] ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ + ] ++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [ bzip2 VideoDecodeAcceleration - ] ++ lib.optionals (enableGStreamer && effectiveStdenv.isLinux) [ + ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [ elfutils gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -340,27 +344,27 @@ effectiveStdenv.mkDerivation { libunwind orc zstd - ] ++ lib.optionals enableOvis [ + ] ++ optionals enableOvis [ ogre - ] ++ lib.optionals enableGPhoto2 [ + ] ++ optionals enableGPhoto2 [ libgphoto2 - ] ++ lib.optionals enableDC1394 [ + ] ++ optionals enableDC1394 [ libdc1394 - ] ++ lib.optionals enableEigen [ + ] ++ optionals enableEigen [ eigen - ] ++ lib.optionals enableVA [ + ] ++ optionals enableVA [ libva - ] ++ lib.optionals enableBlas [ + ] ++ optionals enableBlas [ blas.provider - ] ++ lib.optionals enableTesseract [ + ] ++ optionals enableTesseract [ # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. tesseract leptonica - ] ++ lib.optionals enableTbb [ + ] ++ optionals enableTbb [ tbb - ] ++ lib.optionals effectiveStdenv.isDarwin [ + ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [ bzip2 AVFoundation Cocoa @@ -368,76 +372,78 @@ effectiveStdenv.mkDerivation { CoreMedia MediaToolbox Accelerate - ] ++ lib.optionals enableDocs [ + ] ++ optionals enableDocs [ doxygen graphviz-nox - ] ++ lib.optionals enableCuda [ + ] ++ optionals enableCuda [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl # cudaPackages.libnpp # npp.h nvidia-optical-flow-sdk - ] ++ lib.optionals enableCublas [ + ] ++ optionals enableCublas [ # May start using the default $out instead once # https://github.com/NixOS/nixpkgs/issues/271792 # has been addressed cudaPackages.libcublas # cublas_v2.h - ] ++ lib.optionals enableCudnn [ + ] ++ optionals enableCudnn [ cudaPackages.cudnn # cudnn.h - ] ++ lib.optionals enableCufft [ + ] ++ optionals enableCufft [ cudaPackages.libcufft # cufft.h ]; - propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; + propagatedBuildInputs = optionals enablePython [ pythonPackages.numpy ]; - nativeBuildInputs = [ cmake pkg-config unzip ] - ++ lib.optionals enablePython [ + nativeBuildInputs = [ + cmake + pkg-config + unzip + ] ++ optionals enablePython [ pythonPackages.pip pythonPackages.wheel pythonPackages.setuptools - ] ++ lib.optionals enableCuda [ + ] ++ optionals enableCuda [ cudaPackages.cuda_nvcc ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. - OpenBLAS_HOME = lib.optionalString withOpenblas openblas_.dev; - OpenBLAS = lib.optionalString withOpenblas openblas_; + OpenBLAS_HOME = optionalString withOpenblas openblas_.dev; + OpenBLAS = optionalString withOpenblas openblas_; cmakeFlags = [ - "-DOPENCV_GENERATE_PKGCONFIG=ON" - "-DWITH_OPENMP=ON" - "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" - "-DPROTOBUF_UPDATE_FILES=ON" - "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" - "-DBUILD_TESTS=${printEnabled runAccuracyTests}" - "-DBUILD_PERF_TESTS=${printEnabled runPerformanceTests}" - "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DBUILD_DOCS=${printEnabled enableDocs}" + (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) + (cmakeBool "WITH_OPENMP" true) + (cmakeBool "BUILD_PROTOBUF" false) + (cmakeOptionType "path" "Protobuf_PROTOC_EXECUTABLE" (getExe buildPackages.protobuf_21)) + (cmakeBool "PROTOBUF_UPDATE_FILES" true) + (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree) + (cmakeBool "BUILD_TESTS" runAccuracyTests) + (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests) + (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + (cmakeBool "BUILD_DOCS" enableDocs) # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT" # but we have proper separation of build and host libs :), fixes cross - "-DOPENCV_ENABLE_PKG_CONFIG=ON" - (opencvFlag "IPP" enableIpp) - (opencvFlag "TIFF" enableTIFF) - (opencvFlag "WEBP" enableWebP) - (opencvFlag "JPEG" enableJPEG) - (opencvFlag "PNG" enablePNG) - (opencvFlag "OPENEXR" enableEXR) - (opencvFlag "OPENJPEG" enableJPEG2000) - "-DWITH_JASPER=OFF" # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled - (opencvFlag "TBB" enableTbb) + (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true) + (cmakeBool "WITH_IPP" enableIpp) + (cmakeBool "WITH_TIFF" enableTIFF) + (cmakeBool "WITH_WEBP" enableWebP) + (cmakeBool "WITH_JPEG" enableJPEG) + (cmakeBool "WITH_PNG" enablePNG) + (cmakeBool "WITH_OPENEXR" enableEXR) + (cmakeBool "WITH_OPENJPEG" enableJPEG2000) + (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled + (cmakeBool "WITH_TBB" enableTbb) # CUDA options - (opencvFlag "CUDA" enableCuda) - (opencvFlag "CUDA_FAST_MATH" enableCuda) - (opencvFlag "CUBLAS" enableCublas) - (opencvFlag "CUDNN" enableCudnn) - (opencvFlag "CUFFT" enableCufft) + (cmakeBool "WITH_CUDA" enableCuda) + (cmakeBool "WITH_CUBLAS" enableCublas) + (cmakeBool "WITH_CUDNN" enableCudnn) + (cmakeBool "WITH_CUFFT" enableCufft) # LTO options - (opencvFlag "ENABLE_LTO" enableLto) - (opencvFlag "ENABLE_THIN_LTO" ( + (cmakeBool "ENABLE_LTO" enableLto) + (cmakeBool "ENABLE_THIN_LTO" ( enableLto && ( # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv, effectiveStdenv.cc.isClang || @@ -445,51 +451,53 @@ effectiveStdenv.mkDerivation { (enableCuda && effectiveStdenv.cc.isClang) ) )) - ] ++ lib.optionals enableCuda [ - "-DCUDA_FAST_MATH=ON" - "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ optionals enableCuda [ + (cmakeBool "CUDA_FAST_MATH" true) + (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr") # OpenCV respects at least three variables: # -DCUDA_GENERATION takes a single arch name, e.g. Volta # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6" # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6" - "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" - "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" + (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString) + (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities)) - "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" - ] ++ lib.optionals effectiveStdenv.isDarwin [ - "-DWITH_OPENCL=OFF" - "-DWITH_LAPACK=OFF" + (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath) + ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [ + (cmakeBool "WITH_OPENCL" false) + (cmakeBool "WITH_LAPACK" false) # Disable unnecessary vendoring that's enabled by default only for Darwin. # Note that the opencvFlag feature flags listed above still take # precedence, so we can safely list everything here. - "-DBUILD_ZLIB=OFF" - "-DBUILD_TIFF=OFF" - "-DBUILD_OPENJPEG=OFF" - "-DBUILD_JASPER=OFF" - "-DBUILD_JPEG=OFF" - "-DBUILD_PNG=OFF" - "-DBUILD_WEBP=OFF" - ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ - "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" - ] ++ lib.optionals enablePython [ - "-DOPENCV_SKIP_PYTHON_LOADER=ON" - ] ++ lib.optionals (enabledModules != [ ]) [ - "-DBUILD_LIST=${lib.concatStringsSep "," enabledModules}" + (cmakeBool "BUILD_ZLIB" false) + (cmakeBool "BUILD_TIFF" false) + (cmakeBool "BUILD_OPENJPEG" false) + (cmakeBool "BUILD_JASPER" false) + (cmakeBool "BUILD_JPEG" false) + (cmakeBool "BUILD_PNG" false) + (cmakeBool "BUILD_WEBP" false) + ] ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [ + (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so") + ] ++ optionals enablePython [ + (cmakeBool "OPENCV_SKIP_PYTHON_LOADER" true) + ] ++ optionals (enabledModules != [ ]) [ + (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules)) ]; - postBuild = lib.optionalString enableDocs '' + postBuild = optionalString enableDocs '' make doxygen ''; preInstall = - lib.optionalString (runAccuracyTests || runPerformanceTests) '' - mkdir $package_tests - cp -R $src/samples $package_tests/ - '' - + lib.optionalString runAccuracyTests "mv ./bin/*test* $package_tests/ \n" - + lib.optionalString runPerformanceTests "mv ./bin/*perf* $package_tests/"; + optionalString (runAccuracyTests || runPerformanceTests) '' + mkdir $package_tests + cp -R $src/samples $package_tests/ + '' + optionalString runAccuracyTests '' + mv ./bin/*test* $package_tests/ + '' + optionalString runPerformanceTests '' + mv ./bin/*perf* $package_tests/ + ''; # By default $out/lib/pkgconfig/opencv4.pc looks something like this: # @@ -510,12 +518,23 @@ effectiveStdenv.mkDerivation { '' # fix deps not progagating from opencv4.cxxdev if cuda is disabled # see https://github.com/NixOS/nixpkgs/issues/276691 - + lib.optionalString (!enableCuda) '' + + optionalString (!enableCuda) '' mkdir -p "$cxxdev/nix-support" echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs" '' + # remove the requirement that the exact same version of CUDA is used in packages + # consuming OpenCV's CMakes files + + optionalString enableCuda '' + substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \ + --replace-fail \ + 'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \ + 'find_host_package(CUDA REQUIRED)' \ + --replace-fail \ + 'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \ + 'message("OpenCV static library was compiled with CUDA' + '' # install python distribution information, so other packages can `import opencv` - + lib.optionalString enablePython '' + + optionalString enablePython '' pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . @@ -536,18 +555,18 @@ effectiveStdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; } - // lib.optionalAttrs (!effectiveStdenv.isDarwin) { inherit qimgv; } - // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } - // lib.optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { + // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { inherit qimgv; } + // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } + // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; inherit opencv4; }; } - // lib.optionalAttrs (enableCuda) { + // optionalAttrs (enableCuda) { no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; }; }; - } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; + } // optionalAttrs enablePython { pythonPath = [ ]; }; meta = { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix index d1966b1a4a..dec10c1b13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix @@ -26,7 +26,7 @@ let "video" #"videoio" # - a lot of GStreamer warnings and failed tests #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models - ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ] + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ] ++ lib.optionals (enableGtk2 || enableGtk3) [ "highgui" ]; perfTestNames = [ "calib3d" @@ -38,8 +38,8 @@ let "photo" "stitching" "video" - ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ]; - testRunner = lib.optionalString (!stdenv.isDarwin) "${lib.getExe xvfb-run} -a "; + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ]; + testRunner = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${lib.getExe xvfb-run} -a "; testsPreparation = '' touch $out # several tests want a write access, so we have to copy files diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix index 9fbb835667..ba66ba5be1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extremely lightweight but extensible database access library written in C"; mainProgram = "odbx-sql"; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix index 322885ac86..e7408ba37e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { restinio http-parser openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendkim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendkim/default.nix index 00b5d62415..8425d5a815 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendkim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendkim/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { "--with-milter=${libmilter}" "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" - ] ++ lib.optional stdenv.isDarwin "--with-unbound=${unbound}"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-unbound=${unbound}"; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; - buildInputs = [ libbsd openssl libmilter perl ] ++ lib.optional stdenv.isDarwin unbound; + buildInputs = [ libbsd openssl libmilter perl ] ++ lib.optional stdenv.hostPlatform.isDarwin unbound; postInstall = '' wrapProgram $out/sbin/opendkim-genkey \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix index 9e6d6eaa65..56562f7716 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { # Without 'sse' enforcement tests fail on i686 as due to excessive precision as: # error reading back channel B pixel 21,-76 got -nan expected -nan - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 - doCheck = !stdenv.isAarch32; + doCheck = !stdenv.hostPlatform.isAarch32; passthru.tests = { musl = pkgsCross.musl64.openexr_3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix index b45557b95c..a79759be24 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 # https://github.com/AcademySoftwareFoundation/openexr/issues/1281 - doCheck = !stdenv.isAarch32 && !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isi686; meta = with lib; { description = "High dynamic-range (HDR) image file format"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix index 964f5d86f6..8cee39c3a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { find $dev/include -type f -a ! -iname '*.h' -delete install -D -m755 -t $out/lib ../bin/Release/libopenfec${so} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libopenfec${so} $out/lib/libopenfec${so} '' + '' ln -s libopenfec${so} $out/lib/libopenfec${so}.1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index ad68505ad6..cfd38708cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -14,7 +14,7 @@ }: let - stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "openimagedenoise"; @@ -39,11 +39,11 @@ stdenv'.mkDerivation (finalAttrs: { python3 ispc ] ++ lib.optional cudaSupport cudaPackages.cuda_nvcc - ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ tbb ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ Accelerate diff --git a/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix index 25b43b3600..4af80702b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ++ lib.optionals jpipServerSupport [ curl fcgi ] ++ lib.optional (jpipLibSupport) jdk; - doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 + doCheck = (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 nativeCheckInputs = [ jpylyzer ]; checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index e25f0a8c17..8ca98b386a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libsodium libtool openssl - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libxcrypt # causes linking issues on *-darwin systemdMinimal ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes" - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; env.NIX_CFLAGS_COMPILE = toString [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 0ae1118a36..a1fb945456 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -29,7 +29,7 @@ # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default enablePrefix ? false, # Enable libfabric support (necessary for Omnipath networks) on x86_64 linux - fabricSupport ? stdenv.isLinux && stdenv.isx86_64, + fabricSupport ? stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64, # Enable Fortran support fortranSupport ? true, # AVX/SSE options. See passthru.defaultAvxOptions for the available options. @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "man" "dev" ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { libevent hwloc ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl numactl pmix @@ -95,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: { prrte ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] - ++ lib.optionals (stdenv.isLinux || stdenv.isFreeBSD) [ rdma-core ] + ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [ rdma-core ] # needed for internal pmix - ++ lib.optionals (!stdenv.isLinux) [ python3 ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ python3 ] ++ lib.optionals fabricSupport [ libpsm2 libfabric @@ -115,11 +115,11 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ (lib.enableFeature cudaSupport "mca-dso") (lib.enableFeature fortranSupport "mpi-fortran") - (lib.withFeatureAs stdenv.isLinux "libnl" (lib.getDev libnl)) + (lib.withFeatureAs stdenv.hostPlatform.isLinux "libnl" (lib.getDev libnl)) "--with-pmix=${lib.getDev pmix}" "--with-pmix-libdir=${lib.getLib pmix}/lib" # Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables - (lib.withFeatureAs stdenv.isLinux "prrte" (lib.getBin prrte)) + (lib.withFeatureAs stdenv.hostPlatform.isLinux "prrte" (lib.getBin prrte)) (lib.withFeature enableSGE "sge") (lib.enableFeature enablePrefix "mpirun-prefix-by-default") # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build @@ -219,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: { # we currently don't perform these substitutions on other platforms, # until a Darwin user will care enough about this cross platform # related substitution. - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace "''${!outputDev}/share/openmpi/${part1}${part2}-wrapper-data.txt" \ --replace-fail \ compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 0} \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix index 5e7de98efc..910a8bc827 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-std=c++14"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index 3566e45859..1b0f4b229d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake doxygen ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXinerama libXrandr libGLU libGL ] ++ [ glib libxml2 pcre zlib @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk ] - ++ lib.optionals (!stdenv.isDarwin) [ ] - ++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openslp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openslp/default.nix index e390cfd932..33b01b7647 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openslp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openslp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; knownVulnerabilities = [ "CVE-2023-29552: UDP Reflection Attack with ampliciation factor of up to 2200" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 7c0788a673..40edcdee6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -5,7 +5,7 @@ , enableSSL2 ? false , enableSSL3 ? false , enableMD2 ? false -, enableKTLS ? stdenv.isLinux +, enableKTLS ? stdenv.hostPlatform.isLinux , static ? stdenv.hostPlatform.isStatic # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default , conf ? null diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index b5c2847fb9..4cee5df5dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi ] - ++ lib.optionals (openclSupport && !stdenv.isDarwin) [ ocl-icd ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals (openclSupport && !stdenv.hostPlatform.isDarwin) [ ocl-icd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ OpenCL Cocoa CoreVideo @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" - (lib.cmakeBool "NO_METAL" (!stdenv.isDarwin)) + (lib.cmakeBool "NO_METAL" (!stdenv.hostPlatform.isDarwin)) (lib.cmakeBool "NO_OPENCL" (!openclSupport)) (lib.cmakeBool "NO_CUDA" (!cudaSupport)) - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" ] ++ lib.optionals cudaSupport [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix index 2b1fca97f0..72d2d7dce0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" "-DOPENVDB_BUILD_NANOVDB=ON"]; # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer - env = lib.optionalAttrs (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { NIX_CFLAGS_COMPILE = "-faligned-allocation"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix index a1f3027715..98129c5944 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SAMPLES" false) # features - (cmakeBool "ENABLE_INTEL_CPU" stdenv.isx86_64) + (cmakeBool "ENABLE_INTEL_CPU" stdenv.hostPlatform.isx86_64) (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Cannot find macos sdk + broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix index 87381141d9..4d6a605bf0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix @@ -99,12 +99,12 @@ stdenv.mkDerivation { inherit pname version srcs; buildInputs = [ stdenv.cc.cc.lib ] - ++ optional stdenv.isLinux libaio + ++ optional stdenv.hostPlatform.isLinux libaio ++ optional odbcSupport unixODBC; nativeBuildInputs = [ makeWrapper unzip ] - ++ optional stdenv.isLinux autoPatchelfHook - ++ optional stdenv.isDarwin fixDarwinDylibNames; + ++ optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" "lib" ]; @@ -125,7 +125,7 @@ stdenv.mkDerivation { ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 ''; - postFixup = optionalString stdenv.isDarwin '' + postFixup = optionalString stdenv.hostPlatform.isDarwin '' for exe in "$out/bin/"* ; do if [ ! -L "$exe" ]; then install_name_tool -add_rpath "$lib/lib" "$exe" diff --git a/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix index 43822d76aa..d149c48cc5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix @@ -34,7 +34,7 @@ let p2 = buildGoModule rec { # # but this package is no longer maintained. # - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }; p1 = buildGoModule rec { @@ -66,7 +66,7 @@ p1 = buildGoModule rec { # # but this package is no longer maintained. # - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix index b7d3d92db0..e39f059e31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix @@ -22,17 +22,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen nlopt boost tbb ] ++ lib.optional (!stdenv.isDarwin) ipopt; + buildInputs = [ eigen nlopt boost tbb ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt; cmakeFlags = [ "-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}" "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes" "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DPAGMO_WITH_IPOPT=yes" "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FIXME: fails ipopt test with Invalid_Option on darwin, so disable. "-DPAGMO_WITH_IPOPT=no" "-DLLVM_USE_LINKER=gold" diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index d91552e379..4b442a0ff9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -16,7 +16,7 @@ , ninja , glib , python3 -, x11Support? !stdenv.isDarwin, libXft +, x11Support? !stdenv.hostPlatform.isDarwin, libXft , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages, gobject-introspection , testers @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fribidi libthai - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon CoreGraphics diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix index 600c7b0eb0..1dd52ab7ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libtiff eigen ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix index 267e46c48c..ebbaee6685 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "C++ interface to the Pango text rendering library"; homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix index fa4148e06a..3b513b8899 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix index 02a76869cf..65dede46ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix index 05c8abfafb..2c117bdabb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { swig xorg.libXi xorg.libXmu - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.GLUT - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libglut libGLU libGL diff --git a/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix index 7a7b8475d7..0391b72ada 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNRF_BLE_DRIVER_VERSION=${version}" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "-DARCH=arm64" ]; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 347e8b5cdf..1152283b1f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -10,7 +10,7 @@ , pkg-config , portaudio , which -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux }: stdenv.mkDerivation (finalAttrs: { @@ -35,12 +35,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ portaudio ] - ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio; # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' touch ChangeLog '' + '' ./autogen.sh diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix index ced4e04c0b..3ad9df8b64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.linus ]; - broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 + broken = stdenv.hostPlatform.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix index 36e54f873c..41639d300e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { qtbase libXt ] - ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa AGL ]; propagatedBuildInputs = [ boost @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { vtk ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix index 27f7c019ac..e00be9c841 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix @@ -16,7 +16,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix index c2dbb1235b..b083f278af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; patches = [ ./bad_code.patch @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.in \ --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib" - '' + (lib.optionalString stdenv.isDarwin '' + '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile.in \ --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib" ''); diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix index e4a2f2435b..0673aeefff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix @@ -6,7 +6,6 @@ cmake, freetype, gfortran, - gnused, openssl, libnsl, motif, @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { libXt libxcrypt motif - ] ++ lib.optional stdenv.isLinux libnsl; + ] ++ lib.optional stdenv.hostPlatform.isLinux libnsl; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 7349c708e3..128d7391fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ lib.optionals (enableOpenGLX11 && stdenv.isDarwin) [ + ] ++ lib.optionals (enableOpenGLX11 && stdenv.hostPlatform.isDarwin) [ "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include" "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib" ] ++ lib.optionals (enableMultiThreading && enablePython) [ @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index 53ee798c17..c622d75620 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ lib.optional withPython python; # error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0' - preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index ef7ce7ce58..c18ff9bef8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... + broken = stdenv.hostPlatform.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix index 8111f61684..26ca234c52 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isGNU) '' substituteInPlace src/GridPDF.cc --replace '#include ' '#include ' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix index 4e2d878db0..6085906758 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { env.CXXFLAGS="-std=c++11"; # error: no member named 'finite' in the global namespace; did you mean simply 'finite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite"; meta = { homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 0eb45943e0..55ba50f2ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ rsync ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ boost fastjet hepmc zlib lhapdf ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix index 71c0b7d470..dbf742ab81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { "-Diwmmxt=disabled" ] # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved - ++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled"; + ++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled"; preConfigure = '' # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = glib.flattenInclude; diff --git a/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix b/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix index 6e4e47f094..d49b8da211 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix @@ -1,16 +1,21 @@ -{ lib -, stdenv -, fetchurl -, cmake -, enableWX ? false -, wxGTK32 -, Cocoa -, enableXWin ? false -, xorg +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + enableWX ? false, + wxGTK32, + Cocoa, + enableXWin ? false, + xorg, + enablePNG ? false, + cairo, + pango, }: stdenv.mkDerivation rec { - pname = "plplot"; + pname = "plplot"; version = "5.15.0"; src = fetchurl { @@ -18,18 +23,26 @@ stdenv.mkDerivation rec { sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa - ++ lib.optional enableXWin xorg.libX11; + buildInputs = + lib.optional enableWX wxGTK32 + ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa + ++ lib.optional enableXWin xorg.libX11 + ++ lib.optionals enablePNG [ + cairo + pango + ]; passthru = { inherit (xorg) libX11; inherit enableWX enableXWin - ; + ; }; cmakeFlags = [ @@ -41,9 +54,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform scientific graphics plotting library"; mainProgram = "pltek"; - homepage = "https://plplot.org"; + homepage = "https://plplot.org"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.lgpl2; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix index 69e86acfef..486164904b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - outputs = [ "out" ] ++ lib.optionals stdenv.isLinux [ "dev" ]; + outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "dev" ]; postPatch = '' patchShebangs ./autogen.pl @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { # From some reason the Darwin build doesn't include this file, so we # currently disable this substitution for any non-Linux platform, until a # Darwin user will care enough about this cross platform fix. - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Pin the compiler to the current version in a cross compiler friendly way. # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/png++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/png++/default.nix index dfd74e495e..e3aa6af942 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/png++/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/png++/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" '' + '' sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix index b663c865d2..0fb66ccc7c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { glib pcre polkit - ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux libsepol util-linux ]; meta = with lib; { description = "Qt wrapper around PolKit"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index dd3c6aaea3..17b325f52d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -29,7 +29,7 @@ # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, # or being unrelated to that. -, doCheck ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl) +, doCheck ? (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl) }: let @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { pam dbus duktape - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # On Linux, fall back to elogind when systemd support is off. (if useSystemd then systemdMinimal else elogind) ]; @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { "-Dtests=${lib.boolToString doCheck}" "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dman=true" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix index 2893b5e1b0..368c5a06a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: rec { dontWrapQtApps = true; # Workaround #54606 - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix index e97629b0df..282203a98a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - patches = lib.optionals stdenv.isCygwin [ + patches = lib.optionals stdenv.hostPlatform.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix index a109aad97b..6d338b0f67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ libjack2 ] ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib ]; + buildInputs = [ libjack2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib ]; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; # Disable parallel build as it fails as: # make: *** No rule to make target '../../../lib/libportaudio.la', @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # fixup .pc file to find alsa library sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp include/pa_mac_core.h $out/include/pa_mac_core.h ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix index 8e743f6a54..eac2a369fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreAudio CoreFoundation CoreMIDI CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix index 863ffed429..37e5f78c60 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ gmpxx ]; configureFlags = [ "--disable-watchdog" ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ "CPPFLAGS=-fexceptions" "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix index 372a2940e0..56dd58781b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ] + lib.optionals stdenv.hostPlatform.isDarwin [ "-D_GNU_SOURCE" ] # libxml2-2.12 changed const qualifiers ++ [ "-fpermissive" ] ); diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix index 8fedba3ef0..615d2590c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { preCheck = let - libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index 9dc7f70c2f..cfcaa55515 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -25,7 +25,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix index 71f8e90b77..0b52ea7de2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { # https://hydra.nixos.org/build/235677717/nixlog/4/tail # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms # https://github.com/protocolbuffers/protobuf/issues/8460 - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; + doCheck = !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; passthru = { tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix index 02a8fcde91..13a2b17a3e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libpng libjpeg giflib libtiff ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pth/default.nix index bbbc5017c4..3d4c056b71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pth/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = lib.optionalString stdenv.isAarch32 '' + preConfigure = lib.optionalString stdenv.hostPlatform.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") diff --git a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix index 10db26a039..4f417c5e15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -44,11 +44,14 @@ stdenv.mkDerivation (finalAttrs: { cp -r ./extensions $out/include/PythonQt ''; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \ $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib - install_name_tool -id \ + install_name_tool -change \ + libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ + -id \ $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qhull/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qhull/default.nix index a7f1bc2711..998575bb16 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qhull/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qhull/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; meta = with lib; { homepage = "http://www.qhull.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index 0984912463..6ba9418a6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ qtbase qtmultimedia - ] ++ lib.optional stdenv.isDarwin utmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; patches = [ # Changes required to make it compatible with lomiri-terminal-app diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix index 237751c6f8..8a52fce9c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv libpng ] - ++ lib.optionals stdenv.isDarwin [ libobjc ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]; nativeCheckInputs = [ SDL2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix index 282b926b2e..a3ccff5c10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # https://github.com/mpimd-csc/qrupdate-ng/issues/4 - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ ./disable-zch1dn-test.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix index 69adf65643..0d8df9b316 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix @@ -10,7 +10,7 @@ }: let - stdenv' = if stdenv.isDarwin then + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv @@ -28,10 +28,10 @@ in stdenv'.mkDerivation rec { buildInputs = [ qtbase ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; nativeBuildInputs = [ unzip qmake ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser @@ -71,6 +71,6 @@ in stdenv'.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; # ld: library not found for -lcups - broken = stdenv.isDarwin && lib.versionAtLeast qtbase.version "6"; + broken = stdenv.hostPlatform.isDarwin && lib.versionAtLeast qtbase.version "6"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index af2f431dfb..2f57b1c62d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -28,7 +28,7 @@ let qtCompatVersion = srcs.qtbase.version; patches = { - qtbase = lib.optionals stdenv.isDarwin [ + qtbase = lib.optionals stdenv.hostPlatform.isDarwin [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch # Patch framework detection to support X.framework/X.tbd, @@ -63,7 +63,7 @@ let hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; }) ]; - qtmultimedia = lib.optionals stdenv.isDarwin [ + qtmultimedia = lib.optionals stdenv.hostPlatform.isDarwin [ # build patch for qtmultimedia with xcode 15 (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; @@ -184,7 +184,7 @@ let # See: https://bugreports.qt.io/browse/QTBUG-124375 # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 ./qtwebengine-ninja-1.12.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ./qtwebengine-darwin-checks.patch @@ -218,7 +218,7 @@ let ./qtwebkit.patch ./qtwebkit-icu68.patch ./qtwebkit-cstdint.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch ]; @@ -248,7 +248,7 @@ let inherit (srcs.qtbase) src version; patches = patches.qtbase; inherit bison cups harfbuzz libGL; - withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; + withGtk3 = !stdenv.hostPlatform.isDarwin; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; inherit (darwin.apple_sdk_11_0.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; @@ -311,7 +311,7 @@ let # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. stdenv = let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; - in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; + in if stdenv'.hostPlatform.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; inherit (darwin) xnu; @@ -343,8 +343,8 @@ let qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d - ] ++ lib.optional (!stdenv.isDarwin) qtwayland - ++ lib.optional (stdenv.isDarwin) qtmacextras); + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) qtwayland + ++ lib.optional (stdenv.hostPlatform.isDarwin) qtmacextras); qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake-hook"; @@ -360,7 +360,7 @@ let wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook { name = "wrap-qt5-apps-hook"; propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ] - ++ lib.optional stdenv.isLinux qtwayland.dev; + ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh) { }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix index f394ff6627..c54f4b7d7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -5,5 +5,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dstat64=stat"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 7f3079d5ad..7aef466b79 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -18,7 +18,7 @@ , withQttranslation ? true, qttranslations ? null # options -, libGLSupported ? !stdenv.isDarwin +, libGLSupported ? !stdenv.hostPlatform.isDarwin , libGL # qmake detection for libmysqlclient does not seem to work when cross compiling , mysqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: ({ libjpeg libpng pcre2 ] ++ ( - if stdenv.isDarwin then [ + if stdenv.hostPlatform.isDarwin then [ # TODO: move to buildInputs, this should not be propagated. AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: ({ ); buildInputs = [ python3 at-spi2-core ] - ++ lib.optionals (!stdenv.isDarwin) + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( [ libinput ] ++ lib.optional withGtk3 gtk3 @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: ({ ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] - ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { # `qtbase` expects to find `cc` (with no prefix) in the @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: ({ # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked # against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`. - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/icu")) ''; @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: ({ patchShebangs ./bin '' + ( - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' sed -i \ -e 's|/usr/bin/xcode-select|xcode-select|' \ -e 's|/usr/bin/xcrun|xcrun|' \ @@ -217,7 +217,7 @@ stdenv.mkDerivation (finalAttrs: ({ ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' - ++ lib.optional stdenv.isLinux "-DUSE_X11" + ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11" ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" @@ -318,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: ({ ''-${lib.optionalString (!buildTests) "no"}make tests'' ] ++ ( - if stdenv.isDarwin then [ + if stdenv.hostPlatform.isDarwin then [ "-no-fontconfig" "-qt-freetype" "-qt-libpng" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 81efb4bee0..d61619613e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -2,11 +2,11 @@ qtModule { pname = "qtconnectivity"; - buildInputs = lib.optional stdenv.isLinux bluez; + buildInputs = lib.optional stdenv.hostPlatform.isLinux bluez; propagatedBuildInputs = [ qtbase qtdeclarative - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOBluetooth ]; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix index d79320ea13..e89a735d77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -5,5 +5,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dstat64=stat"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 3985726731..8d0a0e2177 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -3,7 +3,7 @@ qtModule { pname = "qtgamepad"; propagatedBuildInputs = [ qtbase qtdeclarative ] - ++ lib.optional stdenv.isDarwin GameController; + ++ lib.optional stdenv.hostPlatform.isDarwin GameController; buildInputs = [ ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix index 338911a5af..35627af0c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -4,7 +4,7 @@ qtModule { pname = "qtlocation"; propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; - qmakeFlags = lib.optionals stdenv.isDarwin [ + qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx # This flag re-enables this feature # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index d5dc16c528..0346ca23c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -17,8 +17,8 @@ qtModule { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland ]; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; - NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin) "-lobjc"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 7907f91b98..3d5c00a357 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -3,5 +3,5 @@ qtModule { pname = "qtserialport"; propagatedBuildInputs = [ qtbase ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 17bc16dab4..d60a12f385 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -3,7 +3,7 @@ qtModule { pname = "qtspeech"; propagatedBuildInputs = [ ]; - buildInputs = lib.optionals stdenv.isLinux [ speechd-minimal ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ speechd-minimal ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index 37e4348ed2..b728620362 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -32,11 +32,11 @@ qtModule { "bin/qthelpconverter" "bin/lprodump" "bin/qdistancefieldgenerator" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "bin/macdeployqt" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1a63c9508c..75149cfb5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -29,7 +29,7 @@ , lib, stdenv , version ? null , qtCompatVersion -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , pipewire , postPatch ? "" , nspr @@ -65,7 +65,7 @@ qtModule ({ pkgsBuildBuild.pkg-config (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols) pkg-config-wrapped-without-prefix - ] ++ lib.optional stdenv.isDarwin xcbuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -135,7 +135,7 @@ qtModule ({ # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` # from `src/core/config/mac_osx.pri`. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \ --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"' '' @@ -148,13 +148,13 @@ qtModule ({ src/core/web_engine_library_info.cpp '' # Patch library paths in Chromium sources - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - '' + lib.optionalString stdenv.isDarwin ('' + '' + lib.optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace src/buildtools/config/mac_osx.pri \ --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' @@ -233,7 +233,7 @@ qtModule ({ libevent ffmpeg_7 - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats @@ -257,7 +257,7 @@ qtModule ({ # FIXME These dependencies shouldn't be needed but can't find a way # around it. Chromium pulls this in while bootstrapping GN. - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc cctools @@ -287,7 +287,7 @@ qtModule ({ libunwind ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cups libpm sandbox @@ -313,7 +313,7 @@ qtModule ({ postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' mkdir -p $out/libexec - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' cat > $out/libexec/qt.conf < maybe 12 hours on 4x2.4GHz timeout = 24 * 3600; # Not compatible with macOS 11 without massive patching - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "12"; + broken = stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "12"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index 9007129cec..b6744692bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] - ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ] # for finding libsecret ; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] ++ [ qtbase qttools ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix index 94dc164651..5005ab8243 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Fix plugin dir substituteInPlace pbfplugin.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ --replace '$$PROTOBUF/include' '${protobuf}/include' \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix index 11350128b4..a3a633af6c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (final: { passthru.tests = { quarto-check = runCommand "quarto-check" { - nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; } '' export HOME="$(mktemp -d)" ${quarto}/bin/quarto check diff --git a/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix index c3f1f7a783..b2fcad6cab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib qtbase ]; propagatedBuildInputs = [ qt5compat ]; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quickfix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quickfix/default.nix index 0c327d0d5e..bd4612c8ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quickfix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quickfix/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = "http://www.quickfixengine.org"; license = licenses.free; # similar to BSD 4-clause maintainers = with maintainers; [ bhipple ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix index 49dfc94993..1e3cb69d1f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableSSL3 "enable-ssl3" # We select KTLS here instead of the configure-time detection (which we patch out). # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it. - ++ lib.optional (stdenv.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls" + ++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls" ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options diff --git a/third_party/nixpkgs/pkgs/development/libraries/qwt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qwt/default.nix index dec84c1c49..814e8f0252 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qwt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; - nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri diff --git a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix index 3ef599887e..a7e5fe6eb2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { # Building the tests currently fails on AArch64 due to internal compiler # errors (with GCC 9.2): cmakeFlags = [ "-DRANGES_ENABLE_WERROR=OFF" ] - ++ lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; + ++ lib.optional stdenv.hostPlatform.isAarch64 "-DRANGE_V3_TESTS=OFF"; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; checkTarget = "test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix index 9aa2394585..8e72b7748d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-Wno-error") ]; - doCheck = !(stdenv.hostPlatform.isStatic || stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin); nativeCheckInputs = [ valgrind diff --git a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix index 2cdde4f2b7..5c1b7d1dab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -37,16 +37,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ glfw ] - ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # fix libasound.so/libpulse.so not being found - appendRunpaths = lib.optionals stdenv.isLinux [ + appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio)) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix index 69eb4b0cd1..0749853082 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.DamienCassou ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix index 541c805bba..2243e482a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib") ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-U__ARM_NEON__"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-U__ARM_NEON__"; meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix index d41459e25e..13107bfcb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Ubsan seems to be broken on aarch64-darwin, it produces linker errors similar to https://github.com/NixOS/nixpkgs/issues/140751 ./disable-ubsan.patch ]; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { pcre xorg.libX11 xorg.libXrandr - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit MetalKit CoreAudioKit diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index b81061639d..fb4cc16cd7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -11,7 +11,7 @@ , windows , enableJemalloc ? false , jemalloc -, enableLiburing ? stdenv.isLinux +, enableLiburing ? stdenv.hostPlatform.isLinux , liburing , enableShared ? !stdenv.hostPlatform.isStatic , sse42Support ? stdenv.hostPlatform.sse4_2Support @@ -87,9 +87,9 @@ stdenv.mkDerivation (finalAttrs: { preInstall = '' mkdir -p $tools/bin cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {} - '' + lib.optionalString (stdenv.isLinux && enableShared) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) '' ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rttr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rttr/default.nix index 10a16dd3f6..de4d81918c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rttr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rttr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "C++ Reflection Library"; homepage = "https://www.rttr.org"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix index 861de40a5b..d5acb98c22 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config meson ninja jdk_headless ]; - buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo]); makeFlags = [ "AR:=$(AR)" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix index d5d736dd22..92dffbc268 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc="; }; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoLock.lockFile = ./Cargo.lock; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/schroedinger/default.nix b/third_party/nixpkgs/pkgs/development/libraries/schroedinger/default.nix index b4e8831b31..698ac79862 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/schroedinger/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/schroedinger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ orc ]; - doCheck = (!stdenv.isDarwin); + doCheck = (!stdenv.hostPlatform.isDarwin); patchFlags = [ "-p0" ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index 78ba7f42fd..5d7137abac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { # Socket address collisions between tests enableParallelChecking = false; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in $out/lib/udev/rules.d/*.rules do substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix index 0d0e3c1149..673cebe59e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # of form /nix/store/.../nix/store/.../include, # probably due to relative vs absolute path issue - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://github.com/BioPP/bpp-core"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix index 0b18dbfcf1..6242516174 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = bpp-core.meta // { homepage = "https://github.com/BioPP/bpp-phyl"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix index 2cb89b4bbd..f7662766fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # of form /nix/store/.../nix/store/.../include, # probably due to relative vs absolute path issue - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = bpp-core.meta // { homepage = "https://github.com/BioPP/bpp-popgen"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix index 2f6fbf9e36..0699c53168 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # of form /nix/store/.../nix/store/.../include, # probably due to relative vs absolute path issue - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = bpp-core.meta // { homepage = "https://github.com/BioPP/bpp-seq"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix index 44e76244c9..46b297722f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - doCheck = !stdenv.isDarwin; # usual dynamic linker issues + doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues meta = with lib; { homepage = "https://elastix.lumc.nl"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix index 306324129c..b305df0886 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat nifticlib zlib ]; # without the test data, this is only a few basic tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck ctest -LE 'NEEDS_DATA' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index 08f303581c..ebc853c369 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -15,13 +15,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "simple-dftd3"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "dftd3"; repo = pname; rev = "v${version}"; - hash = "sha256-XeLf5v/GraDGcTsVIEBnS4AL8tMeO11YTuPHlNt5Ap8="; + hash = "sha256-gN8uBc/Fk5U7wlBX1tkAWdxN9UW1Dv11GvaIBkEyBJw="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 744d565edd..06503bbc7d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { export OMP_NUM_THREADS=2 ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix index 4431ab63c7..fcb7876767 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension} ''; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' for fn in $(find $out/lib -name "*.so*"); do if [ -L "$fn" ]; then continue; fi install_name_tool -id "$fn" "$fn" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix index a389c602b1..1cf64101fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { zlib ]; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--with-asl-lib=-lipoptamplinterface -lamplsolver" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; # ignore one failing test - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace test/Makefile.in --replace-fail \ "./unitTest\''$(EXEEXT)" \ "" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix index 910c40a4e0..17dddf9018 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix @@ -46,15 +46,15 @@ stdenv.mkDerivation rec { buildInputs = [ blas boost - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ocl-icd opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix index 5804c7d627..a8e697132e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -149,6 +149,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ SomeoneSerge ]; # error: use of undeclared identifier 'SWIGTYPE_p_long' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index a1a1ed8a69..bcfe423630 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = [ ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix index f74808462a..5eaa3cf549 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib install -D -m 0644 *.a -t $out/lib popd - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libamplsolver.dylib $out/lib/libamplsolver.dylib '' + '' runHook postInstall diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index 595ba2aa57..def5379d27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gfortran cmake ]; # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10. - hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "stackprotector" ]; cmakeFlags = [ "-DCMAKE_Fortran_FLAGS=-fPIC" @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { # # Upstream issue to track: # * https://github.com/Reference-LAPACK/lapack/issues/440 - ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; + ctestArgs = lib.optionalString stdenv.hostPlatform.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix index 26a1932bd1..d429c4c1f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = "http://www.chokkan.org/software/liblbfgs/"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 92050cd172..f8e0dcff2b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -23,7 +23,7 @@ let device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.isDarwin then libcxx else stdenv.cc.cc.lib; + libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else stdenv.cc.cc.lib; in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable; nativeBuildInputs = - if stdenv.isDarwin then [ fixDarwinDylibNames ] + if stdenv.hostPlatform.isDarwin then [ fixDarwinDylibNames ] else [ patchelf ] ++ lib.optionals cudaSupport [ addDriverRunpath ]; dontBuild = true; @@ -60,7 +60,7 @@ in stdenv.mkDerivation { postFixup = let rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; - in lib.optionalString stdenv.isLinux '' + in lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." patchelf --set-rpath "${rpath}:$out/lib" "$lib" @@ -68,7 +68,7 @@ in stdenv.mkDerivation { addDriverRunpath "$lib" ''} done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/*.dylib; do otool -L $f done diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix index ac513297f1..0cda439404 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # does not compile correctly with -O2 on LLVM clang; see # https://bitbucket.org/malb/m4rie/issues/23/trying-to-compile-on-apple-m1 - makeFlags = [] ++ lib.optionals stdenv.isDarwin [ "CFLAGS=-O0" ]; + makeFlags = [] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-O0" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 607b6c89e4..dc8b674f5c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -20,7 +20,7 @@ let version = "${mklVersion}.${rel}"; mklVersion = "2023.1.0"; - rel = if stdenvNoCC.isDarwin then "43558" else "46342"; + rel = if stdenvNoCC.hostPlatform.isDarwin then "43558" else "46342"; # Intel openmp uses its own versioning. openmpVersion = "2023.1.0"; @@ -66,17 +66,17 @@ in stdenvNoCC.mkDerivation ({ pname = "mkl"; inherit version; - dontUnpack = stdenvNoCC.isLinux; + dontUnpack = stdenvNoCC.hostPlatform.isLinux; - sourceRoot = if stdenvNoCC.isDarwin then "." else null; + sourceRoot = if stdenvNoCC.hostPlatform.isDarwin then "." else null; - nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin + nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.hostPlatform.isDarwin then [ _7zz cctools ] else [ rpmextract ]); - buildPhase = if stdenvNoCC.isDarwin then '' + buildPhase = if stdenvNoCC.hostPlatform.isDarwin then '' for f in bootstrapper.app/Contents/Resources/packages/*/cupPayload.cup; do tar -xf $f done @@ -110,9 +110,9 @@ in stdenvNoCC.mkDerivation ({ # Dynamic libraries mkdir -p $out/lib - cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib - cp -a opt/intel/oneapi/compiler/${mklVersion}/${if stdenvNoCC.isDarwin then "mac" else "linux"}/compiler/lib/${lib.optionalString stdenvNoCC.isLinux "intel64_lin"}/*${shlibExt}* $out/lib - cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib + cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib + cp -a opt/intel/oneapi/compiler/${mklVersion}/${if stdenvNoCC.hostPlatform.isDarwin then "mac" else "linux"}/compiler/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64_lin"}/*${shlibExt}* $out/lib + cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib # Headers cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ @@ -121,10 +121,10 @@ in stdenvNoCC.mkDerivation ({ cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib '' + (if enableStatic then '' - install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*.a + install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*.a install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*.pc '' else '' - cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib + cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc '') + '' # Setup symlinks for blas / lapack @@ -142,7 +142,7 @@ in stdenvNoCC.mkDerivation ({ # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. - postFixup = lib.optionalString stdenvNoCC.isDarwin '' + postFixup = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' for f in $out/lib/*.dylib; do install_name_tool -id $out/lib/$(basename $f) $f || true done @@ -176,7 +176,7 @@ in stdenvNoCC.mkDerivation ({ platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ bhipple ]; }; -} // lib.optionalAttrs stdenvNoCC.isDarwin { +} // lib.optionalAttrs stdenvNoCC.hostPlatform.isDarwin { src = fetchurl { url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/087a9190-9d96-4b8c-bd2f-79159572ed89/m_onemkl_p_${mklVersion}.${rel}_offline.dmg"; hash = "sha256-bUaaJPSaLr60fw0DzDCjPvY/UucHlLbCSLyQxyiAi04="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index adeb03d712..54b4f7cabd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation rec { # This seems to be a bug in the openblas Makefile: # on x86_64 it expects NO_BINARY_MODE= # but on aarch64 it expects NO_BINARY_MODE=0 - NO_BINARY_MODE = if stdenv.isx86_64 + NO_BINARY_MODE = if stdenv.hostPlatform.isx86_64 then toString (stdenv.hostPlatform != stdenv.buildPlatform) else stdenv.hostPlatform != stdenv.buildPlatform; # This disables automatic build job count detection (which honours neither enableParallelBuilding nor NIX_BUILD_CORES) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 43ad807a9d..a0f599f5d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" - ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; strictDeps = true; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { python.pythonOnBuildForHost swig unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix index bb5d212061..39b5660494 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { # disallow Darwin checks due to prototype incompatibility of qsort_r # to be fixed in a future version of the source code - doCheck = !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; meta = { branch = "prev3-develop"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index b36f486478..f7b4ba6738 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ]; # xslu and xsllt tests seem to time out on x86_64-darwin. # this line is left so those who force installation on x86_64-darwin can still build - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); preConfigure = '' cmakeFlagsArray+=( @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ costrouc markuskowa gdinh ]; # xslu and xsllt tests fail on x86 darwin - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 2d0b416d97..c0b6561e00 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) ''; - cmakeFlags = [ (lib.cmakeBool "GRAPHBLAS_USE_JIT" (!(stdenv.isLinux && stdenv.isAarch64))) ]; + cmakeFlags = [ + (lib.cmakeBool "GRAPHBLAS_USE_JIT" ( + !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) + )) + ]; meta = with lib; { description = "Graph algorithms in the language of linear algebra"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix index f47b5c0ce8..ef859cfc1c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' '' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "LAPACK=-llapack" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.hostPlatform.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index 43623e8604..28909f53fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "CUDA_PATH=${cudaPackages.cuda_nvcc}" "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so" "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ] ; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Ensure that there is enough space for the `fixDarwinDylibNames` hook to # update the install names of the output dylibs. NIX_LDFLAGS = "-headerpad_max_install_names"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix index 91714bfd3e..ea2ed2e83d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "$out/bin/sympow" -curve "[1,-1,0,-79,289]" -analrank | grep ^"Analytic Rank is 4" "$out/bin/sympow" -curve "[0,1,1,-2,0]" -analrank | grep ^"Analytic Rank is 2" '' - + lib.optionalString (!stdenv.isAarch64) '' + + lib.optionalString (!stdenv.hostPlatform.isAarch64) '' "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 9f9405dec3..218b05b911 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -7,7 +7,7 @@ let buildPlatform = stdenv.buildPlatform; hostPlatform = stdenv.hostPlatform; - pythonEnv = buildPackages.python3.withPackages (ps: [ ps.numpy ]); + pythonEnv = buildPackages.python3.withPackages (ps: with ps; [ distutils numpy ]); bazelDepsSha256ByBuildAndHost = { x86_64-linux = { x86_64-linux = "sha256-61qmnAB80syYhURWYJOiOnoGOtNa1pPkxfznrFScPAo="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index e149f6bd94..ada84ef507 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -158,6 +158,6 @@ in maintainers = with maintainers; [connorbaker]; platforms = platforms.linux; # g++: error: unrecognized command-line option '-mf16c' - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix index 2e2e2a871f..efcfa99be0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -137,6 +137,6 @@ stdenv.mkDerivation rec { platforms = with platforms; unix; maintainers = with maintainers; [ teto rgrunbla ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 7f6325faef..6e12e19d59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-L7VlsxgjWPCceDuJ9OR6Et6wzaBn1hb0AOFbc7PuZWw="; + hash = "sha256-1Pro2BXflitUGVbzvjwdSFqwWM/EeuDC3eHEj+7qwm8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix index 1a2f407f9b..07138596d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ lib.optional (!stdenv.isCygwin) libkrb5; + ++ lib.optional (!stdenv.hostPlatform.isCygwin) libkrb5; patches = [ ./scons.patch @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { sconsFlags+=" CC=$CC" sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" - '' + lib.optionalString (!stdenv.isCygwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isCygwin) '' sconsFlags+=" GSSAPI=${libkrb5.dev}" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix index c3ecd3a986..2b28228c5f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ freetype libjpeg openal flac libvorbis glew ] - ++ lib.optional stdenv.isLinux udev - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + ++ lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation AppKit OpenAL ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" diff --git a/third_party/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix index da63b22f9e..f38db198bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index 7f4b73c793..d2a4206e7d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { doFakeLibgcc = true; }); - patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ]; postPatch = '' # disable broken 'nametabletest' test, fails on gcc-13: # https://github.com/silnrsi/graphite/pull/74 diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix index 099a3d838b..d310e3653e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; - buildInputs = [ SDL ] ++ lib.optionals (!stdenv.isDarwin) [ gtk2 libGLU libGL ]; + buildInputs = [ SDL ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk2 libGLU libGL ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix index 24dd9c9dc4..bcece08e61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ]; buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.libobjc; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix index 007a4fbaf7..3ba387436e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sqlite postgresql boost - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Kerberos ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index b9f34eeb97..7b33ed0487 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; }; - buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; + buildInputs = [ glib openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin SystemConfiguration; nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix index 4ab71b36a0..6b82b5f4f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = '' installManPage sonic.1 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix index 8bee16fef7..1dbaa016cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit Cocoa diff --git a/third_party/nixpkgs/pkgs/development/libraries/speexdsp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speexdsp/default.nix index 0f5e09cf83..e3452beab8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/speexdsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/speexdsp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withFftw3 [ fftw ]; configureFlags = lib.optionals withFftw3 [ "--with-fft=gpl-fftw3" ] - ++ lib.optional stdenv.isAarch64 "--disable-neon"; + ++ lib.optional stdenv.hostPlatform.isAarch64 "--disable-neon"; meta = with lib; { homepage = "https://www.speex.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix index 1d3f8b489f..75634072b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran gtest ]; - buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ openmp ]; cmakeFlags = [ "-DSPGLIB_WITH_Fortran=On" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index fd7428213f..048ba14f5f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -37,7 +37,7 @@ , wayland-scanner , zlib , wrapGAppsHook3 -, withPolkit ? stdenv.isLinux +, withPolkit ? stdenv.hostPlatform.isLinux }: # If this package is built with polkit support (withPolkit=true), @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { wrapGAppsHook3 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ mesonEmulatorHook - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withPolkit [ polkit acl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng libdrm wayland-protocols @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" ] ++ lib.optionals (!withPolkit) [ "-Dpolkit=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dlibcap-ng=disabled" "-Degl=disabled" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix index d7855cd5ce..4ac1b1cdee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing spice-protocol zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gdk-pixbuf ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index dd4e15ea56..ed1499abe6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 2b843c0b22..1c8ab1f346 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -13,7 +13,7 @@ let }; nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = [ tcl ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; makeFlags = [ makeTarget ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/default.nix index b74f19e195..c37365652e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; # Fix 'error: unrecognized command line option' in platforms other than x86 - PLAT_FLAGS = lib.optionalString stdenv.isx86_64 "-mfpmath=sse -mssse3"; + PLAT_FLAGS = lib.optionalString stdenv.hostPlatform.isx86_64 "-mfpmath=sse -mssse3"; patches = [ # Remove unnecessary tests (valgrind, coverage) diff --git a/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix index b79020e3ba..91a41ac352 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i s/-soname/-install_name/ Makefile '' # upstream builds shared library unconditionally. Also, it has no diff --git a/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix index 5d58212d70..31d9098242 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, parallelSupport ? (!stdenv.isDarwin) +, parallelSupport ? (!stdenv.hostPlatform.isDarwin) }: let diff --git a/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix b/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix index 25043bbb02..cbdb542dbf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DWITH_SYMENGINE_THREAD_SAFE=yes" "-DWITH_MPC=yes" "-DBUILD_FOR_DISTRIBUTION=yes" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not? "-DBUILD_TESTS=OFF" ] ++ lib.optionals withShared [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/t1lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/t1lib/default.nix index 16112f32b1..e09ed7ee32 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/t1lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/t1lib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # ?? chmod +x $out/lib/*.so.* ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix index 0446d2cac6..9520f9a840 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ] ++ lib.optionals withJpegSupport [ libjpeg diff --git a/third_party/nixpkgs/pkgs/development/libraries/taco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/taco/default.nix index 693b5f25f9..a2f2f93321 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/taco/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optional enablePython pyEnv; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix index 832756d1ef..3eaa0e2385 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.3.0"; + version = "12.3.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-dhdUbEnwj4hP/Mn9bT6nja9OjPdXftzZou7mtH+P9bI="; + hash = "sha256-ihrtUd9R8Tdkuv0kdIZNzBDrhwmsC3LNDsmoCroSMPM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix index 793fc1ccf5..eb1525fb9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wafHook docbook-xsl-nons docbook_xml_dtd_42 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix index dcd21b27ff..c7e1e91276 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = (lib.optionals stdenv.isDarwin [ + nativeBuildInputs = (lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/2021_5.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/2021_5.nix index 3bfa927810..90e7aa2a9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/2021_5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/2021_5.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; # Fix undefined reference errors with version script under LLVM. NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix index 73ea56b306..3ff04d6bf1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; # Fix undefined reference errors with version script under LLVM. NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix index d78f4abafa..c84ded6267 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - postFixup = if stdenv.isDarwin + postFixup = if stdenv.hostPlatform.isDarwin then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' else null; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix index d02bd3b810..f9a87aa73b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { function(generate_pkgconfig' \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' sed -i "/vptr/d" test/CMakeLists.txt ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix index 85470f606f..85ac4b0266 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ llvmPackages_12.llvm cargo ]; propagatedBuildDeps = [ llvmPackages_12.libllvm ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix index 7995a3fe16..589f03c688 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { disabledTests = [ "PythonTestSSLSocket" "PythonThriftTNonblockingServer" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Tests that hang up in the Darwin sandbox "SecurityTest" "SecurityFromBufferTest" @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" + ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 28b14d3a8a..9b834c3a7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-tiledb" "doc" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix b/third_party/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix index ded5013cca..456fd7fe2d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.9"; nativeBuildInputs = [ unzip ]; buildPhase = '' @@ -78,7 +78,7 @@ in stdenv.mkDerivation { cp -v tinyxml.pc $out/lib/pkgconfig/ cp -v docs/* $out/share/doc/tinyxml/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tk/8.5.nix b/third_party/nixpkgs/pkgs/development/libraries/tk/8.5.nix index afd575915f..ad0013060f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tk/8.5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tk/8.5.nix @@ -14,7 +14,7 @@ callPackage ./generic.nix (args // { sha256 = "1yhgcalldrjlc5q614rlzg1crgd3b52dhrk1pncdaxvl2vgg2yj0"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Define MODULE_SCOPE before including tkPort.h # https://core.tcl-lang.org/tk/info/dba9f5ce3b (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix index 4978f8b96f..232ae01abb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] -, enableAqua ? stdenv.isDarwin, darwin +, enableAqua ? stdenv.hostPlatform.isDarwin, darwin , ... }: tcl.mkTclDerivation { @@ -22,7 +22,7 @@ tcl.mkTclDerivation { substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done '' - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' substituteInPlace unix/configure* \ --replace " -framework UniformTypeIdentifiers" "" ''; @@ -32,13 +32,13 @@ tcl.mkTclDerivation { cp ../{unix,generic}/*.h $out/include ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary} '' - + lib.optionalString (stdenv.isDarwin) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' cp ../macosx/*.h $out/include ''; configureFlags = [ "--enable-threads" - ] ++ lib.optional stdenv.is64bit "--enable-64bit" + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit" ++ lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tkimg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tkimg/default.nix index 8b66e195d5..f058585d3a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tkimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tkimg/default.nix @@ -16,7 +16,7 @@ tcl.mkTclDerivation rec { "--with-tkinclude=${tk.dev}/include" ]; - buildInputs = [ xorg.libX11 tcllib ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = [ xorg.libX11 tcllib ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix b/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix index 3f95d5682f..30632e1160 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # tftest-build fails on aarch64-linux - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "TOML parser implementation for data serialization and deserialization in Fortran"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 6d3a29c28b..34b37d1c74 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -10,7 +10,7 @@ let # needs to be conditional based on isLinux because procps for other systems # might not support the withSystemd option. procpsWithoutSystemd = procps.override { withSystemd = false; }; - procps_pkg = if stdenv.isLinux then procpsWithoutSystemd else procps; + procps_pkg = if stdenv.hostPlatform.isLinux then procpsWithoutSystemd else procps; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index da5274e0b7..d75bbdd542 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { avahi libstemmer dbus - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; @@ -103,15 +103,15 @@ stdenv.mkDerivation (finalAttrs: { [ "--cross-file=${crossFile}" ] - ) ++ lib.optionals (!stdenv.isLinux) [ + ) ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dsystemd_user_services=false" ]; doCheck = # https://gitlab.gnome.org/GNOME/tracker/-/issues/402 - !stdenv.isDarwin + !stdenv.hostPlatform.isDarwin # https://gitlab.gnome.org/GNOME/tracker/-/issues/398 - && !stdenv.is32bit; + && !stdenv.hostPlatform.is32bit; postPatch = '' chmod +x \ @@ -125,8 +125,8 @@ stdenv.mkDerivation (finalAttrs: { preCheck = let - linuxDot0 = lib.optionalString stdenv.isLinux ".0"; - darwinDot0 = lib.optionalString stdenv.isDarwin ".0"; + linuxDot0 = lib.optionalString stdenv.hostPlatform.isLinux ".0"; + darwinDot0 = lib.optionalString stdenv.hostPlatform.isDarwin ".0"; extension = stdenv.hostPlatform.extensions.sharedLibrary; in '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix index 662ec1c7b0..dede0e5565 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-Wno-error=gnu-folding-constant" ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix index 7206b6ad98..f758c00810 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mkg20001 ]; mainProgram = "uclient-fetch"; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix index f9c5a80582..5dad256063 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # udns uses a very custom build and hardcodes a .so name in a few places. # Instead of fighting with it to apply the standard dylib script, change # the right place in the Makefile itself. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.in \ --replace --soname, -install_name,$out/lib/ ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/unicorn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unicorn/default.nix index b6a91a7367..94e9efeea8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unicorn/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, IOKit -, cctools +{ + lib, + stdenv, + cctools, + cmake, + fetchFromGitHub, + IOKit, + pkg-config, }: stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.0.1.post1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "unicorn-engine"; - repo = pname; - rev = version; - hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI="; + repo = "unicorn"; + rev = "refs/tags/${version}"; + hash = "sha256-o2syI3kBmofC9OFkUbUFCMpXGL5JlGviCLum+9Bi0LQ="; }; - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - cctools - ]; + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals stdenv.isDarwin [ + cctools + ]; - buildInputs = lib.optionals stdenv.isDarwin [ - IOKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Some x86 tests are interrupted by signal 10 "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86" ]; @@ -44,6 +45,9 @@ stdenv.mkDerivation rec { homepage = "https://www.unicorn-engine.org"; license = licenses.gpl2Only; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice luc65r ]; + maintainers = with maintainers; [ + thoughtpolice + luc65r + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index fe181d37f6..bd27a36d66 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -39,7 +39,7 @@ nativeBuildInputs = [ cmake ]; buildInputs = [ unixODBC openssl libiconv zlib ] - ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libkrb5 ]; cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" @@ -50,9 +50,9 @@ "-DWITH_IODBC=OFF" ]; - buildFlags = if stdenv.isDarwin then [ "maodbc" ] else null; + buildFlags = if stdenv.hostPlatform.isDarwin then [ "maodbc" ] else null; - installTargets = if stdenv.isDarwin then [ "install/fast" ] else null; + installTargets = if stdenv.hostPlatform.isDarwin then [ "install/fast" ] else null; # see the top of the file for an explanation passthru = { @@ -170,7 +170,7 @@ }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "ODBC Driver ${versionMajor} for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; @@ -187,7 +187,7 @@ versionMajor = "18"; versionMinor = "1"; versionAdditional = "1.1"; - versionSuffix = lib.optionalString stdenv.isLinux "-1"; + versionSuffix = lib.optionalString stdenv.hostPlatform.isLinux "-1"; src = fetchurl { url = { @@ -205,7 +205,7 @@ }; nativeBuildInputs = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then [ # Fix up the names encoded into the dylib, and make them absolute. @@ -217,12 +217,12 @@ patchelf ]; - unpackPhase = lib.optionalString stdenv.isLinux '' + unpackPhase = lib.optionalString stdenv.hostPlatform.isLinux '' dpkg -x $src ./ ''; installPhase = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out @@ -236,14 +236,14 @@ ''; # Replace the hard-coded paths in the dylib with nixpkgs equivalents. - fixupPhase = lib.optionalString stdenv.isDarwin '' + fixupPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' ${stdenv.cc.bintools.targetPrefix}install_name_tool \ -change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \ -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \ $out/${finalAttrs.passthru.driver} ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \ $out/${finalAttrs.passthru.driver} ''; @@ -251,7 +251,7 @@ # see the top of the file for an explanation passthru = { fancyName = "ODBC Driver ${finalAttrs.versionMajor} for SQL Server"; - driver = "lib/libmsodbcsql${if stdenv.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; + driver = "lib/libmsodbcsql${if stdenv.hostPlatform.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; }; meta = with lib; { @@ -300,7 +300,7 @@ }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Amazon Redshift ODBC driver"; homepage = "https://docs.aws.amazon.com/redshift/latest/mgmt/configure-odbc-connection.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix index 3ea2d07560..b6b2d4e629 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -101,11 +101,11 @@ stdenv.mkDerivation rec { ''; postPatch = '' - ${lib.optionalString stdenv.isAarch64 '' + ${lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build/config/compiler/compiler.gni \ --replace 'strip_absolute_paths_from_debug_symbols = true' \ 'strip_absolute_paths_from_debug_symbols = false' @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build/config/compiler/BUILD.gn \ --replace "-Wl,-fatal_warnings" "" ''} @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' - ++ lib.optional stdenv.isDarwin ''use_lld=false''; + ++ lib.optional stdenv.hostPlatform.isDarwin ''use_lld=false''; env.NIX_CFLAGS_COMPILE = toString ([ "-O2" @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild llvmPackages.llvm python3.pkgs.setuptools diff --git a/third_party/nixpkgs/pkgs/development/libraries/vc/0.7.nix b/third_party/nixpkgs/pkgs/development/libraries/vc/0.7.nix index 50eaddda89..fa0e6feb7d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vc/0.7.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vc/0.7.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/vcdimager/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vcdimager/default.nix index 5c3140a177..02f959cf74 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vcdimager/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vcdimager/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 popt libiconv ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); propagatedBuildInputs = [ libcdio ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vectorscan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vectorscan/default.nix index 835db0f356..8525a66e40 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vectorscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vectorscan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pkg-config ragel python3 - ] ++ lib.optional stdenv.isLinux util-linux; + ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux; buildInputs = [ boost184 @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { (if lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" ] then [ "-DBUILD_AVX2=ON" "-DBUILD_AVX512=ON" "-DBUILD_AVX512VBMI=ON" "-DFAT_RUNTIME=ON" ] else - (if (stdenv.isLinux && stdenv.isAarch64) then + (if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then [ "-DBUILD_SVE=ON" "-DBUILD_SVE2=ON" "-DBUILD_SVE2_BITPERM=ON" "-DFAT_RUNTIME=ON" ] else [ "-DFAT_RUNTIME=OFF" ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/virtualpg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/virtualpg/default.nix index d9778decd1..e159614370 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/virtualpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/virtualpg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ postgresql sqlite ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; meta = with lib; { description = "Loadable dynamic extension to both SQLite and SpatiaLite"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix index 11df1a495f..d2840ba33a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ boost lapack ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Vector and matrix math library implemented using C++ templates"; longDescription = ''vmmlib is a vector and matrix math library implemented diff --git a/third_party/nixpkgs/pkgs/development/libraries/vrpn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vrpn/default.nix index e233269faf..3272a4bbd1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vrpn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vrpn/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { unzip ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.GLUT darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.OpenGL - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix index 6981de6aa0..029e4c617f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost sqlite ]; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.in \ --replace '-Wl,--as-needed' "" \ --replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index 87cf27f70f..479758ed6d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "gtk4" (gtkVersion == "4")) ] ++ lib.optionals (!systemdSupport) [ "-D_systemd=false" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # -Bsymbolic-functions is not supported on darwin "-D_b_symbolic_functions=false" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix index d131fe173a..3f7f05678f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation { buildInputs = [ libpng libtiff ] ++ optionals enableQt [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ] - ++ optionals stdenv.isLinux [ + ++ optionals stdenv.hostPlatform.isLinux [ libGLU xorgproto libXt - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ xpc AGL Cocoa @@ -52,8 +52,8 @@ in stdenv.mkDerivation { ] ++ optionals enablePython [ python ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ] - ++ optionals stdenv.isLinux [ libX11 libGL ]; + propagatedBuildInputs = optionals stdenv.hostPlatform.isDarwin [ libobjc ] + ++ optionals stdenv.hostPlatform.isLinux [ libX11 libGL ]; # see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254 patches = map fetchpatch patchesToFetch; @@ -64,7 +64,7 @@ in stdenv.mkDerivation { -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \ -i IO/Image/vtkSEPReader.h '' - + optionalString stdenv.isDarwin '' + + optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c @@ -83,7 +83,7 @@ in stdenv.mkDerivation { "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON" "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1" "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl) ] ++ [ @@ -94,7 +94,7 @@ in stdenv.mkDerivation { ] ++ optionals enableQt [ "-DVTK_GROUP_ENABLE_Qt:STRING=YES" ] - ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 9b5916810a..3a0d14eb9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # TODO: investigate why isn't found - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ]; src = fetchFromGitHub { owner = "KhronosGroup"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index a43dda1b5f..3c002d197f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ ./fix-pkgconfig.patch ] - ++ lib.optionals stdenv.is32bit [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ # Backport patch to support 64-bit inodes on 32-bit systems # FIXME: remove in next update (fetchpatch { @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ vulkan-headers ] - ++ lib.optionals stdenv.isLinux [ libX11 libxcb libXrandr wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libXrandr wayland ]; cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] - ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" - ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share" + ++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share" + ++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF"; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix index b7173ed937..9ee55b47d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # test failure on aarch64-linux; unknown reason: - cmakeFlags = lib.optionals stdenv.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wangle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wangle/default.nix index e90d05318e..d07145641a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wangle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wangle/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/facebook/wangle/issues/206 "SSLContextManagerTest.TestSessionContextCertRemoval" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky "BroadcastPoolTest.ThreadLocalPool" "Bootstrap.UDPClientServerTest" diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix index 3cd2ba5dbe..72ba54250b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -5,7 +5,7 @@ , pkg-config , ninja , wayland-scanner -, withTests ? stdenv.isLinux +, withTests ? stdenv.hostPlatform.isLinux , libffi , epoll-shim , withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index ecf306966c..5ad079e133 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -80,14 +80,14 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/153528 # Can't be linked within a 4GB address space. - separateDebugInfo = stdenv.isLinux && !stdenv.is32bit; + separateDebugInfo = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.is32bit; src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; hash = "sha256-3ILQQuysqYGkhSNXwG5SNXQzGc8QqUzTatQbl4g6C1Q="; }; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { gi-docgen glib # for gdbus-codegen unifdef - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -151,10 +151,10 @@ stdenv.mkDerivation (finalAttrs: { p11-kit sqlite woff2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libedit readline - ] ++ lib.optional (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( + ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( # this can likely be removed as: # "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one." # but the package is marked broken on darwin so unable to test @@ -166,7 +166,7 @@ stdenv.mkDerivation (finalAttrs: { runCommand "webkitgtk_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' - ) ++ lib.optionals stdenv.isLinux [ + ) ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp libmanette wayland @@ -200,12 +200,12 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Have to be explicitly specified when cross. # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}" "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" "-DENABLE_MINIBROWSER=OFF" @@ -244,6 +244,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 3ac5e2bd4a..a3efc646d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./enable-powerpc.patch ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix index b25ea77b44..1a34ade3ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { abseil-cpp ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); - env = lib.optionalAttrs stdenv.isx86_32 { + env = lib.optionalAttrs stdenv.hostPlatform.isx86_32 { # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 NIX_CFLAGS_COMPILE = "-msse2"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 9a8d0b299f..7f6213c7df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -137,8 +137,8 @@ rec { }; wlroots_0_18 = generic { - version = "0.18.0"; - hash = "sha256-LiRnvu7qCbfSg+ONWVCtWwdzxxFZHfbgmy7zApCIW40="; + version = "0.18.1"; + hash = "sha256-BlI3EUoGEHdO6IBh99o/Aadct2dd7Xjc4PG0Sv+flqI="; extraNativeBuildInputs = [ hwdata ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index c55ad0010d..aeef5a8c47 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. "--enable-intelasm" "--enable-aesni" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ # No runtime detection under ARM and no platform function checks like for X86. # However, all ARM macOS systems have the supported extensions autodetected in the configure script. "--enable-armasm=inline" ] ++ extraConfigureFlags; # Breaks tls13 tests on aarch64-darwin. - hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "zerocallusedregs" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "zerocallusedregs" ]; # LTO should help with the C implementations. env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index d14a77a670..5182cc2ff9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libexif pango wxGTK - ] ++ lib.optional stdenv.isDarwin Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix index e986ab87ff..7ad997e6d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ sqlite wxGTK ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa setfile rez derez ]; meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix index 0775dca688..2d980c69cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix @@ -15,23 +15,23 @@ stdenv.mkDerivation rec { sed -i '/WX_CLEAR_ARRAY/s/$/;/' src/{createtable,sqlite3table}.cpp ''; - buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; makeFlags = [ "LDFLAGS=-L${wxsqlite3}/lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "SETFILE=${setfile}/bin/SetFile" ]; preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.hostPlatform.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile ''; installPhase = '' - install -D ${lib.optionalString stdenv.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus - '' + lib.optionalString stdenv.isDarwin '' + install -D ${lib.optionalString stdenv.hostPlatform.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv wxsqliteplus.app $out/Applications/ ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix index be0c45c701..21333afe5e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -18,8 +18,8 @@ , withCurl ? false , withPrivateFonts ? false , withEGL ? true -, withMesa ? !stdenv.isDarwin -, withWebKit ? stdenv.isDarwin +, withMesa ? !stdenv.hostPlatform.isDarwin +, withWebKit ? stdenv.hostPlatform.isDarwin , webkitgtk , setfile , AGL @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gstreamer - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 libSM libXinerama @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk - ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk + ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ setfile Carbon Cocoa @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { WebKit ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL; configureFlags = [ "--disable-precomp-headers" @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ++ lib.optional withCurl "--enable-webrequest" ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optional withMesa "--with-opengl" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-osx_cocoa" "--with-libiconv" ] ++ lib.optionals withWebKit [ @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = '' substituteInPlace configure --replace \ @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' substituteInPlace configure --replace \ /usr /no-such-path - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix index a77dedb0c6..055000cfa6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -20,7 +20,7 @@ , compat28 ? false , compat30 ? true , unicode ? true -, withMesa ? !stdenv.isDarwin +, withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? true , webkitgtk , setfile @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libjpeg_turbo zlib pcre2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libSM libXinerama @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.isLinux) webkitgtk - ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat setfile Carbon @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { WebKit ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL; configureFlags = [ "--disable-precomp-headers" @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { (if compat30 then "--enable-compat30" else "--disable-compat30") ] ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-osx_cocoa" "--with-libiconv" ] ++ lib.optionals withWebKit [ @@ -114,12 +114,12 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib"; + SEARCH_LIB = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib"; preConfigure = '' cp -r ${catch}/* 3rdparty/catch/ cp -r ${nanosvg}/* 3rdparty/nanosvg/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' substituteInPlace configure \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix index 2be8ea48b8..de4a3d8d78 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./disable-arm-neon-default.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace '$(if $(STRIP), $(STRIP) -x $@)' '$(if $(STRIP), $(STRIP) -S $@)' ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; configureFlags = lib.optional enableShared "--enable-shared" - ++ lib.optional (!stdenv.isi686) "--enable-pic" + ++ lib.optional (!stdenv.hostPlatform.isi686) "--enable-pic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix index 8e16ca72e0..a436a59aea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -10,14 +10,14 @@ , numactl # Multi bit-depth support (8bit+10bit+12bit): -, multibitdepthSupport ? (stdenv.is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) +, multibitdepthSupport ? (stdenv.hostPlatform.is64bit && !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux)) # Other options: , cliSupport ? true # Build standalone CLI application , custatsSupport ? false # Internal profiling of encoder work , debugSupport ? false # Run-time sanity checks (debugging) , ppaSupport ? false # PPA profiling instrumentation -, unittestsSupport ? stdenv.isx86_64 # Unit tests - only testing x64 assembly +, unittestsSupport ? stdenv.hostPlatform.isx86_64 # Unit tests - only testing x64 assembly , vtuneSupport ? false # Vtune profiling instrumentation , werrorSupport ? false # Warnings as errors }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix index 0862fcfe25..c8a28166a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -34,13 +34,13 @@ let env = { AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - } // lib.optionalAttrs stdenv.is32bit { + } // lib.optionalAttrs stdenv.hostPlatform.is32bit { NIX_CFLAGS_COMPILE = "-fpermissive"; }; # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.h \ --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix index 2d0960e3ff..14c4b0a7e5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs tools/patcheck patchShebangs tools/regression-test.pl patchShebangs tools/xavs-format - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.guess --replace 'uname -p' 'uname -m' substituteInPlace configure \ --replace '-O4' '-O3' \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix index 1fb634a80b..2918ae7f3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4="; }; - nativeBuildInputs = [ mbuild ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.bintools ]; + nativeBuildInputs = [ mbuild ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools ]; buildPhase = '' patchShebangs mfile.py @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { dontInstall = true; # already installed during buildPhase meta = with lib; { - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 2b96bede31..c294551eef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -67,7 +67,7 @@ effectiveStdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] - ++ lib.optionals effectiveStdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ] ++ lib.optionals rLibrary [ R ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix index d76b2031aa..d36804c6bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { xercesc openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CoreServices SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix index 5ec3d44dfb..9a3c150b3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Configure script is not in the root of the source directory cd build/generic - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Undocumented darwin hack substituteInPlace configure --replace "-no-cpp-precomp" "" ''; @@ -20,18 +20,18 @@ stdenv.mkDerivation rec { configureFlags = [ ] # Undocumented darwin hack (assembly is probably disabled due to an # issue with nasm, however yasm is now used) - ++ lib.optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-macosx_module --disable-assembly"; nativeBuildInputs = [ ] - ++ lib.optional (!stdenv.isDarwin) yasm; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) yasm; buildInputs = [ ] # Undocumented darwin hack - ++ lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoconf automake libtool ]; # Don't remove static libraries (e.g. 'libs/*.a') on darwin. They're needed to # compile ffmpeg (and perhaps other things). - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' rm $out/lib/*.a ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix index 3af451ec84..e60008994b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ] - ++ lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices SystemConfiguration ]; meta = with lib; { description = "Yubico PAM module"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index 9c8db31593..5c6a0ba9bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -78,6 +78,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix index 91a458c0ef..af63346712 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/ql.nix @@ -86,7 +86,7 @@ let cffi-libffi = super.cffi-libffi.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.libffi ]; nativeLibs = [ pkgs.libffi ]; - patches = lib.optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; }); cl-rabbit = super.cl-rabbit.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.rabbitmq-c ]; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 5a6d1b98ae..9d31358dbf 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -273,14 +273,14 @@ buildLuarocksPackage { compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; - version = "0.13-1"; + version = "0.14.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/compat53-0.13-1.rockspec"; - sha256 = "10gmhd526a5q0dl4dvjq7a5c7f3i7hcdla8hpygl79dhgbm649i3"; + url = "mirror://luarocks/compat53-0.14.3-1.rockspec"; + sha256 = "0c50x5nprcfafjnb4gzy23xszmr97mspy1g9m6pyj81c2648288n"; }).outPath; src = fetchzip { - url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.13.zip"; - sha256 = "06kpx5qyk1zki2r2g6z3alwhvmays50670z7mbl55h7s0kff2cpz"; + url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.14.3.zip"; + sha256 = "00qgfl5n2rfp1gikky03dmc30jy4piz0js8d7zznaclxsq2nyp2x"; }; disabled = luaOlder "5.1" || luaAtLeast "5.5"; @@ -387,23 +387,23 @@ buildLuarocksPackage { }; }) {}; -digestif = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaOlder }: +digestif = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; - version = "0.5.1-1"; + version = "0.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/digestif-0.5.1-1.rockspec"; - sha256 = "03hhzpq1szdw43slq38wbndwh8knv71q9pgwd7hvvkp9wykzjhwr"; + url = "mirror://luarocks/digestif-0.6-1.rockspec"; + sha256 = "0hp7r97b6ivywaxb02cbnm23gjz71mak5ag6m3hi7f3mjqxxxh8k"; }).outPath; src = fetchFromGitHub { owner = "astoff"; repo = "digestif"; - rev = "v0.5.1"; - hash = "sha256-8QTc4IKD1tjRlyrSZy7cyUzRkvm6IHwlOXchPf2BaMk="; + rev = "v0.6"; + hash = "sha256-sGwKt9suRVNrbRJlhNMHzc5r4sK/fvUc7smxmxmrn8Y="; }; disabled = luaOlder "5.3"; - propagatedBuildInputs = [ lpeg ]; + propagatedBuildInputs = [ lpeg luafilesystem ]; meta = { homepage = "https://github.com/astoff/digestif/"; @@ -437,16 +437,16 @@ buildLuarocksPackage { fennel = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.5.0-1"; + version = "1.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.5.0-1.rockspec"; - sha256 = "0h3a8pinazcp3r3pwkm5inh0aynq9iizljhpk6sj8zhhp0s0bi4g"; + url = "mirror://luarocks/fennel-1.5.1-1.rockspec"; + sha256 = "02wq1rlgv2zl1x30vqpdf5nmblxv7kkwx9lwplj4rj1fp9s3m8mh"; }).outPath; src = fetchFromGitHub { owner = "bakpakin"; repo = "Fennel"; - rev = "1.5.0"; - hash = "sha256-4jF22lpfapxQvwH/vQh/ePiEfOc8pP2b7roOzPXZRTQ="; + rev = "1.5.1"; + hash = "sha256-ciXElwX/F8YCFA6C0F3+8lnUPQlKYpcdpagAjoXZpyY="; }; disabled = luaOlder "5.1"; @@ -555,14 +555,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1415-1"; + version = "0.0.1460-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1415-1.rockspec"; - sha256 = "039hy10ml25z2kvm5xiayvswx42rj4di119vgl2ncrfvlr5lnxdf"; + url = "mirror://luarocks/fzf-lua-0.0.1460-1.rockspec"; + sha256 = "16bb285h191lx2cf2sjcljh9nlrzy45j0l8zhyy9c4jxd65jp3vp"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/e9413dc2b6e8ab7f62385c972df1dceba483492d.zip"; - sha256 = "09bh0rjx9g96vz0zfnpi4ych64qawrj1rgrpznkjn1cph8qayj35"; + url = "https://github.com/ibhagwan/fzf-lua/archive/cf4f7e095f679856fa8fe74e1539fb60fa552bdd.zip"; + sha256 = "04vsj928wm4q73v9jmp3ari5g2hl8m1bk03hm9bxlb879w95vjhb"; }; disabled = luaOlder "5.1"; @@ -606,8 +606,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "562dc47189ad3c8696dbf460d38603a74d544849"; - hash = "sha256-NNoqXn24Fzkopx1/Xwcv41EpqHwpcMPrQWLfXcPtha4="; + rev = "1ef74b546732f185d0f806860fa5404df7614f28"; + hash = "sha256-s3y8ZuLV00GIhizcK/zqsJOTKecql7Xn3LGYmH7NLsQ="; }; disabled = lua.luaversion != "5.1"; @@ -622,14 +622,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "4.0.0-1"; + version = "4.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec"; - sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v"; + url = "mirror://luarocks/haskell-tools.nvim-4.1.0-1.rockspec"; + sha256 = "12p38gnld2j7x8n4hzi8js104pnlz3plk6s0aziy93z6lspm1i94"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip"; - sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.1.0.zip"; + sha256 = "13aj1sxjkjsdmifjq0jgqaiv5rhglb3kv4r3ja1hrpv434889glr"; }; disabled = luaOlder "5.1"; @@ -2088,14 +2088,14 @@ buildLuarocksPackage { luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser"; - version = "4.1.0-1"; + version = "5.0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec"; - sha256 = "sha256-PIvmRtzb9YEkuwXfLfY3w+DrOZZRjGSAvPsnK3dDeWQ="; + url = "mirror://luarocks/luarocks-build-treesitter-parser-5.0.2-1.rockspec"; + sha256 = "037rap1aar6xx25xgnlknkkszarkbflpdfp1jaasq5py397gc61a"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip"; - sha256 = "sha256-KNU/opkfKTZnCYfMOXVuGvb9J+iqfworQ0t2YcHAaKA="; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v5.0.2.zip"; + sha256 = "03f17sljq1f7nqrdjn94p9p2j67bs5si2nl0xlv1njj326rby324"; }; disabled = luaOlder "5.1"; @@ -2112,14 +2112,14 @@ buildLuarocksPackage { luarocks-build-treesitter-parser-cpp = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser-cpp"; - version = "2.0.3-1"; + version = "2.0.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.3-1.rockspec"; - sha256 = "1pn8kn1kf9ak4b7hba1nd358dh146sr993gf8r10s3ywcnihmnw0"; + url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.4-1.rockspec"; + sha256 = "0hrqy1s9c1naad43bri4icf5y139h5wk52yv4f0dxbvsfqbf8isb"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.3.zip"; - sha256 = "1dcjy1vy76vszm9r1ck42w8a1xw0ls0vs9xg5wzh3wnk2d1y54m3"; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.4.zip"; + sha256 = "0r7mvc1f7wgmb4xgknmr38cv35chwdyxmj1fxw4xsdjrvb1qyvi6"; }; disabled = luaOlder "5.1"; @@ -2259,16 +2259,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.4.2-1"; + version = "0.4.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.4.2-1.rockspec"; - sha256 = "15z4n7pbggg1wy397k9mx0jls31snvw0dgr9yklwi4sayfcva3ip"; + url = "mirror://luarocks/luasystem-0.4.4-1.rockspec"; + sha256 = "0gk489qwxfvc5qwmj9fgwi60qnjnqasc665bg8iiggapdwcl5ny4"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.4.2"; - hash = "sha256-xYfHK/OtOFtGHAZTPDp/BTywAcCqJIx8+zt3/HPon0w="; + rev = "v0.4.4"; + hash = "sha256-Lxp3o94QxtsgBMilKBG21mFneh0ux7wRKDyPwMTDDUA="; }; disabled = luaOlder "5.1"; @@ -2407,8 +2407,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9"; - hash = "sha256-gutr36WJRktDxmRjNo0v5tn030nMsAe8vRWx/vKFa2o="; + rev = "45a79ec4acb5af783a6a29673a999ce37f00497e"; + hash = "sha256-meUCXjJ9kHOOpRd4TR2dc7Ai97zOQX35hYFEDZseiSk="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2492,14 +2492,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "2.5.2-1"; + version = "2.8.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.5.2-1.rockspec"; - sha256 = "1sr6yhkq5bwp8bkqx206cr8ignz5z82a6j1dw4qgwdlvzs5kr0vs"; + url = "mirror://luarocks/lz.n-2.8.0-1.rockspec"; + sha256 = "0mkplfgsnlsc1xjcxxx349bi0h28rgri46hb514xicaqi48jvd8q"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v2.5.2.zip"; - sha256 = "0pkw6wrrkzv6vl9jxx7qlr8yjghnkr1s7jy66dsw5yzfb8gz8kpd"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v2.8.0.zip"; + sha256 = "18p7zwns44b29pkm3iwh0wsdx1227ja1vww6g13m7gcsvn0h2pgw"; }; disabled = luaOlder "5.1"; @@ -2718,17 +2718,39 @@ buildLuarocksPackage { }; }) {}; +neorg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-utils-nvim, luaOlder, nui-nvim, nvim-nio, pathlib-nvim, plenary-nvim }: +buildLuarocksPackage { + pname = "neorg"; + version = "9.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/neorg-9.1.1-1.rockspec"; + sha256 = "0zafy1hkrvh41vlx1g4rqlcvc4x9pi8dcji30qi0b8lj45pldyr3"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorg/neorg/archive/v9.1.1.zip"; + sha256 = "18lk22lfzwwn4hy2s035g3kslqmvrr28lm5w9k3dazqwj5nlka3z"; + }; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ lua-utils-nvim nui-nvim nvim-nio pathlib-nvim plenary-nvim ]; + meta = { + homepage = "https://github.com/nvim-neorg/neorg"; + description = "Modernity meets insane extensibility. The future of organizing your life in Neovim."; + maintainers = with lib.maintainers; [ GaetanLepage ]; + license.fullName = "GPL-3.0"; + }; +}) {}; + neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.4.0-1"; + version = "5.6.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.4.0-1.rockspec"; - sha256 = "0bk5z3p2v6m2nwxh82xk0xsqb23xa9i13vfgnd9h9qy3r42jqmmj"; + url = "mirror://luarocks/neotest-5.6.0-1.rockspec"; + sha256 = "06ggk7swsbwy12rqmzkg173wh7sj6jiy6vp7nbb9f7ikgf9iqs6j"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/32ff2ac21135a372a42b38ae131e531e64833bd3.zip"; - sha256 = "144wzzadhrg48fkihffk6jf9c0ij8dg9gng6mcxq5z8mdcvz0124"; + url = "https://github.com/nvim-neotest/neotest/archive/48f8b5fce704594eb0ff94338e080defca14f0dc.zip"; + sha256 = "0cr3qbds7g5ybndaaiafh758v6igzjz65l81mqragk9kcajkwkip"; }; disabled = luaOlder "5.1"; @@ -2836,14 +2858,14 @@ buildLuarocksPackage { pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio }: buildLuarocksPackage { pname = "pathlib.nvim"; - version = "2.2.2-1"; + version = "2.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/pathlib.nvim-2.2.2-1.rockspec"; - sha256 = "04dklc0ibl6dbfckmkpj2s1gvjfmr0k2hyagw37rxypifncrffkr"; + url = "mirror://luarocks/pathlib.nvim-2.2.3-1.rockspec"; + sha256 = "0qwsjcsl6760d8d5k1lxlykh78g6v7xcr9caq3yh75yn76mwrl4i"; }).outPath; src = fetchzip { - url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.2.zip"; - sha256 = "10jhbdffaw1rh1qppzllmy96dbsn741bk46mph5kxpjq4ldx27hz"; + url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.3.zip"; + sha256 = "1z3nwy83r3zbll9wc2wyvg60z0dqc5hm2xdfvqh3hwm5s9w8j432"; }; disabled = luaOlder "5.1"; @@ -2889,8 +2911,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; - hash = "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g="; + rev = "2d9b06177a975543726ce5c73fca176cedbffe9d"; + hash = "sha256-bmmPekAvuBvLQmrnnX0n+FRBqfVxBsObhxIEkDGAla4="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2949,21 +2971,21 @@ buildLuarocksPackage { }; }) {}; -rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-curl, luaOlder, mimetypes, nvim-nio, xml2lua }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, luaOlder, mimetypes, nvim-nio, xml2lua }: buildLuarocksPackage { pname = "rest.nvim"; - version = "2.0.1-1"; + version = "3.8.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-2.0.1-1.rockspec"; - sha256 = "1ra76wnhi4nh56amyd8zqmg0mpsnhp3m41m3iyiq4hp1fah6nbqb"; + url = "mirror://luarocks/rest.nvim-3.8.1-1.rockspec"; + sha256 = "12xabrgbbma759khdk5g4j11qg6c08xz0yf78rpv70x9v1kfjbzi"; }).outPath; src = fetchzip { - url = "https://github.com/rest-nvim/rest.nvim/archive/v2.0.1.zip"; - sha256 = "09rs04d5h061zns1kdfycryx4ll8ix15q3ybpmqsdyp2gn8l77df"; + url = "https://github.com/rest-nvim/rest.nvim/archive/v3.8.1.zip"; + sha256 = "0yg3zmm00m48ahcjvnnkxvz0xqjbwn46jf01rwqzhwrwb9v3323z"; }; disabled = luaOlder "5.1"; - propagatedBuildInputs = [ lua-curl mimetypes nvim-nio xml2lua ]; + propagatedBuildInputs = [ fidget-nvim mimetypes nvim-nio xml2lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; @@ -2976,14 +2998,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "2.2.0-1"; + version = "3.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-2.2.0-1.rockspec"; - sha256 = "129zvspn6ln9yzsxfcgai8vyz7jysxvdf08yy19zdqj0q7swh1iq"; + url = "mirror://luarocks/rocks-config.nvim-3.0.0-1.rockspec"; + sha256 = "08jg5v1jnmg0ig395d6lmsdpa2vw8m9w3barvar0s77a7lkxgywg"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.2.0.zip"; - sha256 = "0vchi7274j4yhs0mv1j2na8k1240xj42kz6787s0vf05xcnywbh6"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v3.0.0.zip"; + sha256 = "16836pxg0bq6f8qj6kn73v75kbwlr533pmv9dal4h53qldqjn9hh"; }; disabled = luaOlder "5.1"; @@ -3000,14 +3022,14 @@ buildLuarocksPackage { rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }: buildLuarocksPackage { pname = "rocks-dev.nvim"; - version = "1.3.0-1"; + version = "1.7.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-dev.nvim-1.3.0-1.rockspec"; - sha256 = "0s8k4kvd7j72ja6qwwxdsqjffkja8pdp95vml5wy9mqwxgvcb5c6"; + url = "mirror://luarocks/rocks-dev.nvim-1.7.0-1.rockspec"; + sha256 = "0jc8nxxbr7m3vw4lcyxi8wm4w0nz1ml54sbs96z4kj0p6mm9fds6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.3.0.zip"; - sha256 = "1fhd4mjbwizszxq3wrcdsczljgssgswqi4ibi8kdmnd9biyvbx65"; + url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.7.0.zip"; + sha256 = "13n9dkv5217qd8dhj54d1rfqp6mx5jir319fmsln47jv83x7micz"; }; disabled = luaOlder "5.1"; @@ -3024,14 +3046,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "2.0.1-1"; + version = "2.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-2.0.1-1.rockspec"; - sha256 = "0r341vg7x49lnmx77smab5hpjpzwih7jmchfh24xhnv6319d70yx"; + url = "mirror://luarocks/rocks-git.nvim-2.3.1-1.rockspec"; + sha256 = "06psladknqjqqg7gb17550iy40bfk6m5pcwr2156xk136dil4bpz"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.0.1.zip"; - sha256 = "121x32915sr8il95jjpza2awvh4jknhgb99c091sb4vmdkg3pj24"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.3.1.zip"; + sha256 = "1y8zs4dcr8npqjicbi8xjgnfb5fhqv0j6mwzpfl2bzm979s6hz4b"; }; disabled = luaOlder "5.1"; @@ -3048,14 +3070,14 @@ buildLuarocksPackage { rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.36.1-1"; + version = "2.40.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.36.1-1.rockspec"; - sha256 = "165kij3rk0inh9g3d3jpczhji9bjc7biz5r30xgw9q5xnafy4q38"; + url = "mirror://luarocks/rocks.nvim-2.40.2-1.rockspec"; + sha256 = "1vblf19kqddn0fs94ra6a58h19qid6591svh7n5kjvk8l3lnk4kv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.36.1.zip"; - sha256 = "0zsrvngwwj9qxsxfbfgfin73aacs763sygixgiibq8rrl6gannxs"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.40.2.zip"; + sha256 = "12b6gfbnv0aw10rk36c8hqf3mjbm9izjf1dpf3r9i4fwimvbp4dd"; }; disabled = luaOlder "5.1"; @@ -3063,7 +3085,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/nvim-neorocks/rocks.nvim"; - description = "Neovim plugin management inspired by Cargo, powered by luarocks"; + description = "🌒 Neovim plugin management inspired by Cargo, powered by luarocks"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-3.0"; }; @@ -3072,14 +3094,14 @@ buildLuarocksPackage { rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rtp.nvim"; - version = "1.1.0-1"; + version = "1.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rtp.nvim-1.1.0-1.rockspec"; - sha256 = "1wmg2rqw8jph4ymmc33j8r47p2ni7fdd3dmiiwp19symslcw71js"; + url = "mirror://luarocks/rtp.nvim-1.2.0-1.rockspec"; + sha256 = "0is9ssi3pwvshm88lnp4hkig4f0ckgl2f3a1axwci89y8lla50iv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.1.0.zip"; - sha256 = "0n3ydd1n0mbc0m81rdbs73gpdr3m6qj735sjqdf36qv52gjcisj8"; + url = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.2.0.zip"; + sha256 = "1b6hx50nr2s2mnhsx9zy54pjdq7f78mi394v2b2c9v687s45nqln"; }; disabled = luaOlder "5.1"; @@ -3095,14 +3117,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "5.2.0-1"; + version = "5.9.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-5.2.0-1.rockspec"; - sha256 = "15pz9m5livp0n2bhal8wmg8hbhvyb6195ayzjcm3xsivplc4drns"; + url = "mirror://luarocks/rustaceanvim-5.9.0-1.rockspec"; + sha256 = "1azrsay1608lx921mlgkxk46xqlf5hbgbnl2n7c71f21xr5q2wq6"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/5.2.0.zip"; - sha256 = "1mswi4fy0ggikl3cpwhx1lar5pb8zcfp9az8zb9cn00cmzf749s4"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.9.0.zip"; + sha256 = "03szlh93579v5gqdiqqi2nqs90g1cm75cahijkwylqq0gj04xyz3"; }; disabled = luaOlder "5.1"; @@ -3314,8 +3336,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3b1600d0fd5172ad9fae00987362ca0ef3d8895d"; - hash = "sha256-F5TGzfPSDQY+AOzaDXStswHjkGQvnLeTWW5/xdBalpo="; + rev = "b324469959908c1c7434eb65d80e87895e6828f7"; + hash = "sha256-j+BAufOZKUhPC0xSXOAaALJBdLNw2fgB1rGDskz4AIE="; }; disabled = lua.luaversion != "5.1"; @@ -3406,14 +3428,14 @@ buildLuarocksPackage { tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser-cpp }: buildLuarocksPackage { pname = "tree-sitter-norg"; - version = "0.2.5-1"; + version = "0.2.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tree-sitter-norg-0.2.5-1.rockspec"; - sha256 = "1w3hns9n92ygc7x3wxq3pd2kjs2nfp1arxq9zda75h2alwapjink"; + url = "mirror://luarocks/tree-sitter-norg-0.2.6-1.rockspec"; + sha256 = "1s0wj59v4zjgimws742ybzy7nhnnkz8nas4y5k96c2z5z54ynxmq"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612.zip"; - sha256 = "12s4lvs2iw3v9hwfcql0phi8gxgpwfj3i6443f0mss5zn7f6w50g"; + url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/v0.2.6.zip"; + sha256 = "077rds0rq10wjywpj4hmmq9dd6qp6sfwbdjyh587laldrfl7jy6g"; }; nativeBuildInputs = [ luarocks-build-treesitter-parser-cpp ]; @@ -3452,16 +3474,16 @@ buildLuarocksPackage { vusted = callPackage({ buildLuarocksPackage, busted, fetchFromGitHub, fetchurl, luasystem }: buildLuarocksPackage { pname = "vusted"; - version = "2.3.4-1"; + version = "2.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.3.4-1.rockspec"; - sha256 = "1yzdr0xgsjfr4a80a2zrj58ls0gmms407q4h1dx75sszppzvm1wc"; + url = "mirror://luarocks/vusted-2.5.0-1.rockspec"; + sha256 = "05jv8kl0hy3pyrknafmynifrqyrcc5q9qkd4ly1vmxgmmbm30nqz"; }).outPath; src = fetchFromGitHub { owner = "notomo"; repo = "vusted"; - rev = "v2.3.4"; - hash = "sha256-Zh54mHNrbFH5qygzsXVv+Vc7oUP+RIQXBvK+UvaGvxY="; + rev = "v2.5.0"; + hash = "sha256-1/fZ8OAw9NZoY1YDN6OhOJRqwRDWps5JJDIsvWg1Nr4="; }; propagatedBuildInputs = [ busted luasystem ]; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix index 0bd421ede7..66624c6f09 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix @@ -24,7 +24,7 @@ buildLuarocksPackage { luarocksConfig.variables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; postInstall = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index bee4f2dd13..bc1a28c135 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -461,7 +461,7 @@ in ]; }); - luasystem = prev.luasystem.overrideAttrs (oa: lib.optionalAttrs stdenv.isLinux { + luasystem = prev.luasystem.overrideAttrs (oa: lib.optionalAttrs stdenv.hostPlatform.isLinux { buildInputs = [ glibc.out ]; }); @@ -503,7 +503,7 @@ in # ld: symbol(s) not found for architecture arm64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) - meta.broken = stdenv.isDarwin; + meta.broken = stdenv.hostPlatform.isDarwin; }); lush-nvim = prev.lush-nvim.overrideAttrs (drv: { @@ -555,7 +555,7 @@ in }); neotest = prev.neotest.overrideAttrs(oa: { - doCheck = true; + doCheck = stdenv.isLinux; nativeCheckInputs = oa.nativeCheckInputs ++ [ final.nlua final.busted neovim-unwrapped ]; @@ -583,7 +583,16 @@ in export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck - ''; + ''; + }); + + neorg = prev.neorg.overrideAttrs (oa: { + postConfigure = '' + cat ''${rockspecFilename} + substituteInPlace ''${rockspecFilename} \ + --replace-fail "'nvim-nio ~> 1.7'," "'nvim-nio >= 1.7'," \ + --replace-fail "'plenary.nvim == 0.1.4'," "'plenary.nvim'," + ''; }); plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { @@ -635,7 +644,7 @@ in buildInputs = [ libuv final.lua ]; nativeBuildInputs = [ pkg-config cmake ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; }; luv = prev.luv.overrideAttrs (oa: { @@ -776,7 +785,7 @@ in }); sqlite = prev.sqlite.overrideAttrs (drv: { - doCheck = true; + doCheck = stdenv.hostPlatform.isLinux; nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ]; # the plugin loads the library from either the LIBSQLITE env @@ -826,7 +835,7 @@ in hash = "sha256-PLihirhJshcUQI3L1eTcnQiZvocDl29eQHhdBwJQRU8="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (if lua.pkgs.isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua"); nativeBuildInputs = oa.nativeBuildInputs ++ [ diff --git a/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix b/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix index 78b8023c5f..b89e915a77 100644 --- a/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-0a/O9nNi3JLufQxG+5EgCXtV0y03X7R6UY+f/tVGB90="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/juce/default.nix b/third_party/nixpkgs/pkgs/development/misc/juce/default.nix index 0899a94801..f0c54f1dca 100644 --- a/third_party/nixpkgs/pkgs/development/misc/juce/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/juce/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { curl # libcurl.so stdenv.cc.cc.lib # libstdc++.so libgcc_s.so pcre # libpcre2.pc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so libglvnd # libGL.so webkitgtk # webkit2gtk-4.0 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.MetalKit darwin.apple_sdk.frameworks.WebKit diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix index 18462c456c..c24ca3b0c2 100644 --- a/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix @@ -10,7 +10,7 @@ , enableMspds ? false }: -assert stdenv.isDarwin -> hidapi != null && pkg-config != null; +assert stdenv.hostPlatform.isDarwin -> hidapi != null && pkg-config != null; assert enableReadline -> readline != null; assert enableMspds -> mspds != null; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config - ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin pkg-config + ++ lib.optional (enableMspds && stdenv.hostPlatform.isLinux) autoPatchelfHook; buildInputs = [ libusb-compat-0_1 ] - ++ lib.optional stdenv.isDarwin hidapi + ++ lib.optional stdenv.hostPlatform.isDarwin hidapi ++ lib.optional enableReadline readline; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # TODO: remove once a new 0.26+ release is made substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ runtimeDependencies = lib.optional enableMspds mspds; - postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) '' + postFixup = lib.optionalString (enableMspds && stdenv.hostPlatform.isDarwin) '' # autoPatchelfHook only works on linux so... for dep in $runtimeDependencies; do install_name_tool -add_rpath $dep/lib $out/bin/$pname @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; makeFlags = [ "UNAME_S=$(unameS)" ] ++ lib.optional (!enableReadline) "WITHOUT_READLINE=1"; - unameS = lib.optionalString stdenv.isDarwin "Darwin"; + unameS = lib.optionalString stdenv.hostPlatform.isDarwin "Darwin"; meta = with lib; { description = "Free programmer, debugger, and gdb proxy for MSP430 MCUs"; diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix index 3558599c2d..4dc3ec869b 100644 --- a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, autoPatchelfHook }: let - archPostfix = lib.optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; + archPostfix = lib.optionalString (stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isDarwin) "_64"; in stdenv.mkDerivation rec { pname = "msp-debug-stack-bin"; version = "3.15.1.1"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { else "libmsp430${archPostfix}${stdenv.hostPlatform.extensions.sharedLibrary}"; nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ stdenv.cc.cc ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix index 75dd08805f..17ee5cd76c 100644 --- a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix @@ -6,10 +6,10 @@ , libusb1 ? null }: -assert stdenv.isLinux -> libusb1 != null; +assert stdenv.hostPlatform.isLinux -> libusb1 != null; let - hidapiDriver = lib.optionalString stdenv.isLinux "-libusb"; + hidapiDriver = lib.optionalString stdenv.hostPlatform.isLinux "-libusb"; in stdenv.mkDerivation { pname = "msp-debug-stack"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { preBuild = '' rm ThirdParty/src/pugixml.cpp rm ThirdParty/include/pugi{config,xml}.hpp - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' makeFlagsArray+=(OUTNAME="-install_name ") ''; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ boost hidapi pugixml ] - ++ lib.optional stdenv.isLinux libusb1; + ++ lib.optional stdenv.hostPlatform.isLinux libusb1; meta = with lib; { description = "TI MSP430 FET debug driver"; diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix index ab61884963..654f8a4577 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix @@ -234,7 +234,7 @@ rec { ncurses procps ps - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nixos-install-tools nixos-rebuild ]; @@ -258,7 +258,7 @@ rec { tset fake args ps fake args top fake args - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' nixos-generate-config fake args nixos-rebuild fake args ''); @@ -279,7 +279,7 @@ rec { inherit shunit2; inherit xdg-utils; inherit yadm; -} // lib.optionalAttrs stdenv.isLinux { +} // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit arch-install-scripts; inherit dgoss; inherit rancid; @@ -287,6 +287,6 @@ rec { inherit wgnord; inherit wsl-vpnkit; inherit zxfer; -} // lib.optionalAttrs (stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64)) { +} // lib.optionalAttrs (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64)) { inherit s0ix-selftest-tool; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix index 7df24ad4cc..833c96a269 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmake.nix @@ -2,7 +2,7 @@ deployAndroidPackage { inherit package os; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix index 0279b948a7..3c05fa8634 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit package os; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index 72dc64a7e0..a880c8fc91 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -27,8 +27,8 @@ let # Determine the Android os identifier from Nix's system identifier - os = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macosx" + os = if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "macosx" else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}"; # Uses mkrepo.rb to create a repo spec. diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 30a2e8171a..b9c11cb46e 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -10,7 +10,7 @@ in deployAndroidPackage rec { inherit package os; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = [ "*" ]; buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ]; @@ -71,7 +71,7 @@ deployAndroidPackage rec { ''; patchInstructions = patchOsAgnostic - + lib.optionalString stdenv.isLinux patchElfBnaries; + + lib.optionalString stdenv.hostPlatform.isLinux patchElfBnaries; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/patcher.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/patcher.nix index c0252839cf..f525033d23 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/patcher.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/patcher.nix @@ -2,7 +2,7 @@ deployAndroidPackage { inherit package os; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin ''; diff --git a/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix b/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix index c234c81d38..61e3bb7561 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix @@ -26,7 +26,7 @@ buildGoModule { doCheck = false; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodeWrapper ]; # Prevent a non-deterministic temporary directory from polluting the resulting object files postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix index 42b70c64ab..ef36dced9a 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ buildPhase = '' ${preBuild} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. alloy=$(dirname $(type -p alloy))/.. cp -rv $alloy/* alloy @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ export GRADLE_USER_HOME=$TMPDIR/gradle ${if release then '' - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Signing the app does not work with OpenJDK on macOS, use host SDK instead export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" ''} diff --git a/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index 5a888fb13b..13c8e6e818 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -3,7 +3,7 @@ writeShellScriptBin }: { versions ? [ ] , xcodeBaseDir ? "/Applications/Xcode.app" }: -assert stdenv.isDarwin; +assert stdenv.hostPlatform.isDarwin; let xcodebuildPath = "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"; diff --git a/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix b/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix index efd8d538c0..8693282e4e 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; description = "Custom NOR firmware loader/IPSW generator for the iPhone"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/composition.nix b/third_party/nixpkgs/pkgs/development/node-packages/composition.nix index 2e54104d7d..4bd736ddc7 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/composition.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix index bc1e36628a..eb94495aeb 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix @@ -499,8 +499,8 @@ let stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -591,8 +591,8 @@ let name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -662,7 +662,7 @@ let stdenv.mkDerivation ({ name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") - && !stdenv.isDarwin; + && !stdenv.hostPlatform.isDarwin; postPatch = '' substituteInPlace src/curly.ml \ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix index 5c75c4cb10..0b02539d64 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.02"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix index a65b27b8db..48c15e99ae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix @@ -16,7 +16,7 @@ buildDunePackage { propagatedBuildInputs = [ eio_posix - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ eio_linux ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix index c18cdd5061..fa63c1ea71 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix @@ -16,7 +16,7 @@ buildDunePackage { dontStrip = true; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix index de000f8aaf..de3f109414 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--use-opam" "--apron-prefix" apron ] - ++ lib.optional stdenv.isDarwin "--absolute-dylibs" + ++ lib.optional stdenv.hostPlatform.isDarwin "--absolute-dylibs" ; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index 980c68298a..f9ee8ca6a1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -9,39 +9,36 @@ , ppxlib_0_15, ppx_deriving_0_15 , coqPackages , version ? if lib.versionAtLeast ocaml.version "4.08" then "1.18.1" - else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" + else "1.15.2" }: let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ - release."1.19.2".sha256 = "sha256-7VTUbsFVoNT6srLwcAn5WNSsWC7cVUdphKRWBHHiH5M="; - release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY="; - release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; - release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; - release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; - release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; - release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; - release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; - release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; - release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044"; - release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr"; - release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; - release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; + release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4="; + release."1.18.1".sha256 = "sha256-rrIv/mVC0Ez3nU7fpnzwduIC3tI6l73DjgAbv1gd2v0="; + release."1.17.0".sha256 = "sha256-J8FJBeaB+2HtHjrkgNzOZJngZ2AcYU+npL9Y1HNPnzo="; + release."1.15.2".sha256 = "sha256-+sQYQiN3n+dlzXzi5opOjhkJZqpkNwlHZcUjaUM6+xQ="; + release."1.15.0".sha256 = "sha256-vpQzbkDqJPCmaBmXcBnzlWGS7djW9wWv8xslkIlXgP0="; + release."1.13.7".sha256 = "sha256-0QbOEnrRCYA2mXDGRKe+QYCXSESLJvLzRW0Iq+/3P9Y="; + release."1.12.0".sha256 = "sha256-w4JzLZB8jcxw7nA7AfgU9jTZTr6IYUxPU5E2vNIFC4Q="; + release."1.11.4".sha256 = "sha256-dyzEpzokgffsF9lt+FZgUlcZEuAb70vGuHfGUtjZYIM="; releaseRev = v: "v${v}"; + releaseArtifact = v: if lib.versionAtLeast v "1.13.8" + then "elpi-${v}.tbz" + else "elpi-v${v}.tbz"; location = { domain = "github.com"; owner = "LPCIC"; repo = "elpi"; }; }) version; in -buildDunePackage rec { +buildDunePackage { pname = "elpi"; inherit (fetched) version src; patches = lib.optional (version == "1.16.5") ./atd_2_10.patch; - minimalOCamlVersion = "4.04"; - duneVersion = "3"; + minimalOCamlVersion = "4.07"; # atdgen is both a library and executable nativeBuildInputs = [ perl ] @@ -68,6 +65,6 @@ buildDunePackage rec { }; postPatch = '' - substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols" + substituteInPlace elpi_REPL.ml --replace-warn "tput cols" "${ncurses}/bin/tput cols" ''; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 58055aa669..4d85556131 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -14,7 +14,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 8f268d4d5e..85f03825cd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -15,7 +15,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index c8a1bf9de5..f966706cc7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -21,7 +21,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AudioToolbox AVFoundation diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 89d9824839..1f9ded9bd0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -17,7 +17,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 8e299a536f..8374304fe4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -12,7 +12,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg.dev ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index d21e0d02ad..5fda062454 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -13,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index b03d87596b..518f18b150 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -13,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index 980a3efa9b..29d7b492c8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { checkInputs = [ alcotest alcotest-lwt mirage-crypto-rng crowbar cmdliner ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = { description = "Git format and protocol in pure OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix index 27791d6aa5..fc81d53f17 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gstreamer/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gstreamer/default.nix index 3440729991..689603c8e1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ]; CFLAGS_COMPILE = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix index f65aeaf0e4..12aebd5777 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix @@ -5,7 +5,7 @@ , faraday , base64 , psq -, httpaf +, httpun-types , alcotest , yojson , hex @@ -34,7 +34,7 @@ buildDunePackage rec { base64 psq hpack - httpaf + httpun-types ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hpack/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hpack/default.nix index eb42f51585..c6c52a38df 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hpack/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { pname = "hpack"; - version = "0.11.0"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; - hash = "sha256-GdXwazlgDurjzy7ekLpuMkCii8W+F/jl/IBv/WTHgFM="; + hash = "sha256-DYm28XgXUpTnogciO+gdW4P8Mbl1Sb7DTwQyo7KoBw8="; }; minimalOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/httpun/types.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/httpun/types.nix new file mode 100644 index 0000000000..f69535129a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/httpun/types.nix @@ -0,0 +1,24 @@ +{ lib +, buildDunePackage +, fetchurl +, faraday +}: + +buildDunePackage rec { + pname = "httpun-types"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/httpun/releases/download/${version}/httpun-${version}.tbz"; + hash = "sha256-os4n70yFro4cEAjR49Xok9ayEbk0WGod0pQvfbaHvSw="; + }; + + propagatedBuildInputs = [ faraday ]; + + meta = { + description = "Common HTTP/1.x types"; + homepage = "https://github.com/anmonteiro/httpun"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index 1fb45ebdd8..780213ad07 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml findlib makeWrapper ]; - buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix index e8d0e966c4..e747b64de6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ lapack blas ] ++ - lib.optionals stdenv.isDarwin + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix index 8af5c5f43d..c8c6c545cb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lambdasoup"; - version = "1.1.0"; + version = "1.1.1"; minimalOCamlVersion = "4.03"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "aantron"; repo = pname; rev = version; - hash = "sha256-HUYE29nhoBjG5OZSV4n0C5yLq8yDtP+wsmxYyWsF3lc="; + hash = "sha256-+d1JPU7OyQgt8pDTlwZraqPHH+OBQD1ycsELKpHT95Y="; }; propagatedBuildInputs = [ camlp-streams markup ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mlbdd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlbdd/default.nix new file mode 100644 index 0000000000..0392597c2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlbdd/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + buildDunePackage, + ounit, +}: + +buildDunePackage { + pname = "mlbdd"; + version = "0.7.2"; + + minimalOCamlVersion = "4.04"; + + src = fetchFromGitHub { + owner = "arlencox"; + repo = "mlbdd"; + rev = "v0.7.2"; + hash = "sha256-GRkaUL8LQDdQx9mPvlJIXatgRfen/zKt+nGLiH7Mfvs="; + }; + + checkInputs = [ ounit ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/arlencox/mlbdd"; + description = "A not-quite-so-simple Binary Decision Diagrams implementation for OCaml"; + maintainers = with lib.maintainers; [ katrinafyi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 67741516af..e27fbca0a4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index ca04e6bcfe..0c25da1453 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -19,6 +19,7 @@ , uri , alcotest-lwt , cstruct +, httpaf }: buildDunePackage rec { @@ -43,6 +44,7 @@ buildDunePackage rec { tls cstruct tcpip + httpaf ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix index 84355d9160..7f51f8235d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "qcheck-multicoretests-util"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "ocaml-multicore"; repo = "multicoretests"; rev = version; - hash = "sha256-0fbMDksC23jojJV+aegBoSwKf1hNzDUvDEbo31HUDoM="; + hash = "sha256-5UyQs99x2CWK9ncsRwdvA5iGhry9JnMs5nKoFSRHg3M="; }; propagatedBuildInputs = [ qcheck-core ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix index 87fb82adcb..a3777f7d8a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow"; meta = with lib; { homepage = "https://github.com/dsheets/ocaml-sodium"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix index f24a4fe968..83446cdf0e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix @@ -57,7 +57,7 @@ buildDunePackage rec { preBuild = "export LIBTORCH=${torch.dev}/"; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix index 2d35f76d5b..1395a37c69 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; propagatedBuildInputs = [ SDL2 ctypes ctypes-foreign ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix index 847868032c..d350071304 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "15.1.0"; + version = "16.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-HIANZ5SDJcytlpw/W9Ae2eFTutrutJj2PgJCfByobfI="; + hash = "sha256-VVGPG6ZjchUqo8xMCJRahqCCF5WheDBpK1stuts+orM="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index 1703cac867..10b4cc4ff4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -2,7 +2,7 @@ let pname = "uucp"; - version = "15.1.0"; + version = "16.0.0"; webpage = "https://erratique.ch/software/${pname}"; minimalOCamlVersion = "4.03"; doCheck = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-qR5LiAZHt4oD3ak0x17GqbYXNaJmJxFk/WGoxT+yWYc="; + hash = "sha256-5//UGI4u3OROYdxtwz9K2vCTzYiN16mOyEFhUQWtgEQ="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix index 2d473a4b83..e001fa03a2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { strictDeps = true; - prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; + prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384"; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus/default.nix index 07d268d45d..4d52640d53 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { }; # ./configure: cannot execute: required file not found - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' patchShebangs configure ''; diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/gsl/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/gsl/default.nix index e050f381a9..2ce92f43d6 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/gsl/default.nix @@ -25,6 +25,6 @@ buildOctavePackage rec { description = "Octave bindings to the GNU Scientific Library"; # error: use of undeclared identifier 'feval'; did you mean 'octave::feval'? # error: no member named 'is_real_type' in 'octave_value' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix index eb20f7dc7c..72242d1655 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix @@ -24,6 +24,6 @@ buildOctavePackage rec { using available OpenCL hardware and drivers. ''; # error: structure has no member 'dir' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix index 35887d2495..fbf7aec786 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix @@ -40,6 +40,6 @@ buildOctavePackage rec { maintainers = with maintainers; [ KarlJoad ]; description = "Additional functions for manipulation and analysis of strings"; # Some pcre symbols claimed to be missing - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix index 08d207e3bb..46efb33f23 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -18,9 +18,9 @@ buildPerlPackage rec { hash = "sha256-sfSnx5bS7vI0KIhBOpB5VYzP6g8oi0rR7mUTxxNWEA0="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index cba9ef9863..0669f5b7c7 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -22,14 +22,14 @@ buildPerlPackage rec { sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/youtube-viewer ''; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix index e50d61b878..fe6328ea39 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -24,7 +24,7 @@ buildPerlPackage rec { }; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = [ ArchiveZip ArchiveCpio @@ -45,7 +45,7 @@ buildPerlPackage rec { # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism rm $out/share/man/man1/dh_strip_nondeterminism.1 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/strip-nondeterminism ''; @@ -56,7 +56,7 @@ buildPerlPackage rec { ''; # running shortenPerlShebang in postBuild results in non-functioning binary 'exec format error' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; doInstallCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix index 15b1658243..3cc5732adc 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix @@ -38,11 +38,11 @@ buildPecl rec { cargo rustc ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ rustPlatform.bindgenHook rustPlatform.cargoSetupHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.rustPlatform.bindgenHook darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook ]; @@ -52,7 +52,7 @@ buildPecl rec { curl pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security libiconv diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index 03487e15db..edb6d900c9 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.19.4"; + version = "1.20.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-71CS9boQzW2NMmkQeOQjGaTx2CN3bkcfgO5NwV9J9JI="; + hash = "sha256-+Q/z5xrhiKTh2hVT6sdpI6sY6E7MTtTJQZBGASy5tAU="; fetchSubmodules = true; }; @@ -36,7 +36,7 @@ buildPecl rec { zlib pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.Libsystem libiconv diff --git a/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix index 83c59fb321..b250db4a30 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix @@ -21,7 +21,7 @@ buildPecl { hash = "sha256-Z26E1PdKypB/MImCHFgA3rJW5LvVaLZsQUxRv0RcFuo="; }; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; meta = with lib; { changelog = "https://github.com/openswoole/swoole-src/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix index 7da343ac55..1b61f74d40 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -15,7 +15,7 @@ buildPecl { internalDeps = [ php.extensions.pdo ]; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix index 56d826cb4b..4a3f21a08a 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix @@ -77,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: { system = stdenv.hostPlatform.system; phpMajor = lib.versions.majorMinor php.version; }; - nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ autoPatchelfHook ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl zstd lz4 @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { chmod +w $out/lib/php/extensions/relay.so '' + ( - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then let args = lib.strings.concatMapStrings diff --git a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix index d9c201e67a..8a2e5a45f7 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix @@ -22,7 +22,7 @@ buildPecl rec { buildInputs = [ pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.Libsystem libiconv diff --git a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix index 303f2327d1..08c59275c8 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix @@ -12,7 +12,7 @@ buildPecl { version = "5.10.1"; sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI="; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix index f519522a83..6cc399be10 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix @@ -22,7 +22,7 @@ buildPecl { hash = "sha256-WTsntvauiooj081mOoFcK6CVpnCCR/cEQtJbsOIJ/wo="; }; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; # tests require internet access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix index 72d309cd32..c4807df9a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { tqdm unicrypto winsspi - ] ++ lib.optionals (stdenv.isDarwin) [ iconv ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ]; # Module doesn't have tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix index 566908cfa3..a809c48b73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix @@ -96,7 +96,7 @@ buildPythonPackage rec { "test_dynamo_extract_model" "test_send_to_device_compiles" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" # TypeError: unsupported operand type(s) for /: 'NoneType' and 'int' (it seems cpuinfo doesn't work here) @@ -106,7 +106,7 @@ buildPythonPackage rec { # requires ptxas from cudatoolkit, which is unfree "test_dynamo_extract_model" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # RuntimeError: 'accelerate-launch /nix/store/a7vhm7b74a7bmxc35j26s9iy1zfaqjs... "test_accelerate_test" "test_init_trackers" @@ -114,12 +114,12 @@ buildPythonPackage rec { "test_log" "test_log_with_tensor" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" ]; - disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ + disabledTestPaths = lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64)) [ # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: "tests/test_cpu.py" "tests/test_grad_sync.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix index f8f9897a6b..35d39fed9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; # performance tests aren't useful to us and disabling them allows us to # decouple ourselves from an unnecessary build dep diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix index 7faeab491f..67170159f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation Security diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix index a7e5ee1436..385ec7ed52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -108,6 +108,6 @@ buildPythonPackage rec { changelog = "https://github.com/aesara-devs/aesara/releases/tag/rel-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ Etjean ]; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ahocorasick-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ahocorasick-rs/default.nix index aeb12385ac..63c849e353 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, rustPlatform, - typing-extensions, pytestCheckHook, pyahocorasick, hypothesis, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 30998bc2ad..25ed8e73ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.118"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-wpH3hO5ge6WiUe3DxVMPylzTdTuqrmK4+ky1JkwGBY0="; + hash = "sha256-mVzgwCzCba4xNJMbrDTRRHFUQ48tKihm3VGqpFq6Heo="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index d8032a0e2f..34bdc5b65d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-snZtM5iDaJjqRSTf4kZVjro2k2h/b6XiT4UUCw1gF1g="; + hash = "sha256-ThmHiZmXbpzTJ0JBm6gVsxZgmdzRqQfjNrJSFbwOIdU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix index 54ab5e62bc..15822fe46e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix @@ -1,32 +1,34 @@ { lib, aiohttp, + apischema, buildPythonPackage, fetchFromGitHub, + gql, pythonOlder, setuptools, - pyjwt, }: buildPythonPackage rec { pname = "aioaseko"; - version = "0.2.0"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "milanmeu"; - repo = pname; + repo = "aioaseko"; rev = "refs/tags/v${version}"; - hash = "sha256-X2H+5roq5yNXET23Q3QNmYmG1oAFfvuvSsInsJi42/s="; + hash = "sha256-jUvpu/lOFKRUwEuYD1zRp0oODjf4AgH84fnGngtv9jw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - pyjwt + apischema + gql ]; # Module has no tests @@ -38,7 +40,7 @@ buildPythonPackage rec { description = "Module to interact with the Aseko Pool Live API"; homepage = "https://github.com/milanmeu/aioaseko"; changelog = "https://github.com/milanmeu/aioaseko/releases/tag/v${version}"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix index c6fe28fb0e..c3a4ec04b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.9.0"; + version = "2024.9.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-M+RiO5XTiJ1Cpmf3wbQYzcjH/VAZUlLV9ZdWJCkF6HA="; + hash = "sha256-MdsK+QP8YdMceTiNwhuf84KARIHCyn7/g6WKrDB6yCc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix index dd9e903a43..a80581bc30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_sendfile_file" # require loopback networking: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index bd448f41c8..ee0429bacb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { trustme ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # uses 127.0.0.2, which macos doesn't like "test_pasv_connection_pasv_forced_response_address" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix index 35c8cb8359..9c0021c0a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.13.0"; + version = "3.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-P/W47IhVL7wvYI+v6OvnFJt79KPrgY6d1jdOk477MdM="; + hash = "sha256-uTFh1ncIPF9SmAEVGeBnXEKrYzgifZan1sxk5UiG92U="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohasupervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohasupervisor/default.nix index 89c706c578..04755463bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.1.0b0"; + version = "0.1.0b1"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-ocvNDLZ6h4PincCHhZfKEsIvQH0LScAsY3zrfDsXWHI="; + hash = "sha256-INpyN5jdXOzTC6t18PvbkbDM7n4Y4rejb08UfyJyFSk="; }; postPatch = '' @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = { description = "Client for Home Assistant Supervisor"; - homepage = "https://pypi.org/project/aiohasupervisor/"; + homepage = "https://github.com/home-assistant-libs/python-supervisor-client"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix index d526349721..78d044573b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "aiohttp-session"; - version = "2.12.0"; + version = "2.12.1"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-session"; - rev = "v${version}"; - hash = "sha256-7MNah4OIQnoxLoZkLOdeu5uCwSyPMhc6Wsht8dFconc="; + rev = "refs/tags/v${version}"; + hash = "sha256-mGWtHo/+jdCmv3TmUUv42hWSiLzPiP5ytB25pVyvZig="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 75db6b6452..576ea16a39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -113,8 +113,8 @@ buildPythonPackage rec { # don't run benchmarks "test_import_time" ] - ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0 "test_close" ]; @@ -129,7 +129,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around "OSError: AF_UNIX path too long" export TMPDIR="/tmp" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix index 6d59d99d14..879d1d5c6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.11.0"; - format = "pyproject"; + version = "0.12.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QsaLjdOmnCv38iM7999LtYtVe8pSUqwC7VGHu8Z9aDE="; + hash = "sha256-wqkFW0+7dwX1YbnYYFPor10QzIRdIsMgCMQ0kLLY3Ws="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + dependencies = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ unittestCheckHook ]; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; homepage = "https://aioitertools.omnilib.dev/"; + changelog = "https://github.com/omnilib/aioitertools/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ teh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix index 8f3050f3ed..59412173e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { dependencies = [ colorlog ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] - ++ lib.optionals stdenv.isLinux [ logging-journald ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ logging-journald ]; nativeCheckInputs = [ aiocontextvars diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix index bb62273772..960ba0dc9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-XsNeIUgHFPatGAhxcwtfSXUi+0sCQf9E6GH5C8OrpJg="; + hash = "sha256-JWf8MXwYKUF0brS+NcsPZkMS5XBtpZyFPD7dOS3g/6M="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix index 404bd12e15..7056d56f85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -9,29 +9,29 @@ mashumaro, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, + rich, + typer, yarl, }: buildPythonPackage rec { pname = "aiortm"; - version = "0.8.29"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-mhtU+M4kjKdvmNFr0+HoZjDj1Hf2qYk3nPOWtdPRP/0="; + hash = "sha256-fGUD0Ne7S2MyR4ilKy6GGzuWE+nO/DWMnBex4YZbXc8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=aiortm --cov-report=term-missing:skip-covered" "" - ''; + pythonRelaxDeps = [ "typer" ]; build-system = [ poetry-core ]; @@ -40,12 +40,15 @@ buildPythonPackage rec { ciso8601 click mashumaro + rich + typer yarl ]; nativeCheckInputs = [ aioresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorussound/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorussound/default.nix index 3e700c8189..7c0f045c62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorussound/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorussound/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiorussound"; - version = "3.0.5"; + version = "3.1.5"; pyproject = true; # requires newer f-strings introduced in 3.12 @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiorussound"; rev = "refs/tags/${version}"; - hash = "sha256-tv/Box8YqmFXvnezp44lKrPscK9K24+mXBv9aZw/3M4="; + hash = "sha256-c9elemUdvX8Q8/Sr4DSXEx9SdRoLKibQFbY+WSDg/yM="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosonic/default.nix index e4dd72e700..b5f4e5406b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosonic/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiosonic" ]; disabledTests = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # need network "test_simple_get" "test_get_python" @@ -132,7 +132,7 @@ buildPythonPackage rec { "test_get_with_cookies" "test_proxy_request" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # "FAILED tests/test_proxy.py::test_proxy_request - Exception: port 8865 never got active" "test_proxy_request" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix index 76ebb24f5c..fdee19ddc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiostreammagic"; - version = "2.3.1"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiostreammagic"; rev = "refs/tags/${version}"; - hash = "sha256-IMCs4EgOign56mThQ3ljnHs7/lt5874Ni1kavkHnKws="; + hash = "sha256-TWGDviQ1SYLlzuIsot7JgB5XIEZES54ERJ3tv7+9DNc="; }; pythonRelaxDeps = [ "websockets" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix index 8d65e9d299..329cfee052 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.4.4"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-lIcArNodNeC6Wtmsir6f0SwgHlafC3lh72mLU4UGBtg="; + hash = "sha256-F66HGfbsve/jYyUEapUTVtLxaEIW63r3eNNk7mXOx5Y="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airgradient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airgradient/default.nix index 2eed753ffa..86773cfd4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airgradient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airgradient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "airgradient"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "airgradienthq"; repo = "python-airgradient"; rev = "refs/tags/v${version}"; - hash = "sha256-NONOfM61oCtiNgmKCXvkEvCzSjumwjaeuzg9l/7hX8M="; + hash = "sha256-BBJ9pYE9qAE62FJFwycWBnvsoeobjsg0uIDZffIg18o="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/albucore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/albucore/default.nix index aea9b5ab69..b176b817da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/albucore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/albucore/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "albucore"; - version = "0.0.14"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; rev = "refs/tags/${version}"; - hash = "sha256-6c6QiChP3SLTEj1SKlb/AcjQbLX4L9Fdlxem70cxiXM="; + hash = "sha256-FA11dVw47KucSYU1+3oxw6GUQfPZtjoNPUb96vb6wqo="; }; pythonRemoveDeps = [ "opencv-python" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix index cdf2363a52..0318131010 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix @@ -30,16 +30,14 @@ buildPythonPackage rec { pname = "ale-py"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; - hash = "sha256-MpumAQ5OW/+fRIvrBlRWkgioxMVceb5LxEH2JjRk5zY="; + hash = "sha256-tdxO5eixI2swezhkeSMqeVgdiaa/VmNdwhZYURSzadw="; }; build-system = [ @@ -64,12 +62,8 @@ buildPythonPackage rec { postPatch = # Relax the pybind11 version '' - substituteInPlace src/python/CMakeLists.txt \ + substituteInPlace src/ale/python/CMakeLists.txt \ --replace-fail 'find_package(pybind11 ''${PYBIND11_VER} QUIET)' 'find_package(pybind11 QUIET)' - '' - + '' - substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; dontUseCmakeConfigure = true; @@ -93,6 +87,6 @@ buildPythonPackage rec { changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ billhuang ]; - broken = stdenv.isDarwin; # fails to link with missing library + broken = stdenv.hostPlatform.isDarwin; # fails to link with missing library }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index f9039ea24a..15663d0e79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.118"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,15 +45,22 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-vysSt1YAXjmzhhP6ZYwaxI7K8x844YBSSg9Wp2xH1pI="; + hash = "sha256-GwfQj8KU6M5ylgJPN1Blz8Chz2zEDTZayFdvjXXWoHY="; }; - pythonRelaxDeps = [ "capstone" ]; + postPatch = '' + # unicorn is also part of build-system + substituteInPlace pyproject.toml \ + --replace-fail "unicorn==2.0.1.post1" "unicorn" + ''; - build-system = [ - setuptools + pythonRelaxDeps = [ + "capstone" + "unicorn" ]; + build-system = [ setuptools ]; + dependencies = [ ailment archinfo @@ -88,7 +95,7 @@ buildPythonPackage rec { AngrDB = [ sqlalchemy ]; }; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; @@ -110,5 +117,7 @@ buildPythonPackage rec { homepage = "https://angr.io/"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ fab ]; + # angr is pining unicorn + broken = versionAtLeast unicorn.version "2.0.1.post1"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index cbe3fde9a5..68eb5fb6a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "24.9.0"; + version = "24.9.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ansible_compat"; inherit version; - hash = "sha256-xaQqVt0hJiXPyx0x5RpuD1JZNpG94f5KeIgeixt4prg="; + hash = "sha256-n/ICReG9nemyOjZ5AlJKsOEfvPt0GDGZbaXaW2Crld8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index 0e1a3b8ca7..11d0f37773 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { "test/integration/test_runner.py" "test/unit/test_runner.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Integration tests on Darwin are not regularly passing in ansible-runner's own CI "test/integration" # These tests write to `/tmp` which is not writable on Darwin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix index 296fbcdc35..23f249bfca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { "'not network'" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' "test_is_block_device" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apkinspector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apkinspector/default.nix index 0b5539795e..e6ebec3b32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apkinspector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apkinspector/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "erev0s"; repo = "apkInspector"; rev = "refs/tags/v${version}"; - hash = "sha256-zVMY1KMUCSqctAAHOEFXM9yT1X0PDC75ETshF+fc4pU="; + hash = "sha256-trEbm9EFZLoFBWKKOlbI305r+8GdSmU5zWPnNhb5qzQ="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix index d409a535b4..7005690b53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { "test_add_pending_job" "test_shutdown" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_submit_job" "test_max_instances" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix index aec388af30..d2effb1ae4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "testVFSWithWAL" # no lines in errout.txt "testWriteUnraisable" - ] ++ lib.optionals stdenv.isDarwin [ "testzzForkChecker" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "testzzForkChecker" ]; pythonImportsCheck = [ "apsw" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 6d64836ee0..c1b6e88ed3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.118"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-ravf2/FyPxGw7eThzkVRTLD8zhjX5vUXzb+LVO+KVxU="; + hash = "sha256-81vaHTzRCOw8C/KHwFSEMGOWEwpHVK0HicGVi9j4MqU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix index 0f43d311f8..b0d50295a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, }: buildPythonPackage rec { pname = "art"; - version = "6.2"; - format = "setuptools"; + version = "6.3"; + pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "refs/tags/v${version}"; - hash = "sha256-lFe6J3R+A1WE+LGywupjOGwhOcrUH5JE26Cit0DaT/4="; + hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "art" ]; # TypeError: art() missing 1 required positional argument: 'artname' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix index 326d51f55a..dbdcbce067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { flask pillow psycopg2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix index fecc4b98f4..1fdb7f50ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest-asyncio ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix index bcfb80b32e..dbc97cca6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # fails on darwin due to case-insensitive file system - disabledTests = lib.optionals stdenv.isDarwin [ "test_application_directory_case" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_directory_case" ]; meta = with lib; { description = "Utilities for refactoring imports in python-like syntax"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix index 25108a26d4..b71a3b9be0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/assay/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "assay"; - version = "unstable-2022-01-19"; + version = "0-unstable-2024-05-09"; format = "setuptools"; src = fetchFromGitHub { owner = "brandon-rhodes"; repo = pname; - rev = "bb62d1f7d51d798b05a88045fff3a2ff92c299c3"; - hash = "sha256-FuAD74mFJ9F9AMgB3vPmODAlZKgPR7FQ4yn7HEBS5Rw="; + rev = "74617d70e77afa09f58b3169cf496679ac5d5621"; + hash = "sha256-zYpLtcXZ16EJWKSCqxFkSz/G9PwIZEQGBrYiJKuqnc4="; }; pythonImportsCheck = [ "assay" ]; @@ -24,6 +24,5 @@ buildPythonPackage rec { description = "Attempt to write a Python testing framework I can actually stand"; license = licenses.mit; maintainers = with maintainers; [ zane ]; - broken = pythonAtLeast "3.11"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix index 090188b5cb..43872ff90e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-CAjj5vlXCfelH7nyE/tS44ThCQrCwrNETyjXEVbfmiA="; + hash = "sha256-rq8qZqTtnKyVclX5R+yRouLz1FySRgc7DMN9W9UBkyI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix index c88029cb09..c6a7f9fea0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { "test_datetime_to_timedelta" "test_datetime_difference_agrees_with_timedelta_no_hypothesis" - ] ++ lib.optionals stdenv.isDarwin [ "test_sidereal_lat_independent" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_sidereal_lat_independent" ]; meta = { description = "Astronomy/Astrophysics library for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 18969f4823..d1719497d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { # socket.gaierror: [Errno -2] Name or service not known "test_async_get_local_ip" "test_get_local_ip" - ] ++ lib.optionals stdenv.isDarwin [ "test_deferred_callback_url" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_deferred_callback_url" ]; disabledTestPaths = [ # Tries to bind to multicast socket and fails to find proper interface diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix index 24837d824d..c144b7da38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.9"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "absperf"; repo = "asyncinotify"; rev = "refs/tags/v${version}"; - hash = "sha256-Pmv1BXmKUNjFE5h99GR0GmjYKYmTi8ECKAUCKwIAMzc="; + hash = "sha256-SzsPYVA5fBXVcv7vE3FB4jFkIRr6NBlTeHrPxf5d8Ks="; }; build-system = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix index cdd6ac9b97..5608a8632e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; # OSError: AF_UNIX path too long - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ "test_protocol_pause_resume" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index d095b203d7..59c42fd028 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { disabledTests = [ # Failed: DID NOT RAISE "test_publish" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... "test_anonymous_rejection" "test_certificate_handling_success" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix index 88d2d9af34..64b89bb189 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Accelerate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix index a6b485d7b2..b714062be3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AudioUnit CoreServices diff --git a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix index a030344e8f..e3da4e6427 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why. - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_timeout.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index ffadf4d180..aefec7c8f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # no support for darwin jax jaxlib @@ -82,7 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests-cuda" # Disable tests dependending on jax on darwin - ] ++ lib.optionals stdenv.isDarwin [ "tests/test_2603_custom_behaviors_with_jax.py" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_2603_custom_behaviors_with_jax.py" ]; disabledTests = [ # AssertionError: Regex pattern did not match. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index f856473c7b..08c902f138 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { hash = "sha256-fsKmevMPvzhklN8Au9+Zb3AkAA32sBqxYAFK/vK5EAU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; - nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.isDarwin) [ perl ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perl ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix index f208c50487..8b091fc6df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; description = "AWS Lambda Runtime Interface Client for Python"; homepage = "https://github.com/aws/aws-lambda-python-runtime-interface-client"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 67178fac58..a9cdf1ac4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { # disable 8 tests failing on some darwin machines with errors: # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' - ] ++ lib.optionals stdenv.isDarwin [ "location_polling_fail" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "location_polling_fail" ]; disabledTestPaths = [ # requires testing modules which aren't published, and likely to create cyclic dependencies diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 68d45218f7..876c7f25fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "31.0.0"; + version = "32.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-E0NY1/iMTSm0AJ+R12GYYeH61dvqXhR0At1hrZa1Yko="; + pname = "azure_mgmt_containerservice"; + inherit version; + hash = "sha256-zLWHR52Kk+x49xYlkK3ILk+6TeduStw0GfM60iXvspI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 2ae19e4d8e..ff5d9d0bf2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -6,21 +6,25 @@ fetchPypi, isodate, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.5.1"; - format = "setuptools"; + version = "9.6.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI="; + pname = "azure_mgmt_cosmosdb"; + inherit version; + hash = "sha256-Znx9io9UKw55cuYydK9TatmFGH4kpswuPI7vNVYIgfw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isodate azure-common azure-mgmt-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index 9e3f437ced..aeb519515b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -5,30 +5,32 @@ buildPythonPackage, fetchPypi, isodate, - msrest, pythonOlder, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-privatedns"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-MtucYFpKj/ANNON1UdXrBrTsJnq53iph3SJ1ypWj+5g="; - extension = "zip"; + pname = "azure_mgmt_privatedns"; + inherit version; + hash = "sha256-NCMYcvAblPYZXY7lQo4XRpJS7QTqCCjVIyXr578KEgs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate - msrest - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + typing-extensions + ]; # no tests included doCheck = false; @@ -40,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure DNS Private Zones Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-privatedns"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-privatedns_${version}/sdk/network/azure-mgmt-privatedns/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index 9a3ed6f0a1..377b77975b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.17.0"; + version = "12.18.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-97LGz8G3y4AJelOx7S76nlRbSaKRQw02nNtJ+vvIQdY="; + pname = "azure_storage_file_share"; + inherit version; + hash = "sha256-CoHa7l4TWYrM3jxzsa7Mxu39zsXpV79AFQwGIvuV3HY="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix index c6fcce00fd..86f757e0ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,19 +12,20 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.11.0"; + version = "12.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-Cox3eDnbpcUIJMrEivo8xWvgRPqkXKYbcmnrMZ6/AXE="; + pname = "azure_storage_queue"; + inherit version; + hash = "sha256-uvLxvIK31PUpGSLD6k8jziJD6ULb50lPyheCKQs38eQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-core cryptography isodate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 3bcca268da..7b56d75ddd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook tqdm - ] ++ lib.optionals stdenv.isLinux [ glibcLocales ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibcLocales ]; disabledTestPaths = [ # requires aws s3 auth diff --git a/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix index e092fecc1c..4a760c5b6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; passthru.optional-dependencies = { fuzz = [ frelatage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix index 24b86e8f22..582a6d507e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "bayes_opt" ]; meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; description = '' A Python implementation of global optimization with gaussian processes ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix index 396a9668b7..ee51533e6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix index 420a7e020e..9a844507f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "1.0.1"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; rev = "refs/tags/${version}"; - hash = "sha256-jNwM+5On0BoCiqPfaWhHupXTQhinfobEkLbchP7OIHQ="; + hash = "sha256-6Y1gYAi8A6H0a0vj2avWxGS7hvjrvLBUS+LsgvY4sZo="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix index e7a9de7f1b..30f6c81c85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # timing-based test flaky on Darwin # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 - disabledTests = lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "test_step_decorator_async_run_until_complete" + ]; postCheck = '' ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix index d3358fe645..4604eb15f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pytestCheckHook, psutil, pythonOlder, @@ -9,33 +10,32 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.2.0"; - format = "setuptools"; + version = "4.2.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-mjwxhMsnWqF6cy+T9lsgxSXT2fJTci0mqCGUgDreWiw="; + src = fetchFromGitHub { + owner = "celery"; + repo = "billiard"; + rev = "refs/tags/v${version}"; + hash = "sha256-9LuAlIn6hNiZGvWuaaDQxx9g0aBVF6Z2krxEOrssqRs="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ psutil pytestCheckHook ]; - disabledTests = [ - # psutil.NoSuchProcess: process no longer exists (pid=168) - "test_set_pdeathsig" - ]; - pythonImportsCheck = [ "billiard" ]; - meta = with lib; { + meta = { description = "Python multiprocessing fork with improvements and bugfixes"; homepage = "https://github.com/celery/billiard"; changelog = "https://github.com/celery/billiard/blob/v${version}/CHANGES.txt"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 25365c67fb..024bd4d2de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pyqtgraph pyqt5 ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cramfsprogs cramfsswap sasquatch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix index 06b53f599e..de9a6d9d48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { # Make /build the project root for black tests to avoid excluding files. touch ../.git '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around https://github.com/psf/black/issues/2105 export TMPDIR="/tmp" ''; @@ -96,7 +96,7 @@ buildPythonPackage rec { # requires network access "test_gen_check_output" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on darwin "test_expression_diff" # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785 @@ -104,7 +104,7 @@ buildPythonPackage rec { "test_skip_magic_trailing_comma" ]; # multiple tests exceed max open files on hydra builders - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = with lib; { description = "Uncompromising Python code formatter"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/blacken-docs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blacken-docs/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/tools/misc/blacken-docs/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/blacken-docs/default.nix index 434f684b78..7370471c26 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/blacken-docs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blacken-docs/default.nix @@ -1,12 +1,16 @@ -{ black -, fetchFromGitHub -, lib -, python3 +{ + black, + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, }: -python3.pkgs.buildPythonApplication rec { + +buildPythonPackage rec { pname = "blacken-docs"; version = "1.15.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; @@ -15,17 +19,16 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools + build-system = [ + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ black ]; nativeCheckInputs = [ - black - python3.pkgs.pytestCheckHook + pytestCheckHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix index 9f79177386..b58c733676 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_benchmarks.py" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Assertion errors on numerical values "tests/mcmc/test_integrators.py" ]; @@ -64,7 +64,7 @@ buildPythonPackage rec { # too slow "test_adaptive_tempered_smc" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical test (AssertionError) # https://github.com/blackjax-devs/blackjax/issues/668 "test_chees_adaptation" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blackrenderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blackrenderer/default.nix new file mode 100644 index 0000000000..98e404c2db --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/blackrenderer/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + setuptools-scm, + fonttools, + uharfbuzz, + pycairo, + pillow, +}: + +buildPythonPackage rec { + pname = "blackrenderer"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "BlackFoundryCom"; + repo = "black-renderer"; + rev = "refs/tags/v${version}"; + hash = "sha256-b2W0M32Y4HUyxObjvh0yMUBe5gfcSDXnw1GfhW7hoZk="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + uharfbuzz + ]; + + optional-dependencies = { + cairo = [ pycairo ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pillow + ]; + + disabledTestPaths = [ + # Wants None existing fonts + "Tests/test_mainprog.py" + "Tests/test_glyph_render.py" + ]; + + pythonImportsCheck = [ "blackrenderer" ]; + + meta = { + description = "Renderer for OpenType COLR fonts, with multiple backends"; + homepage = "https://github.com/BlackFoundryCom/black-renderer"; + changelog = "https://github.com/BlackFoundryCom/black-renderer/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "blackrenderer"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blessings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blessings/default.nix deleted file mode 100644 index d4d4e887ce..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/blessings/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - six, - nose, -}: - -buildPythonPackage rec { - pname = "blessings"; - version = "1.7"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d"; - }; - - # 4 failing tests, 2to3 - doCheck = false; - - propagatedBuildInputs = [ six ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; - - meta = with lib; { - homepage = "https://github.com/erikrose/blessings"; - description = "Thin, practical wrapper around terminal coloring, styling, and positioning"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index 7acdf490ac..5859e00c6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -71,6 +71,10 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_app_cleans_up_images" + # DeprecationWarning in dependency: reportlab + "test_align_option_1" + # Comparison w/ magic values in test + "test_generate_with_separate" ]; pythonImportsCheck = [ "blockdiag" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix index 394589c86f..6e986b2084 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bloodyad"; - version = "2.0.6"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CravateRouge"; repo = "bloodyAD"; rev = "refs/tags/v${version}"; - hash = "sha256-o035D6GYG1Uf59tFAAMsMF9kiY3yE15EDOCkg4V4tr4="; + hash = "sha256-FfEOpu23dSanWQLw1c5TbYiD2oNT0voqJV0QvW2wksQ="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch b/third_party/nixpkgs/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch deleted file mode 100644 index 4add58640d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Jochen Sprickerhof -Date: Thu, 15 Dec 2022 07:44:54 +0100 -Subject: Don't mock list subclass - ---- - tests/unit/ec2/test_volume.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/unit/ec2/test_volume.py b/tests/unit/ec2/test_volume.py -index 81d7f55..d4d8e4f 100644 ---- a/tests/unit/ec2/test_volume.py -+++ b/tests/unit/ec2/test_volume.py -@@ -55,7 +55,7 @@ class VolumeTests(unittest.TestCase): - @mock.patch("boto.resultset.ResultSet") - def test_startElement_with_name_tagSet_calls_ResultSet(self, ResultSet, startElement): - startElement.return_value = None -- result_set = mock.Mock(ResultSet([("item", Tag)])) -+ result_set = ResultSet([("item", Tag)]) - volume = Volume() - volume.tags = result_set - retval = volume.startElement("tagSet", None, None) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch b/third_party/nixpkgs/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch deleted file mode 100644 index ac56210423..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: python-boto/tests/unit/utils/test_utils.py -=================================================================== ---- python-boto.orig/tests/unit/utils/test_utils.py -+++ python-boto/tests/unit/utils/test_utils.py -@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase): - def hmac_hashfunc(cls, msg): - if not isinstance(msg, bytes): - msg = msg.encode('utf-8') -- return hmac.new(b'mysecretkey', msg) -+ return hmac.new(b'mysecretkey', msg, digestmod='sha256') - - class HMACPassword(Password): - hashfunc = hmac_hashfunc -@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase): - password.set('foo') - - self.assertEquals(str(password), -- hmac.new(b'mysecretkey', b'foo').hexdigest()) -+ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) - - def test_constructor(self): -- hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg) -+ hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='sha256') - - password = Password(hashfunc=hmac_hashfunc) - password.set('foo') - self.assertEquals(password.str, -- hmac.new(b'mysecretkey', b'foo').hexdigest()) -+ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) - - - class TestPythonizeName(unittest.TestCase): -Index: python-boto/boto/ecs/item.py -=================================================================== ---- python-boto.orig/boto/ecs/item.py -+++ python-boto/boto/ecs/item.py -@@ -22,6 +22,7 @@ - - import xml.sax - import cgi -+from html import escape - from boto.compat import six, StringIO - - class ResponseGroup(xml.sax.ContentHandler): -@@ -67,7 +68,7 @@ class ResponseGroup(xml.sax.ContentHandl - return None - - def endElement(self, name, value, connection): -- self._xml.write("%s" % (cgi.escape(value).replace("&amp;", "&"), name)) -+ self._xml.write("%s" % (escape(value).replace("&amp;", "&"), name)) - if len(self._nodepath) == 0: - return - obj = None diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix deleted file mode 100644 index 3549c6986c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - python, - nose, - mock, - requests, - httpretty, -}: - -buildPythonPackage rec { - pname = "boto"; - version = "2.49.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"; - }; - - patches = [ - # fixes hmac tests - # https://sources.debian.org/src/python-boto/2.49.0-4/debian/patches/bug-953970_python3.8-compat.patch/ - ./bug-953970_python3.8-compat.patch - # fixes test_startElement_with_name_tagSet_calls_ResultSet - # https://sources.debian.org/src/python-boto/2.49.0-4.1/debian/patches/0005-Don-t-mock-list-subclass.patch/ - ./0005-Don-t-mock-list-subclass.patch - ]; - - # boto is deprecated by upstream as of 2021-05-27 (https://github.com/boto/boto/commit/4980ac58764c3d401cb0b9552101f9c61c18f445) - # this patch is a bit simpler than https://github.com/boto/boto/pull/3898 - # as we don't have to take care of pythonOlder "3.3". - postPatch = '' - substituteInPlace boto/dynamodb/types.py --replace 'from collections import Mapping' 'from collections.abc import Mapping' - substituteInPlace boto/mws/connection.py --replace 'import collections' 'import collections.abc as collections' - ''; - - checkPhase = '' - ${python.interpreter} tests/test.py default - ''; - - nativeCheckInputs = [ - nose - mock - ]; - propagatedBuildInputs = [ - requests - httpretty - ]; - - meta = with lib; { - homepage = "https://github.com/boto/boto"; - license = licenses.mit; - description = "Python interface to Amazon Web Services"; - longDescription = '' - The boto module is an integrated interface to current and - future infrastructural services offered by Amazon Web - Services. This includes S3, SQS, EC2, among others. - ''; - maintainers = [ ]; - # Unmaintained since 2020, archived in the beginning of May 2024 and broken - # https://github.com/boto/boto/issues/3951 - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix index 97fd086b1f..e4ad37696e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { homepage = "https://github.com/DIYer22/bpycv"; license = licenses.mit; maintainers = [ maintainers.lucasew ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; inherit (blender.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix index 0b32a37698..ffa97d4c19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "braceexpand"; version = "0.1.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,15 +19,20 @@ buildPythonPackage rec { sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braceexpand" ]; - meta = with lib; { + meta = { description = "Bash-style brace expansion for Python"; homepage = "https://github.com/trendels/braceexpand"; changelog = "https://github.com/trendels/braceexpand/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ newam ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + newam + pbsds + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix index de779d7f3e..b6316ad036 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix index 596b173151..eb38597a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-w7DV+Idcg7OobFx+ECimngQKk0SCzd5F+DTg+WcnJwA="; + hash = "sha256-eXT7H2GGNpSo58eK5f6b5eLWYgjxEV8iLgaVTpkt9EU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index b3a8c905bc..d332923030 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { "test_output" "test_wheel_metadata" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Expects Apple's Python and its quirks "test_can_get_venv_paths_with_conflicting_default_scheme" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bump2version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bump2version/default.nix similarity index 72% rename from third_party/nixpkgs/pkgs/applications/version-management/bump2version/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/bump2version/default.nix index 86d1618cc4..c7bbb8f327 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/bump2version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bump2version/default.nix @@ -1,24 +1,29 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, testfixtures +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + testfixtures, }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "bump2version"; version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "c4urself"; - repo = pname; - rev = "v${version}"; + repo = "bump2version"; + rev = "refs/tags/v${version}"; sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook testfixtures @@ -40,6 +45,7 @@ buildPythonApplication rec { all version strings in your source code by the correct increment. ''; homepage = "https://github.com/c4urself/bump2version"; + changelog = "https://github.com/c4urself/bump2version/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jefflabonte ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bumpfontversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bumpfontversion/default.nix new file mode 100644 index 0000000000..8ee90f9795 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bumpfontversion/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonRelaxDepsHook, + poetry-core, + fonttools, + openstep-plist, + ufolib2, + glyphslib, + bump2version, +}: + +buildPythonPackage rec { + pname = "bumpfontversion"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simoncozens"; + repo = "bumpfontversion"; + rev = "refs/tags/v${version}"; + hash = "sha256-qcKZGv/KeeSRBq4SdnuZlurp0CUs40iEQjw9/1LltUg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'poetry>=' 'poetry-core>=' \ + --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "glyphslib" ]; + + build-system = [ poetry-core ]; + + dependencies = [ + fonttools + openstep-plist + ufolib2 + glyphslib + bump2version + ]; + + meta = { + description = "Version-bump your font sources"; + homepage = "https://github.com/simoncozens/bumpfontversion"; + license = lib.licenses.asl20; + mainProgram = "bumpfontversion"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix index ccb98329a3..757b2d7e9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { disabledTestPaths = [ "bx_py_utils_tests/tests/test_project_setup.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # processify() doesn't work under darwin # https://github.com/boxine/bx_py_utils/issues/80 "bx_py_utils_tests/tests/test_processify.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix index 22d022c454..36c1efc426 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix @@ -104,6 +104,6 @@ buildPythonPackage rec { kfollesdal ]; # mismatched type expected u8, found i8 - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capstone/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/capstone/4.nix index 66b57a01bc..b7c31d3360 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/capstone/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/capstone/4.nix @@ -30,7 +30,7 @@ buildPythonPackage { # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + setupPyBuildFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix index 74035c9bef..e735871268 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + setupPyBuildFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix index 856da1f953..b9895dd18f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ humanfriendly ]; # hangs on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix index 74440cc504..4b253740d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix @@ -1,19 +1,24 @@ { lib, buildPythonPackage, - fetchPypi, - twisted, - whisper, - txamqp, cachetools, - urllib3, + fetchPypi, nixosTests, + pytestCheckHook, + pythonOlder, + setuptools, + twisted, + txamqp, + urllib3, + whisper, }: buildPythonPackage rec { pname = "carbon"; version = "1.1.10"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; @@ -21,28 +26,41 @@ buildPythonPackage rec { }; # Carbon-s default installation is /opt/graphite. This env variable ensures - # carbon is installed as a regular python module. + # carbon is installed as a regular Python module. GRAPHITE_NO_PREFIX = "True"; - propagatedBuildInputs = [ - twisted - whisper - txamqp + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "cf.readfp(f, 'setup.cfg')" "cf.read(f, 'setup.cfg')" + ''; + + build-system = [ setuptools ]; + + dependencies = [ cachetools + twisted + txamqp urllib3 + whisper ]; + # Tests are not shipped with PyPI + doCheck = false; + passthru.tests = { inherit (nixosTests) graphite; }; + pythonImportsCheck = [ "carbon" ]; + meta = with lib; { - homepage = "http://graphiteapp.org/"; description = "Backend data caching and persistence daemon for Graphite"; + homepage = "https://github.com/graphite-project/carbon"; + changelog = "https://github.com/graphite-project/carbon/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ offline basvandijk ]; - license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index 9548bd1214..0f03b20e19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests preCheck = - (lib.optionalString stdenv.isLinux '' + (lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) export LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/third_party/nixpkgs/pkgs/development/python-modules/causal-conv1d/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/causal-conv1d/default.nix new file mode 100644 index 0000000000..0653959ed6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/causal-conv1d/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + ninja, + setuptools, + torch, + cudaPackages, + rocmPackages, + config, + cudaSupport ? config.cudaSupport, + which, +}: + +buildPythonPackage rec { + pname = "causal-conv1d"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dao-AILab"; + repo = "causal-conv1d"; + rev = "refs/tags/v${version}"; + hash = "sha256-p5x5u3zEmEMN3mWd88o3jmcpKUnovTvn7I9jIOj/ie0="; + }; + + build-system = [ + ninja + setuptools + torch + ]; + + nativeBuildInputs = [ which ]; + + buildInputs = ( + lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h, -lcudart + cuda_cccl + libcusparse # cusparse.h + libcusolver # cusolverDn.h + cuda_nvcc + libcublas + ] + ) + ); + + dependencies = [ + torch + ]; + + # pytest tests not enabled due to nvidia GPU dependency + pythonImportsCheck = [ "causal_conv1d" ]; + + env = { + CAUSAL_CONV1D_FORCE_BUILD = "TRUE"; + } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }; + + meta = with lib; { + description = "Causal depthwise conv1d in CUDA with a PyTorch interface"; + homepage = "https://github.com/Dao-AILab/causal-conv1d"; + license = licenses.bsd3; + maintainers = with maintainers; [ cfhammill ]; + # The package requires CUDA or ROCm, the ROCm build hasn't + # been completed or tested, so broken if not using cuda. + broken = !cudaSupport; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index d5c372c5d4..99854b9d77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { "test_stamping_headers_in_options" "test_stamping_with_replace" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Too many open files on hydra "test_cleanup" "test_with_autoscaler_file_descriptor_safety" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 199324d0e4..6f12d691c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -4,13 +4,11 @@ buildPythonPackage, isPyPy, fetchPypi, - fetchpatch2, setuptools, pytestCheckHook, libffi, pkg-config, pycparser, - pythonAtLeast, }: let @@ -51,7 +49,7 @@ else ./clang-pointer-substraction-warning.diff ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Remove setup.py impurities substituteInPlace setup.py \ --replace "'-iwithsysroot/usr/include/ffi'" "" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix index c9642235e3..46dabb2711 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cffsubr" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/adobe-type-tools/cffsubr/releases/tag/v${version}"; description = "Standalone CFF subroutinizer based on AFDKO tx"; mainProgram = "cffsubr"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index 01773d1c20..2b4c9f427a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { "tls" # touches network "peercreds_unix_sock" # test urls no longer allowed ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "http_over_https_error" "bind_addr_unix" "test_ssl_env" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 71d9a9aedf..c9a63cc215 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -101,9 +101,11 @@ buildPythonPackage rec { "test_1_Ram_Concurrency" "test_2_File_Concurrency" ] - ++ lib.optionals stdenv.isDarwin [ "test_block" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_block" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "cherrypy/test/test_config_server.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "cherrypy/test/test_config_server.py" + ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix index 7416e25476..eb44d2a9b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix @@ -9,13 +9,13 @@ darwin, fastapi, fetchFromGitHub, - fetchpatch, grpcio, httpx, hypothesis, importlib-resources, kubernetes, mmh3, + nixosTests, numpy, onnxruntime, openssl, @@ -28,6 +28,7 @@ pkg-config, posthog, protobuf, + psutil, pulsar-client, pydantic, pypika, @@ -38,8 +39,8 @@ requests, rustc, rustPlatform, - setuptools, setuptools-scm, + setuptools, tenacity, tokenizers, tqdm, @@ -47,12 +48,11 @@ typing-extensions, uvicorn, zstd, - nixosTests, }: buildPythonPackage rec { pname = "chromadb"; - version = "0.5.5"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -61,29 +61,15 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-e6ZctUFeq9hHXWaxGdVTiqFpwaU7A+EKn2EdQPI7DHE="; + hash = "sha256-+wRauCRrTQsGTadA6Ps0fXcpAl6ajsJRjcVEhP2+2ss="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-3FmnQEpknYNzI3WlQ3kc8qa4LFcn1zpxKDbkATU7/48="; + hash = "sha256-Y2mkWGgS77sGOOL+S/pw/UmrKDRyO+ZbN2Msj35sIl8="; }; - patches = [ - # Remove these on the next release - (fetchpatch { - name = "pydantic19-fastapi1.patch"; - url = "https://github.com/chroma-core/chroma/commit/d62c13da29b7bff77bd7dee887123e3c57e2c19e.patch"; - hash = "sha256-E3xmh9vQZH3NCfG6phvzM65NGwlcHmPgfU6FERKAJ60="; - }) - (fetchpatch { - name = "no-union-types-pydantic1.patch"; - url = "https://github.com/chroma-core/chroma/commit/2fd5b27903dffcf8bdfbb781a25bcecc17b27672.patch"; - hash = "sha256-nmiA/lKZVrHKXumc+J4uVRiMwrnFrz2tgMpfcay5hhw="; - }) - ]; - pythonRelaxDeps = [ "chroma-hnswlib" "orjson" @@ -105,7 +91,7 @@ buildPythonPackage rec { buildInputs = [ openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; dependencies = [ bcrypt @@ -141,6 +127,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis + psutil pytest-asyncio pytestCheckHook ]; @@ -188,6 +175,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "chroma"; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix index b87e4c4256..858b914212 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; # On darwin: Too many open files - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 1024 ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix index 1bead28588..6e20f84d26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-aqt"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix index b2cf178596..4c20d01f30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { version = "1.4.1"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "quantumlib"; @@ -47,7 +47,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "matplotlib~=3.0" "matplotlib" + --replace-fail "matplotlib~=3.0" "matplotlib" ''; build-system = [ setuptools ]; @@ -89,7 +89,7 @@ buildPythonPackage rec { "cirq/_version_test.py" ]; - disabledTests = lib.optionals stdenv.isAarch64 [ + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/quantumlib/Cirq/issues/5924 "test_prepare_two_qubit_state_using_sqrt_iswap" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix index b7b70b00af..6c84cd1440 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -15,11 +15,9 @@ buildPythonPackage rec { sourceRoot = "${src.name}/${pname}"; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cirq-core google-api-core protobuf diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix index b4fa846366..5183344324 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-ionq"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix index ea13cb2cc4..62d946ea46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-pasqal"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix index d6848fe013..5791950fc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -1,78 +1,47 @@ { + lib, buildPythonPackage, cirq-core, - lib, - pytestCheckHook, - attrs, - certifi, - h11, - httpcore, - idna, - httpx, - iso8601, - pydantic, - pyjwt, + fetchpatch2, pyquil, - python-dateutil, + pytestCheckHook, pythonOlder, - qcs-api-client, - retrying, - rfc3339, - rfc3986, - six, - sniffio, - toml, + qcs-sdk-python, + setuptools, }: buildPythonPackage rec { pname = "cirq-rigetti"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; + + patches = [ + # https://github.com/quantumlib/Cirq/pull/6734 + (fetchpatch2 { + name = "fix-rigetti-check-for-aspen-family-device-kind.patch"; + url = "https://github.com/quantumlib/Cirq/commit/dd395fb71fb7f92cfd34f008bf2a98fc70b57fae.patch"; + stripLen = 1; + hash = "sha256-EWB2CfMS2+M3zNFX5PwFNtEBdgJkNVUVNd+I/E6n9kI="; + }) + ]; sourceRoot = "${src.name}/${pname}"; - pythonRelaxDeps = [ - "attrs" - "certifi" - "h11" - "httpcore" - "httpx" - "idna" - "iso8601" - "pydantic" - "pyjwt" - "pyquil" - "qcs-api-client" - "rfc3986" - ]; + pythonRelaxDeps = [ "pyquil" ]; postPatch = '' # Remove outdated test rm cirq_rigetti/service_test.py ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core - attrs - certifi - h11 - httpcore - httpx - idna - iso8601 - pydantic - pyjwt pyquil - python-dateutil - qcs-api-client - retrying - rfc3339 - rfc3986 - six - sniffio - toml + qcs-sdk-python ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix index 95af99b136..782aec95c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix @@ -2,16 +2,19 @@ buildPythonPackage, cirq-core, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-web"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; - propagatedBuildInputs = [ cirq-core ]; + build-system = [ setuptools ]; + + dependencies = [ cirq-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix index 54eee66b5f..0d755c34b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -8,14 +8,17 @@ cirq-rigetti, cirq-web, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-aqt cirq-core cirq-ionq diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clarabel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarabel/default.nix index d81f01b34f..f6e4e09edc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clarabel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clarabel/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; propagatedBuildInputs = [ numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix index 1210cc0cf3..57006c8d79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.8.4"; + version = "10.8.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-5HDPEFn43JQyNTp9nJapBpoigoFtgyPZ5HXulMsjc8s="; + hash = "sha256-lCFjZcPp4ih2fKaRXQxyxBkgRRPSaTOawiMqeXg25cg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 6186242959..baaa3200ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.118"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-1VIWdKQD6wtYd6LHQ7vW1Ol3W+ZGB+xHhSMZ9EiNev8="; + hash = "sha256-dnx5aiZ8ssgC0SFEipYuCXbYbdLt7Ma6xBfN1OlO8Do="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 6f7614aa91..554b36650e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.118"; + version = "9.2.119"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-3XucYC7FKJ0WQI6fsKxMTCIdROjZcnTKpTi3ZRfiQkU="; + hash = "sha256-cIh8ahJGEVzKSylCBVF1RbNftqADjewuiybPiCWfmhw="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-izDaikc4WR/6fdgrc3TJze+DLe7NOtSNWue9HrTz18Q="; + hash = "sha256-jOqhwSxdHJsNUZqx/ViPDh09Uk+2hqyxm4p8XwyHZ0k="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix index 50b2f1b1d2..a8109184f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ AdsonCicilioti ]; # fails with: # ld: unknown option: -zdefs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix index 583cf34320..90006a6fe4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix @@ -36,9 +36,7 @@ buildPythonPackage { format = "pyproject"; - buildInputs = [ - dotnetCorePackages.sdk_6_0.packages - ] ++ dotnet-build.nugetDeps; + buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps; nativeBuildInputs = [ setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix index 964b2724d0..f52f290be8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix @@ -3,9 +3,11 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + distutils, pyyaml, openssh, - nose, + unittestCheckHook, bc, hostname, bash, @@ -14,6 +16,7 @@ buildPythonPackage rec { pname = "clustershell"; version = "1.9.2"; + pyproject = true; src = fetchPypi { pname = "ClusterShell"; @@ -21,30 +24,29 @@ buildPythonPackage rec { hash = "sha256-rsF/HG4GNBC+N49b+sDO2AyUI1G44wJNBUwQNPzShD0="; }; + build-system = [ + setuptools + distutils + ]; + postPatch = '' substituteInPlace lib/ClusterShell/Worker/Ssh.py \ - --replace '"ssh"' '"${openssh}/bin/ssh"' \ - --replace '"scp"' '"${openssh}/bin/scp"' + --replace-fail '"ssh"' '"${openssh}/bin/ssh"' \ + --replace-fail '"scp"' '"${openssh}/bin/scp"' substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \ - --replace '"/bin/sh"' '"${bash}/bin/sh"' + --replace-fail '"/bin/sh"' '"${bash}/bin/sh"' for f in tests/*; do substituteInPlace $f \ - --replace '/bin/hostname' '${hostname}/bin/hostname' \ - --replace '/bin/sleep' 'sleep' \ - --replace '/bin/echo' 'echo' \ - --replace '/bin/uname' 'uname' \ - --replace '/bin/false' 'false' \ - --replace '/bin/true' 'true' \ - --replace '/usr/bin/printf' 'printf' + --replace-quiet '/bin/hostname' '${hostname}/bin/hostname' \ + --replace-quiet '/bin/sleep' 'sleep' \ + --replace-quiet '/bin/echo' 'echo' \ + --replace-quiet '/bin/uname' 'uname' \ + --replace-quiet '/bin/false' 'false' \ + --replace-quiet '/bin/true' 'true' \ + --replace-quiet '/usr/bin/printf' 'printf' done - - # Fix warnings - substituteInPlace lib/ClusterShell/Task.py \ - --replace "notifyAll" "notify_all" - substituteInPlace tests/TaskPortTest.py lib/ClusterShell/Task.py \ - --replace "currentThread" "current_thread" ''; propagatedBuildInputs = [ pyyaml ]; @@ -52,18 +54,22 @@ buildPythonPackage rec { nativeCheckInputs = [ bc hostname - nose + unittestCheckHook ]; pythonImportsCheck = [ "ClusterShell" ]; - doCheck = false; # tests often get stuck + unittestFlagsArray = [ + "tests" + "-p" + "'*Test.py'" + ]; # Many tests want to open network connections # https://github.com/cea-hpc/clustershell#test-suite # # Several tests fail on Darwin - checkPhase = '' + preCheck = '' rm tests/CLIClushTest.py rm tests/TreeWorkerTest.py rm tests/TaskDistantMixin.py @@ -72,33 +78,10 @@ buildPythonPackage rec { rm tests/TaskDistantPdshTest.py rm tests/TaskRLimitsTest.py rm tests/TreeGatewayTest.py - - nosetests -v \ - -e test_fromall_grouplist \ - -e test_rank_placeholder \ - -e test_engine_on_the_fly_launch \ - -e test_ev_pickup_fanout \ - -e test_ev_pickup_fanout_legacy \ - -e test_timeout \ - -e test_008_broken_pipe_on_write \ - -e testLocalBufferRCGathering \ - -e testLocalBuffers \ - -e testLocalErrorBuffers \ - -e testLocalFanout \ - -e testLocalRetcodes \ - -e testLocalRCBufferGathering \ - -e testLocalSingleLineBuffers \ - -e testLocalWorkerFanout \ - -e testSimpleMultipleCommands \ - -e testClushConfigSetRlimit \ - -e testTimerInvalidateInHandler \ - -e testTimerSetNextFireInHandler \ - -e test_node_placeholder \ - tests/*.py ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Scalable Python framework for cluster administration"; homepage = "https://cea-hpc.github.io/clustershell"; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index c78eda4078..75b2d05479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { '' sed -i "/--cov/d" setup.cfg '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste @@ -69,7 +69,7 @@ buildPythonPackage rec { export PATH=$(realpath bin):$PATH ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "cmd2" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix index cb31be20a1..ead29ecbb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { "test_pathfinder_threads" "test_save_profile" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_init_types" # CmdStan error: error during processing Operation not permitted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix index 599f91f141..9237631c05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cmigemo" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/mooz/python-cmigemo"; description = "Pure python binding for C/Migemo"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 85ef05db3e..c1ce182aa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -37,7 +37,9 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libiconv ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = [ + libiconv + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ appdirs pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix index 91e270c704..cd97bc6cbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -43,16 +42,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.8.3"; + version = "2024.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-aOe1U0IWQIgTJgUAs6WZWQmYnOTzdS+hRlK9QgU3qqk="; + hash = "sha256-IX9c1EhQfFF2Gsn8atxngJ4gpgrwX5SnolUQ3nphhUY="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 61bf159a4b..482cba0c24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.9.2"; + version = "5.9.4"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-7vyaKrMpD1DPe8qptprsAK24kzAwSL4fu53uEqJ1VWE="; + hash = "sha256-RtBbS2t0298EyW30yRnqstmXkiU36tou0dsbf6Tq1xE="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colbert-ai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colbert-ai/default.nix new file mode 100644 index 0000000000..a7d707d383 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/colbert-ai/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # dependencies + bitarray, + datasets, + flask, + python-dotenv, + ninja, + scipy, + tqdm, + transformers, + ujson, + gitpython, + torch, + faiss, +}: + +buildPythonPackage rec { + pname = "colbert-ai"; + version = "0.2.21"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "colbert_ai"; + hash = "sha256-qNb9tOInLysI7Tf45QlgchYNhBXR5AWFdRiYt35iW6s="; + }; + + pythonRemoveDeps = [ "git-python" ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + bitarray + datasets + faiss + flask + gitpython + python-dotenv + ninja + scipy + torch + tqdm + transformers + ujson + ]; + + pythonImportsCheck = [ "colbert" ]; + + # There is no tests + doCheck = false; + + meta = { + description = "Fast and accurate retrieval model, enabling scalable BERT-based search over large text collections in tens of milliseconds"; + homepage = "https://github.com/stanford-futuredata/ColBERT"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + bachp + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix index 348d408049..182c5c3706 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # capturer is broken on darwin / py38, so we skip the test until a fix for # https://github.com/xolox/python-capturer/issues/10 is released. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # Required for the CLI test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix index 359f1935f2..3e8c1eb018 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { "test_walk_can_walk_non_utf8_path_from_unicode_path" "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # expected result is tailored towards the quirks of upstream's # CI environment on darwin "test_searchable_paths" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix index d078fceee3..6e6e38f0b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; preConfigure = '' - export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confusable-homoglyphs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confusable-homoglyphs/default.nix new file mode 100644 index 0000000000..109bf574c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/confusable-homoglyphs/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, + click, +}: + +let + libName = "confusable-homoglyphs"; + snakeLibName = builtins.replaceStrings [ "-" ] [ "_" ] libName; +in +buildPythonPackage rec { + pname = libName; + version = "3.3.1"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = snakeLibName; + hash = "sha256-uZUAHJsuG0zqDPXzhAp8eRiKjLutBT1pNXK9jBwexGA="; + }; + + build-system = [ setuptools ]; + + disabled = pythonOlder "3.7"; + + optional-dependencies = { + cli = [ click ]; + }; + + pythonImportsCheck = [ snakeLibName ]; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.cli; + + disabledTests = [ + "test_generate_categories" # touches network + "test_generate_confusables" # touches network + ]; + + meta = + let + inherit (lib) licenses maintainers; + in + { + description = "Detect confusable usage of unicode homoglyphs, prevent homograph attacks"; + homepage = "https://sr.ht/~valhalla/confusable_homoglyphs/"; + changelog = "https://confusable-homoglyphs.readthedocs.io/en/latest/history.html"; + license = licenses.mit; + maintainers = with maintainers; [ ajaxbits ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix index 729d6df564..daad048634 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix @@ -51,7 +51,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "construct" ]; - disabledTests = [ "test_benchmarks" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + disabledTests = [ + "test_benchmarks" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; meta = with lib; { description = "Powerful declarative parser (and builder) for binary data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix index ac144b2645..fb3a138627 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { "test_serial_fixup_stubbed" "test_serial_fixup_stubbed_create" "test_serial_fixup_stubbed_vm_not_found" - ] ++ lib.optionals stdenv.isDarwin [ "test_serial_fixup_invalid_host" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_serial_fixup_invalid_host" ]; pythonImportsCheck = [ "COT" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix index 04c488586c..96bec81c91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix @@ -96,7 +96,7 @@ buildPythonPackage rec { # Tests expecting pytest-time "test_monitor_builds_success" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 "test_process_grammar_build_for" "test_process_grammar_platform" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix index 2ad66a7d4a..c3fd4e2abb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix @@ -96,7 +96,7 @@ buildPythonPackage rec { "tests/unit/packages/test_deb.py" "tests/unit/packages/test_chisel.py" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 "tests/unit/executor/test_environment.py" "tests/unit/features/overlay/test_executor_environment.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix index 13ed15f524..1f92211953 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; # Tests fail on i686: https://hydra.nixos.org/build/52896671/nixlog/4 - broken = stdenv.isi686; + broken = stdenv.hostPlatform.isi686; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix index e61e75da11..34571f05f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeCheckInputs = [ hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix index 43e5ac7e61..c038eb4666 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { cargo ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # has no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 2907605157..1d1e43a031 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix index b9faf71842..a108599eb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration @@ -70,7 +70,7 @@ buildPythonPackage rec { "test_cache" "test_remote_stylesheet" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # pyo3_runtime.PanicException: event loop thread panicked "test_invalid_href" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ctypesgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ctypesgen/default.nix index 7eea6b7267..ff7a8f7b32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ctypesgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ctypesgen/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - unittestCheckHook, pythonOlder, setuptools-scm, setuptools, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix index 087d85405e..434af5cb97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { "test_unix_echo" # socket bind error on hydra when built with other packages "test_unix_ssl_server" # socket bind error on hydra when built with other packages ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # connects to python.org:1, expects an OsError, hangs in the darwin sandbox "test_create_bad_connection" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix index b2467a02e0..7be20c5590 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/bpython/curtsies/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 7ed3c75637..4e49046a1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -21,7 +21,7 @@ # checks pytestCheckHook, - useOpenmp ? (!stdenv.isDarwin), + useOpenmp ? (!stdenv.hostPlatform.isDarwin), }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix b/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix index 8dc7db31fe..a484892c00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix @@ -24,8 +24,8 @@ let # Some tests in the test suite isn't working on aarch64. Disable them for # now until upstream finds a workaround. # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] - ++ lib.optionals stdenv.isi686 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ "future_division" "overflow_check_longlong" ]; @@ -87,7 +87,7 @@ buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.isDarwin; + # doCheck = !stdenv.hostPlatform.isDarwin; # force regeneration of generated code in source distributions # https://github.com/cython/cython/issues/5089 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix index 2d3333ecec..63e2821cde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix @@ -26,8 +26,8 @@ let # Some tests in the test suite isn't working on aarch64. Disable them for # now until upstream finds a workaround. # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] - ++ lib.optionals stdenv.isi686 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ "future_division" "overflow_check_longlong" ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.isDarwin; + # doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { inherit sage; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix index 0cae95af4c..7e85adb0c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { ]; # Most tests fail on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "daphne" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix index fe38977f2a..c51f22fb36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "darkdetect" ]; - postPatch = lib.optionalString (stdenv.isLinux) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' substituteInPlace darkdetect/_linux_detect.py \ --replace "'gsettings'" "'${glib.bin}/bin/gsettings'" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-bootstrap-components/default.nix index 9e6cfa1daa..ce39e11af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-bootstrap-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, dash, setuptools, pythonOlder, @@ -14,11 +14,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "facultyai"; - repo = "dash-bootstrap-components"; - rev = "refs/tags/${version}"; - hash = "sha256-6tx7rOB5FVj44NbTznyZd1Q0HOc8QdxiZOhja5kgpAE="; + src = fetchPypi { + inherit version; + pname = "dash_bootstrap_components"; + hash = "sha256-lgoeyTl1dHkvSagkECT6POzeD1kwyXGj/IHwFsvrEJU="; }; build-system = [ setuptools ]; @@ -28,8 +27,7 @@ buildPythonPackage rec { # Tests a additional requirements doCheck = false; - # Circular import - # pythonImportsCheck = [ "dash_bootstrap_components" ]; + pythonImportsCheck = [ "dash_bootstrap_components" ]; meta = with lib; { description = "Bootstrap components for Plotly Dash"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index 3ba13153d1..d514c8b454 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "dash"; - version = "2.18.0"; + version = "2.18.1"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-4/MiiS2uspjfGg0KIrgzShG7eW10Be6CoISCOnXSou0="; + hash = "sha256-2LwM1lrJNdekoDN+wDHgaSlGOnpK618r65UHj7cP59E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix index 959d83b96b..8f14ceb76e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -28,20 +27,16 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.7.0"; + version = "2024.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-xy3rq/gXQUtquvyWSCcBjZ+gUYT3RzxMgXThyT6Fwec="; + hash = "sha256-4CwixPj0bJHVjnwZ7fPkRdiDHs8/IzvNlwSPynXvcAo="; }; - pythonRelaxDeps = [ "awkward" ]; - build-system = [ hatch-vcs hatchling diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix index 750ef76131..b7130a40ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -21,16 +20,14 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.11"; + version = "1.1.14"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-D26b8HkcRqsMuzSTZdmDmS59dlAbj4F93kfY27UAhKw="; + hash = "sha256-yDNkIATN6AuGzcxTwAQyaQaDQ48v45hTC2fUqEThl/g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix index 26ca90ab02..032f978cde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix @@ -2,31 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, - boost-histogram, - dask, + + # build-system hatchling, hatch-vcs, + + # dependencies + boost-histogram, + dask, + + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.3.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-RqZMAEGFqEXNmNv7SWCyQw9cI+I+Oa6s8O/7Jp+9id8="; + hash = "sha256-k+hD5y9K6Jsm++H+IAWJ/Z3wlCN4fV8RIcyAnvOvem0="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ boost-histogram dask ]; @@ -35,11 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_histogram" ]; - meta = with lib; { + meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ veprbl ]; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index 55a528499d..8c43fc9f26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,8 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, - pythonAtLeast, fetchFromGitHub, # build-system @@ -20,17 +19,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.8.5"; + version = "0.9.0"; pyproject = true; - # Python 3.12 support should be added in 0.8.6 - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-jobqueue"; rev = "refs/tags/${version}"; - hash = "sha256-NBFfPTNIXezwv7f1P3VRnkBYlOutD30+8rdiBBssHDE="; + hash = "sha256-YujfhjOJzl4xsjjsyrQkEu/CBR04RwJ79c1iSTcMIgw="; }; build-system = [ setuptools ]; @@ -46,46 +42,54 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # Require some unavailable pytest fixtures - "test_adapt" - "test_adaptive" - "test_adaptive_cores_mem" - "test_adaptive_grouped" - "test_adapt_parameters" - "test_basic" - "test_basic_scale_edge_cases" - "test_cluster" - "test_cluster_error_scheduler_arguments_should_use_scheduler_options" - "test_cluster_has_cores_and_memory" - "test_command_template" - "test_complex_cancel_command" - "test_config" - "test_dashboard_link" - "test_default_number_of_worker_processes" - "test_deprecation_env_extra" - "test_deprecation_extra" - "test_deprecation_job_extra" - "test_different_interfaces_on_scheduler_and_workers" - "test_docstring_cluster" - "test_extra_args_broken_cancel" - "test_forward_ip" - "test_import_scheduler_options_from_config" - "test_job" - "test_jobqueue_job_call" - "test_log_directory" - "test_scale_cores_memory" - "test_scale_grouped" - "test_scheduler_options" - "test_scheduler_options_interface" - "test_security" - "test_security_temporary" - "test_security_temporary_defaults" - "test_shebang_settings" - "test_use_stdin" - "test_worker_name_uses_cluster_name" - "test_wrong_parameter_error" - ]; + disabledTests = + [ + # Require some unavailable pytest fixtures + "test_adapt" + "test_adaptive" + "test_adaptive_cores_mem" + "test_adaptive_grouped" + "test_adapt_parameters" + "test_basic" + "test_basic_scale_edge_cases" + "test_cluster" + "test_cluster_error_scheduler_arguments_should_use_scheduler_options" + "test_cluster_has_cores_and_memory" + "test_command_template" + "test_complex_cancel_command" + "test_config" + "test_dashboard_link" + "test_default_number_of_worker_processes" + "test_deprecation_env_extra" + "test_deprecation_extra" + "test_deprecation_job_extra" + "test_different_interfaces_on_scheduler_and_workers" + "test_docstring_cluster" + "test_extra_args_broken_cancel" + "test_forward_ip" + "test_import_scheduler_options_from_config" + "test_job" + "test_jobqueue_job_call" + "test_log_directory" + "test_scale_cores_memory" + "test_scale_grouped" + "test_scheduler_options" + "test_scheduler_options_interface" + "test_security" + "test_security_temporary" + "test_security_temporary_defaults" + "test_shebang_settings" + "test_use_stdin" + "test_worker_name_uses_cluster_name" + "test_wrong_parameter_error" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ValueError: invalid operation on non-started TCPListener + "test_header" + "test_lsf_unit_detection" + "test_lsf_unit_detection_without_file" + "test_runner" + ]; pythonImportsCheck = [ "dask_jobqueue" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index 0aa358b334..d26caf858c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -34,22 +34,19 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, - pythonOlder, }: let self = buildPythonPackage rec { pname = "dask"; - version = "2024.8.1"; + version = "2024.9.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-ztB5T8VFc1WoQB7lWQlonAyq7duqft9OE5FYvmjZd48="; + hash = "sha256-CaTxhYT2diFOBylLH36iIR1ooWzi2e/RNOnvc11DtDY="; }; build-system = [ setuptools ]; @@ -126,14 +123,14 @@ let ]; disabledTests = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ # Test requires features of python3Packages.psutil that are # blocked in sandboxed-builds "test_auto_blocksize_csv" # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... "test_foldby_tree_reduction" "test_to_bag" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix index 766e7af77a..da178007ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.50.0"; + version = "0.50.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OljoX42kfEpHiTtCx1lXC6AoDNISQT2bckbLj8uG9YY="; + hash = "sha256-V51NtUvW75GMUlAhftsVuAt7EVgrjiT85DcCdow/Li0="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix index e73d37c448..b7c68f839e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { buildInputs = [ protobuf ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datalad-gooey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datalad-gooey/default.nix index a84e6c7a2b..fcc3fa3763 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datalad-gooey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datalad-gooey/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { datalad-next outdated datalad - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; pythonRemoveDeps = [ "applescript" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix index 6a7c80ada3..1608ec12e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; LLVM = llvm; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; # test suite is very cpu intensive, only run small subset to ensure package is working as expected pytestFlagsArray = [ "tests/test-sets.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index 1f06cf0faf..4388c972c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.8.6"; + version = "1.8.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-Zd1qPTfJgoGpkrMSt0K1jAdYAxICdru9vIXXqbmZryo="; + hash = "sha256-1NvdRAr8T2dDgtyj5tUIqhjHIu4sZYS+oj7hOMEqs0A="; }; sourceRoot = "${src.name}/core"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix index 2e3eecc5df..89066e5c9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # no python tests exist doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 18e9acec9b..3dea1af5b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { # - https://github.com/NixOS/nixpkgs/issues/251045 ./skip-attach-pid-tests.patch ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll { src = ./hardcode-gdb.patch; inherit gdb; }) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Hard code LLDB path (used to attach to process) (substituteAll { src = ./hardcode-lldb.patch; @@ -119,12 +119,12 @@ buildPythonPackage rec { export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 '' - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + postCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' unset no_proxy ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deltalake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deltalake/default.nix index a30d199a22..e4065fa10b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deltalake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deltalake/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration libiconv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/demesdraw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/demesdraw/default.nix index d4fe828315..6a3c4d44e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/demesdraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/demesdraw/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix index 01183b27a8..e2882a7fa7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_ssh" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_ssh" ]; # don't swallow stdout/stderr pytestFlagsArray = [ "-s" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix index a6260c35ad..30c5275edb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { bidict packaging ] - ++ lib.optionals stdenv.isLinux [ dbus-fast ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-fast ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ]; # no tests available, do the imports check instead diff --git a/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix index 2247b4581a..95506510e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix @@ -163,7 +163,7 @@ buildPythonPackage { "test_overlay_instances_no_boxes" "test_get_bounding_box" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "test_build_batch_dataloader_inference" "test_build_dataloader_inference" "test_build_iterable_dataloader_inference" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devgoldyutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devgoldyutils/default.nix index fb70dba6d4..db7b236e19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devgoldyutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devgoldyutils/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Collection of utility functions for Python used by mov-cli"; homepage = "https://github.com/THEGOLDENPRO/devgoldyutils"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix index 95ec86ff5e..47340bd132 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix @@ -100,18 +100,18 @@ buildPythonPackage rec { "test_subdomainset_mpi" "test_subdomains_mpi" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False "test_v0" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FAILED tests/test_caching.py::TestCaching::test_special_symbols - ValueError: not enough values to unpack (expected 3, got 2) "test_special_symbols" # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed "test_v0" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Numerical tests "test_lm_fb" "test_lm_ds" @@ -127,7 +127,9 @@ buildPythonPackage rec { "tests/test_dse.py" "tests/test_gradient.py" ] - ++ lib.optionals ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin) [ "tests/test_dle.py" ]; + ++ lib.optionals ( + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin + ) [ "tests/test_dle.py" ]; pythonImportsCheck = [ "devito" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix new file mode 100644 index 0000000000..e5297364fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix @@ -0,0 +1,95 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonRelaxDepsHook, + pytestCheckHook, + poetry-core, + poetry-dynamic-versioning, + blackrenderer, + fonttools, + freetype-py, + gflanguages, + glyphsets, + jinja2, + ninja, + pillow, + protobuf, + pyahocorasick, + python-bidi, + selenium, + tqdm, + uharfbuzz, + unicodedata2, + youseedee, + numpy, +}: + +buildPythonPackage rec { + pname = "diffenator2"; + version = "0.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "diffenator2"; + rev = "refs/tags/v${version}"; + hash = "sha256-zeNcNR14ieY6Inp4kOwIPXd6S+/wFdMFp6wbiqgB/iA="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "protobuf" ]; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + blackrenderer + fonttools + freetype-py + gflanguages + glyphsets + jinja2 + ninja + pillow + protobuf + pyahocorasick + python-bidi + selenium + tqdm + uharfbuzz + unicodedata2 + youseedee + numpy + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # requires internet + "test_download_google_fonts_family_to_file" + "test_download_google_fonts_family_to_bytes" + "test_download_google_fonts_family_not_existing" + "test_download_latest_github_release" + ]; + + disabledTestPaths = [ + # Want the files downloaded by the tests above + "tests/test_functional.py" + "tests/test_html.py" + "tests/test_matcher.py" + "tests/test_font.py" + ]; + + meta = { + description = "Font comparison tool that will not stop until your fonts are exhaustively compared"; + homepage = "https://github.com/googlefonts/diffenator2"; + changelog = "https://github.com/googlefonts/diffenator2/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "diffenator2"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix index 7ad69d6738..7bb2a1150a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.1.9"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-5vvWBJhTIFmYKIPQqZ1q2zSkru32SyPll8WNgOAdZwU="; + hash = "sha256-JmrKeHypWhqOWO0LpzNe1qyeXuYnMyZoM+2IQbz6WDU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix index c2a18535a7..8211267f2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; # Darwin sandbox causes most tests to fail - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Very time sensitive, can fail on over subscribed machines diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 3924f0c516..973cd01a7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -78,5 +78,8 @@ buildPythonPackage rec { changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; + # Compatibility with dissect.struct 4.x + # https://github.com/fox-it/dissect.cobaltstrike/issues/53 + broken = versionAtLeast dissect-cstruct.version "4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 78610bb9a9..4df88aaf49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -1,40 +1,41 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + versioneer, + + # dependencies click, cloudpickle, dask, - fetchFromGitHub, jinja2, locket, msgpack, packaging, psutil, - pythonOlder, pyyaml, - setuptools, - setuptools-scm, sortedcontainers, tblib, toolz, tornado, urllib3, - versioneer, zict, }: buildPythonPackage rec { pname = "distributed"; - version = "2024.8.2"; + version = "2024.9.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-RvaWczbj/afOqTo9WPLJBkPG6li/TUwe84NS08zQMtY="; + hash = "sha256-jzifqTGHAto+7LExUs0kSd8852EfELEL8acSElXlEx0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix index 1dbbeff2cb..8ddb17d2b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-model-utils"; - version = "4.5.1"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-model-utils"; rev = "refs/tags/${version}"; - hash = "sha256-GaBTCrEwEkJyVeY5YVptPioYcmivyQtBKjs+TgC9IqA="; + hash = "sha256-iRtTYXsgD8NYG3k9ZWAr2Nwazo3HUa6RgdbMeDxc7NI="; }; build-system = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-payments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-payments/default.nix index 62e4484e45..33824cb5b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-payments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-payments/default.nix @@ -11,7 +11,6 @@ requests, setuptools, setuptools-scm, - sphinx-rtd-theme, stripe, suds-community, xmltodict, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix index d3fb086fc4..cf9685e0b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { six ]; - doCheck = !stdenv.isDarwin; # could not create shared memory segment: Operation not permitted + doCheck = !stdenv.hostPlatform.isDarwin; # could not create shared memory segment: Operation not permitted nativeCheckInputs = [ djangorestframework diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index 99b8aec53a..0cc7ea246e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { "test_mongo" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Multiprocessing distributed task queue for Django"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix index 557e6410da..e899451185 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -3,15 +3,17 @@ buildPythonPackage, django, fetchPypi, + oracledb, pytestCheckHook, pythonOlder, + redis, setuptools, typing-extensions, }: buildPythonPackage rec { pname = "django-stubs-ext"; - version = "5.0.4"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,16 +21,21 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs_ext"; inherit version; - hash = "sha256-hdoGUiQgR3Qgi+KcfQK0SC1aaSGKcoRlwvvkFyX9yBk="; + hash = "sha256-7X1RwLcxZRh5/HXzMfsIBtmLZ7+rRk6W4nJNtrRu+SY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django typing-extensions ]; + optional-dependencies = { + redis = [ redis ]; + oracle = [ oracledb ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "django_stubs_ext" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix index 99d71f2b38..2d7bb6ce9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -118,7 +118,7 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # make sure the installed library gets imported diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix index dd124f49e1..6cf85445c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix @@ -114,7 +114,7 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # make sure the installed library gets imported diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix index bb9c849592..1b774b8e85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/cloudflightio/python-dlinfo"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix index 6062d202a3..909cd3aa52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { patches = [ patchCMakeAbseil patchCMakePybind - ] ++ (lib.optional stdenv.isDarwin ./0003-don-t-configure-apple.patch); + ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./0003-don-t-configure-apple.patch); dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index 7a36c27e8e..59ab528578 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit" ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "api_test" "stream_response" "socket_file" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix index cdfb535722..695d351f03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix @@ -37,7 +37,7 @@ let # Only Darwin needs LANG, but we could set it in general. # It's done here conditionally to prevent mass-rebuilds. checkPhase = - lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + lib.optionalString stdenv.hostPlatform.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' ${python.interpreter} test/alltests.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix index 4b49ba50fe..188fb1ddbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix @@ -30,11 +30,14 @@ let hash = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw="; }; - propagatedBuildInputs = [ - cloudpickle - importlib-metadata - toml - ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; + propagatedBuildInputs = + [ + cloudpickle + importlib-metadata + toml + ] + ++ lib.optional stdenv.hostPlatform.isLinux pyinotify + ++ lib.optional stdenv.hostPlatform.isDarwin macfsevents; nativeCheckInputs = [ configclass @@ -51,7 +54,7 @@ let passthru.tests = { # hangs on darwin check = doit.overridePythonAttrs (_: { - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; }); }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix index b44873e99f..9eec4bba08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix @@ -88,7 +88,7 @@ buildPythonPackage rec { "test_rabbitmq_process_10k_fib_with_cli" "test_rabbitmq_process_1k_latency_with_cli" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Takes too long for darwin ofborg "test_retry_exceptions_can_specify_a_delay" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix index d4875e0da8..2dffd2d5bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { broken = ( # Library not loaded: @rpath/libfdt.1.dylib - stdenv.isDarwin + stdenv.hostPlatform.isDarwin || # see https://github.com/devicetree-org/dt-schema/issues/108 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index 132f72d70e..77b348e271 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; # test flags from .github/workflows/Python.yml - pytestFlagsArray = [ "--verbose" ] ++ lib.optionals stdenv.isDarwin [ "tests/fast" ]; + pytestFlagsArray = [ "--verbose" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/fast" ]; disabledTestPaths = [ # avoid dependency on mypy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index 0618a1b2aa..e4b3663dda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { rm tests/compat/test_pack.py ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "dulwich" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix index 2cab268fec..f4df562301 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pytest-test-utils ] ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_vega.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_vega.py" ]; pythonImportsCheck = [ "dvc_render" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch b/third_party/nixpkgs/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch deleted file mode 100644 index 15548b7aec..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 189681bbfb703a7026ca7bbb3b21ef554807b144 Mon Sep 17 00:00:00 2001 -From: tali auster -Date: Wed, 15 Nov 2023 12:15:34 -0700 -Subject: [PATCH] use distro over ld - -The `ld` module (linux distribution) was renamed to `distro`, presumably -so as not to subsume binutils name. - ---- - setup.py | 2 +- - src/e3/os/platform.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index c32f46f..de1ada6 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,7 +25,7 @@ for p in ("darwin", "linux", "linux2", "win32"): - platform_string = ":sys_platform=='%s'" % p - extras_require[platform_string] = ["psutil"] - if p in ("linux", "linux2"): -- extras_require[platform_string].append("ld") -+ extras_require[platform_string].append("distro") - - # Get e3 version from the VERSION file. - version_file = os.path.join(os.path.dirname(__file__), "VERSION") -diff --git a/src/e3/os/platform.py b/src/e3/os/platform.py -index 2d4e174..a9d12d3 100644 ---- a/src/e3/os/platform.py -+++ b/src/e3/os/platform.py -@@ -78,7 +78,7 @@ class SystemInfo: - - # Fetch linux distribution info on linux OS - if cls.uname.system == "Linux": # linux-only -- import ld -+ import distro as ld - - cls.ld_info = { - "name": ld.name(), --- -2.40.1 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix index 6b2f8ad763..9f37786ba4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix @@ -1,18 +1,19 @@ { + lib, + stdenv, autoPatchelfHook, buildPythonPackage, colorama, distro, fetchFromGitHub, - lib, packaging, psutil, python-dateutil, + pythonOlder, pyyaml, - requests, requests-cache, requests-toolbelt, - stdenv, + requests, setuptools, stevedore, tqdm, @@ -20,38 +21,37 @@ buildPythonPackage rec { pname = "e3-core"; - version = "22.5.0"; + version = "22.6.0"; pyproject = true; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; rev = "refs/tags/v${version}"; - hash = "sha256-7csZYohU89uavSMPOKGJ8HClmtiweGSghyR7QgFfSY8="; + hash = "sha256-6rClGDo8KhBbOg/Rw0nVISVtOAACf5cwSafNInlBGCw="; }; - patches = [ ./0001-use-distro-over-ld.patch ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - autoPatchelfHook - setuptools - ]; + nativeBuildInputs = [ autoPatchelfHook ]; - propagatedBuildInputs = + dependencies = [ colorama packaging - pyyaml python-dateutil + pyyaml requests requests-cache requests-toolbelt - tqdm stevedore + tqdm ] - ++ lib.optional stdenv.isLinux [ - # See setup.py:24. These are required only on Linux. Darwin has its own set - # of requirements. + ++ lib.optional stdenv.hostPlatform.isLinux [ + # See https://github.com/AdaCore/e3-core/blob/v22.6.0/pyproject.toml#L37-L42 + # These are required only on Linux. Darwin has its own set of requirements psutil distro ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/e3-testsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/e3-testsuite/default.nix index bf8ba8850a..9ec1dc51ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/e3-testsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/e3-testsuite/default.nix @@ -1,8 +1,9 @@ { + lib, buildPythonPackage, e3-core, fetchFromGitHub, - lib, + pythonOlder, setuptools, }: @@ -11,23 +12,25 @@ buildPythonPackage rec { version = "26.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-testsuite"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ e3-core ]; + dependencies = [ e3-core ]; pythonImportsCheck = [ "e3" ]; meta = with lib; { + description = "Generic testsuite framework in Python"; changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}"; homepage = "https://github.com/AdaCore/e3-testsuite/"; - description = "Generic testsuite framework in Python"; license = licenses.gpl3Only; maintainers = with maintainers; [ heijligen ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix index 170ff96c35..a1ff17f2b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "easyocr"; - version = "1.7.1"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "JaidedAI"; repo = "EasyOCR"; rev = "refs/tags/v${version}"; - hash = "sha256-EiiJ2LJ3uYIvgPd2y25MraV5kTa47JalDR7SLbkM9UI="; + hash = "sha256-9mrAxt2lphYtLW81lGO5SYHsnMnSA/VpHiY2NffD/Js="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix index 41066ba788..e45b5424a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.9.0"; + version = "3.9.1"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-fJLX3ZhcgevXcXkR00fzDh9LtfMwaHsJWQgUexmuKLc="; + hash = "sha256-nRslQMnVaVN7S20RuJDp+e9p+oMhsR03EjHYpvkuBYk="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index 6fb1abd35f..fb27b98608 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { # Exclude tornado tests "tests/contrib/asyncio/tornado/tornado_tests.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests on Darwin "tests/utils/threading_tests.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix index e5f447b233..04cb574509 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pytestCheckHook testtools twisted - ] ++ lib.optionals stdenv.isLinux [ daemontools ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ daemontools ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix index 7572e77728..4ad658d773 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # Some test for hot-reload fails on Darwin, but the rest of the library # should remain usable. (https://todo.sr.ht/~olly/embrace-sql/4) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Embrace SQL keeps your SQL queries in SQL files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix index d6f1fd2459..0a0bb89d89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.12.1"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "carpedm20"; - repo = pname; + repo = "emoji"; rev = "refs/tags/v${version}"; - hash = "sha256-m9V9ryIE2U+KsyzFhAoMCGYMkPCBUl/ex1Ue5OUwslc="; + hash = "sha256-FTQTbp5Ud3CyqkAiGvY8hBOKnvFR29CgZPbz4eZp/ik="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix index 826e9fbe78..ca0916c610 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { "test_floats_prefixed" "test_subcounter_prefixed" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/Rockhopper-Technologies/enlighten/issues/44 "test_autorefresh" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index 2a7e328f97..d582c5cfc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # can't find hostname in our darwin build environment "test_fqdn" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix index 18d5488bee..5157aa329d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; propagatedBuildInputs = [ msgpack ]; @@ -76,7 +76,7 @@ buildPythonPackage rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://www.etebase.com/"; description = "Python client library for Etebase"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix index 5fa638dddd..24f9ef57ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # libredirect is not available on darwin # tests hang on pypy indefinitely - doCheck = !stdenv.isDarwin && !isPyPy; + doCheck = !stdenv.hostPlatform.isDarwin && !isPyPy; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix index afa4969732..a31b963462 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "evtx"; - version = "0.8.4"; + version = "0.8.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +20,13 @@ buildPythonPackage rec { owner = "omerbenamram"; repo = "pyevtx-rs"; rev = "refs/tags/${version}"; - hash = "sha256-s94KCUIJplrkMvFsFxPokTucB5TwVYD1xxcoJyvk5NU="; + hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-i16FNFbYrF2BONahLP7APMi9RPaLGmbnBH4hBPnHWzg="; + hash = "sha256-qBpc3PwvAceOMuRH4vrgURCsvKYhG2Id62n7sxW5AAg="; }; nativeBuildInputs = with rustPlatform; [ @@ -34,7 +34,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exiv2/default.nix index c1c9715f5a..9529615d0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exiv2/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "exiv2"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "python-exiv2"; rev = "refs/tags/${version}"; - hash = "sha256-nPSspQPq0y2Vg2S+iwQ1E+TdaOJ9aJN3eeXRrcDzdsM="; + hash = "sha256-AXBhCe7AvhQkGZaLMTGExwgUYQGdRkk14Rtceugexag="; }; # FAIL: test_localisation (test_types.TestTypesModule.test_localisation) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix index e9cdcf3f57..0d52c20ba8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix @@ -7,19 +7,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "expecttest"; - version = "0.1.4"; - format = "pyproject"; + version = "0.2.1"; + pyproject = true; src = fetchFromGitHub { - owner = "ezyang"; - repo = pname; - rev = "v${version}"; - hash = "sha256-BFM0jFWXfH72n9XuFtU9URW8LWGPVJncXniBV5547W4="; + owner = "pytorch"; + repo = "expecttest"; + rev = "683b09a352cc426851adc2e3a9f46e0ab25e4dee"; # no tags + hash = "sha256-e9/KxPN/w0mrFYgesRGqaiDQ6gor7BpX/5/B0NPtXLY="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ hypothesis @@ -32,7 +32,7 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.SomeoneSerge ]; license = lib.licenses.mit; description = ''EZ Yang "golden" tests (testing against a reference implementation)''; - homepage = "https://github.com/ezyang/expecttest"; + homepage = "https://github.com/pytorch/expecttest"; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 4cd2944f6b..a9ce3ef4a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-xFrTOsoh/qCCnzJq97pHW2TogiWfnw4zL4Lul4jRaA0="; + hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index 21897db2c8..9111890efd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-ZKib2tpL7Yn3yWuyZFOQ3saNQLwrUEeuojSMpoTy89M="; + hash = "sha256-XWPj348kAuA9BF7Y2/hX712eLRfUZ9kH3oL1jb17/K0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index b91cc2f548..0aacc52e3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.8"; + version = "1.7.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-pBmtNrXincaOBADKgTaq7OmcrFlz6q7HROsUSRN0w8k="; + hash = "sha256-OGqd+pLM3THcPD3JtccjH6sgpVEhcNVnGbIbyMFfqTU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix index 1096add5b6..4b906c6d6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = [ ]; # resulting compiled object panics at import - broken = stdenv.is32bit; + broken = stdenv.hostPlatform.is32bit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix index e3f69aad97..4b518e5f8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "remote ref" "definitions" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_compile_to_code_custom_format" # cannot import temporary module created during test ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix index 6bfddc120c..bdd1964060 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace setup.py \ --replace-fail "-flto" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix index a5b9902fec..b2750f7a70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix @@ -8,7 +8,6 @@ cmake, doxygen, eigen, - gtest, hdf5, lapack, mpi, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix index 344c725702..447dbb8e0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix @@ -111,6 +111,6 @@ buildPythonPackage rec { ]; # OSError: dlopen(libc.so.6, 0x0006): tried: '/usr/lib/libc.so.6' (no such file, not in dyld cache), # 'libc.so.6' (no such file), '/usr/local/lib/libc.so.6' (no such file), '/usr/lib/libc.so.6' (no such file, not in dyld cache) - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix index 00a8a73aad..ec639f9ef8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { go ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # expects a FFExecutableNotFoundError, gets a NotADirectoryError raised by os "test_invalid_executable_path" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fickling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fickling/default.nix index a5de0d913a..44bb00c6be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fickling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fickling/default.nix @@ -4,9 +4,7 @@ buildPythonPackage, distutils, fetchFromGitHub, - fickling, flit-core, - numpy, pytestCheckHook, pythonOlder, torch, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/finetuning-scheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/finetuning-scheduler/default.nix index 7d9cf816c7..808c8e1ab6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { "test_fts_dynamo_resume" "test_fts_dynamo_intrafit" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # slightly exceeds numerical tolerance on aarch64-linux: "test_fts_frozen_bn_track_running_stats" ]; @@ -58,6 +58,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; # "No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package" at import time: - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix index 17f148f39f..2be37738eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix @@ -45,9 +45,9 @@ buildPythonPackage rec { future scikit-fmm openssh - ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ]; # NOTE: Two of the doctests in fipy.matrices.scipyMatrix._ScipyMatrix.CSR fail, and there is no # clean way to disable them. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix index 38ab5efc74..e9da4f44b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix @@ -1,7 +1,6 @@ { lib, azure-storage-blob, - boto, buildPythonPackage, fetchpatch, fetchFromGitHub, @@ -53,7 +52,6 @@ buildPythonPackage rec { ]; optional-dependencies = { - aws = [ boto ]; azure = [ azure-storage-blob ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix index 0f733a1b9a..29e997acdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "Redis" "Memcache" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # ignore flaky test "test_cache_timeout_dynamic" "test_cached_view_class" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index 55f41f6f77..85f0218fd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check" "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--deselect=tests/test_inputs.py::EmailTest::test_invalid_values_check" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix index 6574dcf161..07d410fa1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; # Some of the tests use localhost networking on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # RuntimeError and NotImplementedError diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index c176c82594..098e6cf28e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -26,6 +25,7 @@ pytest-xdist, pytestCheckHook, tensorflow, + treescope, # optional-dependencies matplotlib, @@ -33,16 +33,14 @@ buildPythonPackage rec { pname = "flax"; - version = "0.8.5"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-6WOFq0758gtNdrlWqSQBlKmWVIGe5e4PAaGrvHoGjr0="; + hash = "sha256-iDWuUJKO7V4QrbVsS4ALgy6fbllOC43o7W4mhjtZ9xc="; }; build-system = [ @@ -75,6 +73,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook tensorflow + treescope ]; pytestFlagsArray = [ @@ -95,13 +94,18 @@ buildPythonPackage rec { "flax/nnx/examples/*" # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" - # Requires tree + # Too old version of tensorflow: + # ModuleNotFoundError: No module named 'keras.api._v2' "tests/tensorboard_test.py" ]; disabledTests = [ # ValueError: Checkpoint path should be absolute "test_overwrite_checkpoints0" + # Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211 + # TODO: Re-enable when jax>0.4.28 will be available in nixpkgs + "test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None + "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix index 9f55251a2c..9bbd11bd65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix @@ -9,23 +9,32 @@ pytestCheckHook, responses, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "flickrapi"; version = "2.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sybrenstuvel"; - repo = pname; + repo = "flickrapi"; rev = "version-${version}"; hash = "sha256-vRZrlXKI0UDdmDevh3XUngH4X8G3VlOCSP0z/rxhIgw="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace tests/test_tokencache.py \ + --replace-fail "assertEquals" "assertEqual" \ + --replace-fail "assertNotEquals" "assertNotEqual" + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests requests-toolbelt requests-oauthlib @@ -61,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to the Flickr API"; homepage = "https://stuvel.eu/flickrapi"; + changelog = "https://github.com/sybrenstuvel/flickrapi/blob/version-${version}/CHANGELOG.md"; license = licenses.psfl; maintainers = with maintainers; [ obadz ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index c57065ec64..6898f34cb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { ]; plot = [ matplotlib ]; symfont = [ sympy ]; - type1 = lib.optional stdenv.isDarwin xattr; + type1 = lib.optional stdenv.hostPlatform.isDarwin xattr; pathops = [ skia-pathops ]; repacker = [ uharfbuzz ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix index 246c97aa9c..a5f3eb9c60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "foolscap"; - version = "23.3.0"; + version = "24.9.0"; pyproject = true; build-system = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU="; + hash = "sha256-vWsAdUDbWQuG3e0oAtLq8rA4Ys2wg38fD/h+E1ViQQg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix index af7edb24ae..f9faef8be2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { [ tkinter ] # we currently build SuperCollider only on Linux # but FoxDot is totally usable on macOS with the official SuperCollider binary - ++ lib.optionals stdenv.isLinux [ supercollider ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ supercollider ]; # Requires a running SuperCollider instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/freud/default.nix index a681bd1f14..9fa555e281 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/freud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/freud/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { matplotlib sympy ]; - disabledTests = lib.optionals stdenv.isAarch64 [ + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/glotzerlab/freud/issues/961 "test_docstring" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frida-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frida-python/default.nix index d73e5645e5..8bef789110 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frida-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frida-python/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix index 5941243645..e0c07195df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { disabledTests = [ "user_data_repr" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved "test_ftpfs" ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index e423f32d79..832920986a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -110,7 +110,7 @@ buildPythonPackage rec { "test_urlpath_inference_errors" "test_mismatch" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution # this two tests however, assume nanosecond resolution diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funsor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funsor/default.nix index 6afeeb9e4c..dda85f2c79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/funsor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/funsor/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { # TODO: Try to re-enable this test at next release "test_torch_save" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Failures related to JIT # RuntimeError: required keyword attribute 'Subgraph' has the wrong type "test_local_param_ok" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix index ddd6d394cd..35eab496d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fuse" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Python bindings for FUSE"; homepage = "https://github.com/libfuse/python-fuse"; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix index 35718a54d6..6e33666d69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # On macOS, users are expected to install macFUSE. This means fusepy should # be able to find libfuse in /usr/local/lib. - patchPhase = lib.optionalString (!stdenv.isDarwin) '' + patchPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace fuse.py --replace \ "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix index 72504c986d..233d12f3ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gb_io" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/althonos/gb-io.py"; description = "Python interface to gb-io, a fast GenBank parser written in Rust"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix index 8c4252e490..7dd4d3a2c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gbulb" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GLib implementation of PEP 3156"; homepage = "https://github.com/beeware/gbulb"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix deleted file mode 100644 index 0cb900cffb..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - boto, - buildPythonPackage, - fetchFromGitHub, - freezegun, - google-reauth, - httplib2, - oauth2client, - pyopenssl, - pytestCheckHook, - pythonOlder, - retry-decorator, - rsa, - six, -}: - -buildPythonPackage rec { - pname = "gcs-oauth2-boto-plugin"; - version = "3.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "GoogleCloudPlatform"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-slTxh2j9VhLiSyiTmJIFFakzpzH/+mgilDRxx0VqqKQ="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "rsa==4.7.2" "rsa" \ - --replace "version='2.7'" "version='${version}'" - ''; - - propagatedBuildInputs = [ - boto - freezegun - google-reauth - httplib2 - oauth2client - pyopenssl - retry-decorator - rsa - six - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "gcs_oauth2_boto_plugin" ]; - - meta = with lib; { - description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage"; - homepage = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin"; - changelog = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index e8e78f80ac..6d24ef442e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { rtree ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix index 230d8f300e..3e9c51c7dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; # lots of: [Errno 48] Address already in use: ('127.0.0.1', 54323) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gftools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gftools/default.nix new file mode 100644 index 0000000000..9418d7c1ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gftools/default.nix @@ -0,0 +1,207 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pytestCheckHook, + setuptools, + setuptools-scm, + absl-py, + afdko, + axisregistry, + babelfont, + beautifulsoup4, + black, + brotli, + bumpfontversion, + coreutils, + diffenator2, + font-v, + fontbakery, + fontfeatures, + fontmake, + fonttools, + gflanguages, + gfsubsets, + glyphsets, + glyphslib, + harfbuzz, + jinja2, + nanoemoji, + networkx, + ninja, + opentype-feature-freezer, + ots-python, + packaging, + paintcompiler, + pillow, + protobuf, + pycairo, + pygit2, + pygithub, + pytest, + pyyaml, + requests, + rich, + ruamel-yaml, + skia-pathops, + statmake, + strictyaml, + tabulate, + ttfautohint-py, + ufomerge, + unidecode, + vharfbuzz, + vttlib, + python, +}: + +let + fontmake' = python.withPackages (ps: [ ps.fontmake ] ++ ps.fontmake.optional-dependencies.json); + fonttools' = python.withPackages (ps: [ ps.fonttools ] ++ ps.fonttools.optional-dependencies.ufo); +in +buildPythonPackage rec { + pname = "gftools"; + version = "0.9.68"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "gftools"; + rev = "refs/tags/v${version}"; + hash = "sha256-xdpfRCtZDxRmrGodXUg8J0T5l5gd7Mvl290BXwNLzvY="; + }; + + postPatch = '' + substituteInPlace \ + Lib/gftools/builder/operations/{buildTTF,glyphs2ds,buildVariable,buildOTF}.py \ + --replace-fail '"fontmake' '"${lib.getExe' fontmake' "fontmake"}' + + substituteInPlace \ + Lib/gftools/builder/operations/instantiateUfo.py \ + --replace-fail "'fontmake" "'${lib.getExe' fontmake' "fontmake"}" + + substituteInPlace \ + Lib/gftools/builder/operations/{compress,subspace}.py \ + --replace-fail '"fonttools' '"${lib.getExe' fonttools' "fonttools"}' + + substituteInPlace \ + Lib/gftools/builder/operations/hbsubset.py \ + --replace-fail '"pyftsubset"' '"${lib.getExe' fonttools' "pyftsubset"}"' \ + --replace-fail '"hb-subset"' '"${lib.getExe' harfbuzz "hb-subset"}"' + + substituteInPlace \ + Lib/gftools/builder/operations/autohintOTF.py \ + --replace-fail '"otfautohint' '"${lib.getExe' afdko "otfautohint"}' + + substituteInPlace \ + Lib/gftools/builder/operations/paintcompiler.py \ + --replace-fail '"paintcompiler' '"${lib.getExe paintcompiler}' + + substituteInPlace \ + Lib/gftools/builder/operations/featureFreeze.py \ + --replace-fail '"pyftfeatfreeze' '"${lib.getExe opentype-feature-freezer}' + + substituteInPlace \ + Lib/gftools/builder/operations/copy.py \ + --replace-fail '"cp' '"${lib.getExe' coreutils "cp"}' + + substituteInPlace \ + Lib/gftools/builder/operations/{fix,remap,autohint,buildStat,addSubset,remapLayout,buildVTT}.py \ + --replace-fail '"gftools' '"${placeholder "out"}/bin/gftools' + + substituteInPlace \ + Lib/gftools/builder/operations/rename.py \ + --replace-fail "'gftools" "'${placeholder "out"}t/bin/gftools" + ''; + + pythonRelaxDeps = [ + "protobuf" + "pygit2" + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + absl-py + afdko + axisregistry + babelfont + beautifulsoup4 + brotli + bumpfontversion + font-v + fontfeatures + fontmake + fonttools + gflanguages + gfsubsets + glyphsets + glyphslib + jinja2 + nanoemoji + networkx + ninja + ots-python + packaging + pillow + protobuf + pygit2 + pygithub + pyyaml + requests + rich + ruamel-yaml + setuptools + skia-pathops + statmake + strictyaml + tabulate + ttfautohint-py + ufomerge + unidecode + vharfbuzz + vttlib + ] ++ fonttools.optional-dependencies.ufo ++ fontmake.optional-dependencies.json; + + optional-dependencies = { + qa = [ + diffenator2 + fontbakery + pycairo + ]; + test = [ + black + pytest + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # Wants none exsiting module + "bin/test_args.py" + # Requires internet + "tests/push/test_items.py" + "tests/test_gfgithub.py" + "tests/test_usage.py" + "tests/push/test_servers.py" + # Can't find directory + "tests/test_builder.py" + "tests/test_dependencies.py" + "tests/test_fix.py" + ]; + + pythonImportsCheck = [ "gftools" ]; + + meta = with lib; { + description = "Misc tools for working with the Google Fonts library"; + homepage = "https://github.com/googlefonts/gftools"; + changelog = "https://github.com/googlefonts/gftools/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "gftools"; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix index a58ee33626..d27a9e672d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.11.9"; + version = "0.11.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-aN8LTWDtzj04w0dQvUVMJ2QhHWaFK4ml1ZoLO2LmKTY="; + hash = "sha256-04Cy4NtC3+/qv4kFcDB1aszmO6x1TguhCOF0CqxYPtw="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix index 5dea3e4736..11b7157f4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "glean" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Telemetry client libraries and are a part of the Glean project"; homepage = "https://mozilla.github.io/glean/book/index.html"; license = lib.licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix index f54ccc14df..b9a3777960 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -37,12 +37,12 @@ buildPythonPackage rec { }) ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace glymur/lib/tiff.py \ --replace-fail "glymur_config('c')" "ctypes.CDLL('${lib.getLib glibc}/lib/libc.so.6')" ''; - __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib"; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix index 58f4cc08f6..713cb42fae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix @@ -52,12 +52,12 @@ buildPythonPackage rec { ]; disabledTests = - lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # issue with some overflow logic "test_mpz_to_bytes" "test_mpz_from_bytes" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # TypeError: mpq() requires numeric or string argument # not sure why it only fails on Darwin "test_mpq_from_Decimal" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 3f1b3a06d0..2d4e0bed73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { # Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973. "test_run_local_server_occupied_port" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`). "test_run_local_server_bind_addr" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index 5556429082..30ea8208ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { "google.oauth2" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Disable tests using pyOpenSSL as it does not build on M1 Macs "tests/transport/test__mtls_helper.py" "tests/transport/test_requests.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 0a3547af87..2c3dcdf790 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.18.0"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_firestore"; inherit version; - hash = "sha256-PbXdQjNLmQTYKzeGcDpaS1doEPtQ9huPqD7PTxe3/a4="; + hash = "sha256-Gyzm4LeRruiaHk8HK+uhASJH6Juso2Hu1yH7Rn/gVLA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix index f0a7efc000..9bca05da8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { done ''; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.hostPlatform.isx86_64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Rounding difference break comparison "TestGradientMultiOutputGPModel" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix index 47c1756975..abceb8b1c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.13"; + version = "0.0.15"; format = "pyproject"; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-lxfbQSJavJQSYMGqxG7zmg/XT8V8TU2I3zGiq+B/dnw="; + hash = "sha256-R+4CDJo84/+PUTTxoz9CsZlHUVsldgjufWsRkALrfN4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix index 327a242a6a..d07f962b26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix @@ -92,7 +92,7 @@ buildPythonPackage rec { #"-x" "-W" "ignore" # uncomment for debugging help ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # flaky: OSError: Cannot find empty port in range: 7860-7959 "test_layout_components_in_output" "test_layout_and_state_components_in_output" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix index 45ace5ac05..68d0da3d56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.41.0"; + version = "4.44.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -72,7 +72,7 @@ buildPythonPackage rec { # We use the Pypi release, since it provides prebuilt webui assets src = fetchPypi { inherit pname version; - hash = "sha256-d4li7kQFMzlUVGdm2nTSnj25pTOWIqnZuOvTOtwPLpc="; + hash = "sha256-ovjRJ52giPZxVCOv8TuD3kcbgHbDTBqaSBNrrTN1MkE="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -160,7 +160,7 @@ buildPythonPackage rec { export HOME=$TMPDIR cat ${./conftest-skip-network-errors.py} >> test/conftest.py '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 4096 ''; @@ -195,7 +195,7 @@ buildPythonPackage rec { # tests if pip and other tools are installed "test_get_executable_path" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on darwin (depend on port availability) "test_all_status_messages" "test_async_generators" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix index 254b2ae16a..2ebc4dbfe9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { "test_should_multiplechoicefield_convert_to_list_of_enum" "test_perform_mutate_success_with_enum_choice_field" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # this test touches files in the "/" directory and fails in darwin sandbox "test_should_filepath_convert_string" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphrag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphrag/default.nix index a5c1589a03..0bc8f6f59d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphrag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphrag/default.nix @@ -12,27 +12,25 @@ datashaper, devtools, environs, - fastparquet, graspologic, json-repair, lancedb, + matplotlib, networkx, nltk, - numba, numpy, openai, + pandas, pyaml-env, + pyarrow, pydantic, python-dotenv, pyyaml, rich, - scipy, - swifter, tenacity, - textual, tiktoken, typing-extensions, - uvloop, + umap-learn, nbformat, pytest-asyncio, pytestCheckHook, @@ -40,14 +38,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "0.3.3"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; rev = "refs/tags/v${version}"; - hash = "sha256-x1boxBF3fO+IqHnJx85mjYQHhEG8h03H90T0dtc3CNQ="; + hash = "sha256-H5ITK4m3l+rlIEYXoMIpsE9faCu6rRZuB5zaZQeArOU="; }; build-system = [ @@ -66,27 +64,25 @@ buildPythonPackage rec { datashaper devtools environs - fastparquet graspologic json-repair lancedb + matplotlib networkx nltk - numba numpy openai + pandas pyaml-env + pyarrow pydantic python-dotenv pyyaml rich - scipy - swifter tenacity - textual tiktoken typing-extensions - uvloop + umap-learn ]; env.NUMBA_CACHE_DIR = "$TMPDIR"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix index 2bf0cfe01c..7ce60f9f06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ''; # Too many failures due to attempting to connect to com.apple.fonts daemon - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Simple Python interface for Graphviz"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/great-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/great-tables/default.nix index 14f242ed06..bca215084c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/great-tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/great-tables/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "great-tables"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "great-tables"; rev = "refs/tags/v${version}"; - hash = "sha256-ccS//fSFa6sytKv0izRxIdnHoNICr7P90Eo+v62RmVA="; + hash = "sha256-IlukgnhOT8NF1WxRJCnNuNEI31DByWoNzbk/x458atA="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix index 9383ec9037..2ed9792df3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2024.0.1"; + version = "2024.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "greatfet"; rev = "refs/tags/v${version}"; - hash = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ="; + hash = "sha256-1GfyhxwA6Nhf/umvllR/hkh5hyn42141QOT7+6IGAis="; }; sourceRoot = "${src.name}/host"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 3970ef993c..50aa51e82e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Discover, connect and control Gree based minisplit systems"; homepage = "https://github.com/cmroche/greeclimate"; changelog = "https://github.com/cmroche/greeclimate/blob/${src.rev}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index 44c591d783..5dc26d50be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=1 fi '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' unset AR ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index 08683996db..525cfa3208 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -53,10 +53,10 @@ buildPythonPackage rec { dependencies = [ decorator ]; - buildInputs = lib.optionals stdenv.isDarwin [ GSS ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ GSS ]; # k5test is marked as broken on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ k5test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix index f930e4ddd4..754d7109c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix @@ -79,6 +79,9 @@ buildPythonPackage rec { "test_recursion_error" "test_openai_class_detection" "test_openai_chat_without_roles" + + # flaky tests + "test_remote_mock_gen" # frequently fails when building packages in parallel ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix index 83b45412b0..f478acffb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix @@ -50,7 +50,7 @@ buildPythonPackage { 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix index 5cb114c514..d7642559e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { # marked as broken and throws an error during evaluation if the package is evaluated anyway. # disabling checks on Darwin avoids this and allows the package to be built. # if jaxlib is ever fixed on Darwin, remove this. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTestPaths = [ # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gyp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gyp/default.nix index ad9fb88eb7..b8d52cd944 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gyp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gyp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { hash = "sha256-LUlF2VhRnuDwJLdITgmXIQV/IuKdx1KXQkiPVHKrl4Q="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-darwin-cflags.patch ./no-xcode.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix index 06e2ed94bb..37869ffad3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setupPyBuildFlags = [ "--inplace" ]; # Find foma in Darwin tests - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${foma}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix index ee69705614..976961d216 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { sha256 = "sha256-bA6XumsFmjCdUbSVqPDV77zqh1a2QNmLb2u5/e8kWKw="; }; - nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; propagatedBuildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ libusb1 udev ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -37,7 +37,7 @@ buildPythonPackage rec { ); # Fix the USB backend library lookup - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' libusb=${libusb1.dev}/include/libusb-1.0 test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix index 0edd09dc64..e86b6382a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.30"; + version = "0.0.31"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-+ine7Q60dT9GyFWGHtbH6G1E4TzTQaY5y9Yxxxbgnp8="; + hash = "sha256-mJPvzGmu0veFlG7jlWdf919qOp3KfGv6SPRcFVFjhnc="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix index 5370a1e870..86b4e4e512 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { "test_binary_suppresses_when_not_terminal_but_pretty" "test_binary_included_and_correct_when_suitable" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test is flaky "test_daemon_runner" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix index 67e38601cf..a6c3e42a53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { "test_head_301" "test_303" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails with "ConnectionResetError: [Errno 54] Connection reset by peer" "test_connection_close" # fails with HTTP 408 Request Timeout, instead of expected 200 OK diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 4d4c264ea0..eb91fa3fce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { }; # trustme uses pyopenssl - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); nativeCheckInputs = [ chardet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index bec0a7fefc..6573cdd1ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-N/c/aTUWHolQ1TWVOoyfQ3eCLOSX3/6qtXk1T918/wg="; + hash = "sha256-MloCUtvJ3A7t6NbCCPp4kcR+7apTrIjbvm6Ppe0SgdA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix index a7a6525e94..0c69762ec8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix @@ -19,7 +19,9 @@ buildPythonPackage rec { # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; disabledTestPaths = [ # Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix index 6e17149079..f9b1fb66ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Open source IFC library and geometry engine"; homepage = "http://ifcopenshell.org/"; license = licenses.lgpl3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index 8d6145d9ad..26009c97d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -97,6 +97,6 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bcdarwin ]; # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix index cca83672a3..b21b80c7c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -29,7 +29,8 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; homepage = "https://www.lfd.uci.edu/~gohlke/"; maintainers = [ maintainers.tbenst ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 145d08730f..47018744c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { hash = "sha256-WeoZE2TPBAhzBBcZNQqoiqvribMCLSZWk/XpdMydvCQ="; }; - patches = lib.optionals (!stdenv.isDarwin) [ + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -100,7 +100,7 @@ buildPythonPackage rec { "tests/test_swf.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Segmentation fault "test_bayer_write" # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 1a887a87d2..62efb51697 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { (substituteAll { src = ./default-icc-profile.patch; srgbProfile = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "/System/Library/ColorSync/Profiles/sRGB Profile.icc" else # break runtime dependency chain all of colord dependencies @@ -65,7 +65,9 @@ buildPythonPackage rec { # FIXME: Only add "sRGB Profile.icc" to __impureHostDeps once # https://github.com/NixOS/nix/issues/9301 is fixed. - __impureHostDeps = lib.optionals stdenv.isDarwin [ "/System/Library/ColorSync/Profiles" ]; + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ + "/System/Library/ColorSync/Profiles" + ]; nativeCheckInputs = [ exiftool diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix index 477e6f06a1..17fa94212c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.29.1"; + version = "2.30.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-R00Q6y+SS5Mg9vcJPkwUnQo4wSTQQZwSoHo+ypQt4CU="; + hash = "sha256-jeC4K7azOBFls46VdhoCcBiaAIPNuS4VTfFlfsZRmkA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix index c796a01369..2435c7e467 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix @@ -68,7 +68,7 @@ buildPythonPackage { "test_extract_multiple" "test_lookup_and" ] - ++ lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isDarwin [ "test_image_extract" "test_path_number_nodes" "test_plotter" # Hangs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix index 80907730ff..ba078d1f90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -124,7 +124,8 @@ buildPythonPackage rec { # Timing-based, flaky on darwin and possibly others "test_idle_timer" ] - ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") + ++ lib.optionals + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix index 968669ec92..445774979d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix @@ -72,7 +72,8 @@ buildPythonPackage rec { let testName = "${if withOnnx then "withOnnx" else "withoutOnnx"}-${method}"; # This test fails in the sandbox on aarch64-linux, see https://github.com/microsoft/onnxruntime/issues/10038 - skipTest = stdenv.isLinux && stdenv.isAarch64 && withOnnx && method == "rivaGan"; + skipTest = + stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && withOnnx && method == "rivaGan"; in lib.optionalAttrs (!skipTest) { "${testName}" = callPackage ./tests/cli.nix { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invocations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/invocations/default.nix index 17828c47ae..68160afc54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/invocations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/invocations/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - blessings, + blessed, fetchFromGitHub, invoke, pythonOlder, @@ -10,6 +10,11 @@ tabulate, tqdm, twine, + pytestCheckHook, + pytest-relaxed, + pytest-mock, + icecream, + pip, }: buildPythonPackage rec { @@ -26,13 +31,15 @@ buildPythonPackage rec { hash = "sha256-JnhdcxhBNsYgDMcljtGKjOT1agujlao/66QifGuh6I0="; }; + patches = [ ./replace-blessings-with-blessed.patch ]; + postPatch = '' substituteInPlace setup.py \ --replace "semantic_version>=2.4,<2.7" "semantic_version" ''; propagatedBuildInputs = [ - blessings + blessed invoke releases semantic-version @@ -41,11 +48,27 @@ buildPythonPackage rec { twine ]; - # There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29. - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-relaxed + pytest-mock + icecream + pip + ]; pythonImportsCheck = [ "invocations" ]; + disabledTests = [ + # invoke.exceptions.UnexpectedExit + "autodoc_" + + # ValueError: Call either Version('1.2.3') or Version(major=1, ...) + "component_state_enums_contain_human_readable_values" + "load_version_" + "prepare_" + "status_" + ]; + meta = with lib; { description = "Common/best-practice Invoke tasks and collections"; homepage = "https://invocations.readthedocs.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch b/third_party/nixpkgs/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch new file mode 100644 index 0000000000..fe03889e85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch @@ -0,0 +1,26 @@ +diff --git a/invocations/packaging/release.py b/invocations/packaging/release.py +index 54322c3..81ac173 100644 +--- a/invocations/packaging/release.py ++++ b/invocations/packaging/release.py +@@ -23,7 +23,7 @@ from shutil import rmtree + + from invoke.vendor.lexicon import Lexicon + +-from blessings import Terminal ++from blessed import Terminal + from docutils.utils import Reporter + from enum import Enum + from invoke import Collection, task, Exit +diff --git a/setup.py b/setup.py +index 78ae28b..c78a74c 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,7 +16,7 @@ requirements = [ + # time if missing), but that got hairy fast, and these are all + # pure-Python packages, so it shouldn't be a huge burden for users to + # obtain them. +- "blessings>=1.6", ++ "blessed", + "releases>=1.6", + "semantic_version>=2.4,<2.7", + "tabulate>=0.7.5", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix index bd69e5ccd5..ea8fa07883 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipwhois" ]; - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index dabad2fa8e..4da948088c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pyzmq tornado traitlets - ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ]; # check in passthru.tests.pytest to escape infinite recursion with ipyparallel doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix index 4d96d4c678..89ac0be2d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix @@ -46,7 +46,7 @@ buildPythonPackage { # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... "test_install_kernelspec" ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( [ # see https://github.com/NixOS/nixpkgs/issues/76197 "test_subprocess_print" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index e13f14a241..077ea0e4ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { # UnboundLocalError: local variable 'child' referenced before assignment "test_system_interrupt" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste' "test_clipboard_get" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix index c5554812cb..de22f3eda8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { python-dateutil pathvalidate jsonpickle - ] ++ lib.optionals stdenv.isDarwin [ ifconfig-parser ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ifconfig-parser ]; pythonImportsCheck = [ "jaraco.net" ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { importlib-resources pyparsing requests-mock - ] ++ lib.optionals stdenv.isDarwin [ nettools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ nettools ]; disabledTestPaths = [ # doesn't actually contain tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-path/default.nix index 5537811d59..48ee8b4fdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-path/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-path/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.path"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; # pyobjc is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc is missing }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix index ae018f6f83..47510c9c4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, setuptools-scm, toml, jaraco-functools, @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "jaraco-test"; - version = "5.4.0"; + version = "5.5.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "jaraco.test"; - inherit version; - hash = "sha256-29NDh4dYrcVER9YRXEYXia2zH8QHOyEpUCQwk7oxfsI="; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.test"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbnU6PFVUd/eD9CWHyJvaTFkcZaIIwztkN9UbQZH1RU="; }; build-system = [ setuptools-scm ]; @@ -47,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Testing support by jaraco"; homepage = "https://github.com/jaraco/jaraco.test"; - changelog = "https://github.com/jaraco/jaraco.test/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/jaraco.test/blob/${src.rev}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix index ec8c53daab..ba9a621b1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { # PermissionError: [Errno 13] Permission denied: '/tmp/back_compat_testdata/test_*.py' # See https://github.com/google/jax/blob/jaxlib-v0.4.27/jax/_src/internal_test_util/export_back_compat_test_util.py#L240-L241 # NOTE: this doesn't seem to be an issue on linux - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export TEST_UNDECLARED_OUTPUTS_DIR=$(mktemp -d) ''; @@ -108,7 +108,7 @@ buildPythonPackage rec { "test_custom_root_with_aux" "testEigvalsGrad_shape" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # See https://github.com/google/jax/issues/14793. "test_for_loop_fixpoint_correctly_identifies_loop_varying_residuals_unrolled_for_loop" "testQdwhWithRandomMatrix3" @@ -131,7 +131,7 @@ buildPythonPackage rec { # Segmentation fault. See https://gist.github.com/zimbatm/e9b61891f3bcf5e4aaefd13f94344fba "tests/linalg_test.py" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # RuntimeWarning: invalid value encountered in cast "tests/lax_test.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index 3104cee90e..a082648497 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -186,7 +186,7 @@ buildPythonPackage { # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. nativeBuildInputs = - lib.optionals stdenv.isLinux [ autoPatchelfHook ] + lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; # Dynamic link dependencies buildInputs = [ stdenv.cc.cc.lib ]; @@ -238,12 +238,12 @@ buildPythonPackage { broken = !(cudaSupport -> lib.versionAtLeast cudaVersion "11.1") || !(cudaSupport -> lib.versionAtLeast cudaPackages.cudnn.version "8.2") - || !(cudaSupport -> stdenv.isLinux) + || !(cudaSupport -> stdenv.hostPlatform.isLinux) || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")) # Fails at pythonImportsCheckPhase: # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4 # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))' - || (stdenv.isDarwin && stdenv.isx86_64); + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index 0fc50fa924..de7fea0a26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -240,7 +240,7 @@ let wheel build which - ] ++ lib.optionals effectiveStdenv.isDarwin [ cctools ]; + ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ @@ -259,8 +259,8 @@ let snappy zlib ] - ++ lib.optionals effectiveStdenv.isDarwin [ IOKit ] - ++ lib.optionals (!effectiveStdenv.isDarwin) [ nsync ]; + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ IOKit ] + ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; # We don't want to be quite so picky regarding bazel version postPatch = '' @@ -406,7 +406,7 @@ let TF_SYSTEM_LIBS = lib.concatStringsSep "," ( tf_system_libs - ++ lib.optionals (!effectiveStdenv.isDarwin) [ + ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ "nsync" # fails to build on darwin ] ); @@ -414,7 +414,7 @@ let # Note: we cannot do most of this patching at `patch` phase as the deps # are not available yet. Framework search paths aren't added by bintools # hook. See https://github.com/NixOS/nixpkgs/pull/41914. - preBuild = lib.optionalString effectiveStdenv.isDarwin '' + preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix index 8159533fc2..b617e21c1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { # https://github.com/google/jaxopt/issues/592 "test_solve_sparse" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/google/jaxopt/issues/577 "test_binary_logit_log_likelihood" "test_solve_sparse" @@ -87,7 +87,7 @@ buildPythonPackage rec { # AssertionError: Array(0.01411963, dtype=float32) not less than or equal to 0.01 "test_multiclass_logreg6" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fatal Python error: Aborted "test_dtype_consistency" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix index 096c327ae9..e67d04be02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { HOME="$(mktemp -d)" ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/pappasam/jedi-language-server/issues/313 "test_publish_diagnostics_on_change" "test_publish_diagnostics_on_save" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix index ddc0caea55..b88dc9311e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { # sensitive to platform, causes false negatives on darwin "test_import" ] - ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix index 4210f5499d..8517c239de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix index da220641db..ee1d27671b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 - doCheck = !stdenv.is32bit; + doCheck = !stdenv.hostPlatform.is32bit; nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.i18n; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix index 65b728b34e..0cd4182d42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests "test_nested_parallel_warnings" # tests is flaky under load ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. ] ++ lib.optionals (pythonAtLeast "3.12") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix index 19d02b1189..a9d7009e07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -47,8 +47,8 @@ buildPythonPackage rec { buildInputs = [ nettle ] - ++ lib.optionals stdenv.isLinux [ pcsclite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ PCSC libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 9a65903e38..86473e609b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wheel ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Tests depend on json-stream, which depends on this package. # To avoid infinite recursion, we only enable tests when building passthru.tests. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix index 26b7ef5f8e..fd5f61399f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ iconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; propagatedBuildInputs = [ requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix index 58c3513e1e..49ffcee24b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests --doctest-modules jsonstreams" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "JSON streaming writer"; homepage = "https://github.com/dcbaker/jsonstreams"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix deleted file mode 100644 index 622ad6ceff..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - ipython-genutils, - jupyter-contrib-core, - jupyter-highlight-selected-word, - jupyter-nbextensions-configurator, - lxml, - nose, - pytestCheckHook, - notebook, -}: - -buildPythonPackage rec { - pname = "jupyter-contrib-nbextensions"; - version = "0.7.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "ipython-contrib"; - repo = "jupyter_contrib_nbextensions"; - rev = "refs/tags/${version}"; - hash = "sha256-1o8tBfRw6jNcKfNE7xXrQaEhx+KOv7mLOruvuMDtJ1Q="; - }; - - propagatedBuildInputs = [ - ipython-genutils - jupyter-contrib-core - jupyter-highlight-selected-word - jupyter-nbextensions-configurator - lxml - ]; - - nativeCheckInputs = [ - nose - pytestCheckHook - ]; - - disabledTestPaths = [ - # Thoses tests fail upstream because of nbconvert being too recent - # https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1606 - "tests/test_exporters.py" - - # Requires to run jupyter which is not feasible here - "tests/test_application.py" - ]; - - pythonImportsCheck = [ "jupyter_contrib_nbextensions" ]; - - meta = with lib; { - description = "Collection of various notebook extensions for Jupyter"; - homepage = "https://github.com/ipython-contrib/jupyter_contrib_nbextensions"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; - # https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1647 - broken = versionAtLeast notebook.version "7"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index a367bc3c0f..071b370722 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { ]; # https://github.com/NixOS/nixpkgs/issues/299427 - stripExclude = lib.optionals stdenv.isDarwin [ "favicon.ico" ]; + stripExclude = lib.optionals stdenv.hostPlatform.isDarwin [ "favicon.ico" ]; nativeCheckInputs = [ ipykernel @@ -102,13 +102,13 @@ buildPythonPackage rec { # test is presumable broken in sandbox "test_authorized_requests" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # attempts to use trashcan, build env doesn't allow this "test_delete" # Insufficient access privileges for operation "test_regression_is_hidden" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Failed: DID NOT RAISE "test_copy_big_dir" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index 38a2fc97a6..76fbe01ae3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -171,6 +171,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = teams.jupyter.members; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index 4708b53631..df0fc67663 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/external" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # requires access to trash "test_load_save_rename" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaleido/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaleido/default.nix index 9e9fff6af8..ef889a0aa7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaleido/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaleido/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ ''; - passthru.tests = lib.optionalAttrs (!stdenv.isDarwin) { + passthru.tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { kaleido = callPackage ./tests.nix { }; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix index 20ed4c5dfb..45166fb322 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "keyring"; - version = "25.3.0"; + version = "25.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "keyring"; rev = "refs/tags/v${version}"; - hash = "sha256-P7rm5fkNudUEWdzVPMeGsP9sjBXoCBKojbh5oHhw4y4="; + hash = "sha256-B1uU4INod2iSXIftPlDOr7mzWPY3FTpLhUuInl1Hg/M="; }; build-system = [ setuptools-scm ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { jaraco-context jaraco-functools ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney secretstorage ] @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/backends/test_macOS.py" ] # These tests fail when sandboxing is enabled because they are unable to get a password from keychain. - ++ lib.optional stdenv.isDarwin "tests/test_multiprocess.py"; + ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py"; meta = with lib; { description = "Store and access your passwords safely"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyring_24/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyring_24/default.nix index 9739a6f7b2..05fbb31781 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyring_24/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyring_24/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { jaraco-context jaraco-functools ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney secretstorage ] @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/backends/test_macOS.py" ] # These tests fail when sandboxing is enabled because they are unable to get a password from keychain. - ++ lib.optional stdenv.isDarwin "tests/test_multiprocess.py"; + ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py"; meta = with lib; { description = "Store and access your passwords safely"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keystone-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keystone-engine/default.nix index 61e27473ec..4e526346dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keystone-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keystone-engine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"; }; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix index f71c8288c7..26a1bba38b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix @@ -49,11 +49,11 @@ buildPythonPackage rec { SDL2_ttf SDL2_mixer ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa mtdev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate ApplicationServices AVFoundation @@ -84,9 +84,9 @@ buildPythonPackage rec { # prefer pkg-config over hardcoded framework paths USE_OSX_FRAMEWORKS = 0; # work around python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace kivy/lib/mtdev.py \ --replace "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix index d71b613b58..24322524eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-5X5WOlf7IqFC2jTziswvwaXIZLwpyhUXqIq8lj5g1uw="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/knocki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knocki/default.nix index 953eaf9b10..c5c5442fdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/knocki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/knocki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "knocki"; - version = "0.3.2"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "swan-solutions"; repo = "knocki-homeassistant"; rev = "refs/tags/v${version}"; - hash = "sha256-WdX/RvLjxkElgDXVMXcslYWlupQ7RDns5F+Y5XGQk5w="; + hash = "sha256-Fb3skFttY5gtm80k1LCUQ4Z7/TQGClCNcWt1k6bLQoI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix index bfd5beb329..696860862b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.4.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HAUXiCbauBH4yrWwoVTUKnoz2Lzd6fo9e0WC5Dw8A9s="; + hash = "sha256-7vVy3S/Z/GFLN1gOPK6v3Vr0bB7/Mef7qJE4zbQG8s8="; }; propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/krb5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/krb5/default.nix index f64b73447a..42c4537bff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/krb5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/krb5/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/jborean93/pykrb5"; license = licenses.mit; maintainers = teams.deshaw.members; - broken = stdenv.isDarwin; # TODO: figure out how to build on Darwin + broken = stdenv.hostPlatform.isDarwin; # TODO: figure out how to build on Darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index b7387675c9..66a295dcc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError: != "test_rest_proxycare" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lancedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lancedb/default.nix index bf2f407be8..e1dcbd2a1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lancedb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lancedb/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { libiconv protobuf ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ IOKit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-aws/default.nix index 83e063e9cc..767f2262c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-aws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-aws/default.nix @@ -55,6 +55,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_aws" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = { changelog = "https://github.com/langchain-ai/langchain-aws/releases/tag/v${version}"; description = "Build LangChain application on AWS"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index 0d9ce18648..9bf287ea2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -23,8 +23,6 @@ responses, syrupy, toml, - - nix-update-script, }: buildPythonPackage rec { @@ -67,11 +65,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-azure-dynamic-sessions==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-chroma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-chroma/default.nix index d5a5a53ac9..f9a35e759c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-chroma/default.nix @@ -7,7 +7,6 @@ numpy, poetry-core, pytestCheckHook, - nix-update-script, }: buildPythonPackage rec { @@ -38,11 +37,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-chroma==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix index 8f42413117..54de5416be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit_tests" ]; passthru = { - updateScript = langchain-core.updateScript; + inherit (langchain-core) updateScript; }; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix index 0d835c4078..0c3564d0f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix @@ -83,15 +83,25 @@ buildPythonPackage rec { ''; passthru = { + # Updates to core tend to drive updates in everything else updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-update set -u -o pipefail +e + # Common core nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community + + # Extensions + nix-update --commit --version-regex 'langchain-aws==(.*)' python3Packages.langchain-aws + nix-update --commit --version-regex 'langchain-azure-dynamic-sessions==(.*)' python3Packages.langchain-azure-dynamic-sessions + nix-update --commit --version-regex 'langchain-chroma==(.*)' python3Packages.langchain-chroma + nix-update --commit --version-regex 'langchain-huggingface==(.*)' python3Packages.langchain-huggingface + nix-update --commit --version-regex 'langchain-mongodb==(.*)' python3Packages.langchain-mongodb + nix-update --commit --version-regex 'langchain-openai==(.*)' python3Packages.langchain-openai ''; }; @@ -100,8 +110,7 @@ buildPythonPackage rec { # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value "test_map_stream" # Compares with machine-specific timings - "test_rate_limit_invoke" - "test_rate_limit_stream" + "test_rate_limit" # flaky: assert (1726352133.7419367 - 1726352132.2697523) < 1 "test_benchmark_model" @@ -109,7 +118,7 @@ buildPythonPackage rec { "test_chat_prompt_template_variable_names" "test_create_model_v2" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Langchain-core the following tests due to the test comparing execution time with magic values. "test_queue_for_streaming_via_sync_call" "test_same_event_loop" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-huggingface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-huggingface/default.nix index 51f201ea69..91866b4121 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -26,8 +26,6 @@ responses, syrupy, toml, - - nix-update-script, }: buildPythonPackage rec { @@ -73,11 +71,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_huggingface" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-huggingface==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix index 9d8f59e3c7..0a06462188 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -14,18 +14,10 @@ freezegun, httpx, langchain, - lark, - pandas, pytest-asyncio, pytestCheckHook, pytest-mock, - pytest-socket, - requests-mock, - responses, syrupy, - toml, - - nix-update-script, }: buildPythonPackage rec { @@ -64,11 +56,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_mongodb" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-mongodb==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-ollama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-ollama/default.nix new file mode 100644 index 0000000000..72bcf180d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-ollama/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + langchain-core, + ollama, + + # testing + langchain-standard-tests, + pytestCheckHook, + pytest-asyncio, + syrupy, + + nix-update-script, +}: + +buildPythonPackage rec { + pname = "langchain-ollama"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-ollama==${version}"; + hash = "sha256-NtlJqIevdaoOO4oDqKsL4OFbw8tHb3FjV9LrTytOGKE="; + }; + + sourceRoot = "${src.name}/libs/partners/ollama"; + + build-system = [ poetry-core ]; + + dependencies = [ + langchain-core + ollama + ]; + + nativeCheckInputs = [ + langchain-standard-tests + pytestCheckHook + pytest-asyncio + syrupy + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_ollama" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "langchain-ollama==(.*)" + ]; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama==${version}"; + description = "Integration package connecting Ollama and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/ollama"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix index 1410e72aea..82f0a77620 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix @@ -24,8 +24,6 @@ responses, syrupy, toml, - - nix-update-script, }: buildPythonPackage rec { @@ -89,11 +87,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_openai" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-openai==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langfuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langfuse/default.nix index 84879b3659..cd7ac3a36c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.45.1"; + version = "2.50.2"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CErrC5hVBrdUFYxN3JxAIo5eb/OGnISWfzClSwrrYLM="; + hash = "sha256-CKydYXcwWB4fnomPBdOLTwRBLBtxqoNHdP2RBzcrjpk="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index adcd0856f0..7d511994b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "psycopg-pool" ]; - doCheck = !(stdenvNoCC.isDarwin); + doCheck = !(stdenvNoCC.hostPlatform.isDarwin); pythonImportsCheck = [ "langgraph.checkpoint.postgres" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix index 80e2faa682..087db330d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { # postgresql doesn't play nicely with the darwin sandbox: # FATAL: could not create shared memory segment: Operation not permitted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ aiosqlite diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix index c45edec702..5ce0f9c333 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.120"; + version = "0.1.125"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-K8QIlyQnaTKCBoRCsTQ26KovIIw8uK6HBynEplrB6wI="; + hash = "sha256-0/ych7iP7G75R2kGaXzsxSy4jRYCvxeqd8aBq4QhRgI="; }; sourceRoot = "${src.name}/python"; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook uvicorn - ] ++ lib.optionals stdenv.isLinux [ attr ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ attr ]; disabledTests = [ # These tests require network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/latexrestricted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/latexrestricted/default.nix new file mode 100644 index 0000000000..394176397b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/latexrestricted/default.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + setuptools, +}: + +buildPythonPackage rec { + pname = "latexrestricted"; + version = "0.4.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AMfDTruJKejDdXW98VkeeEwELql5566bsL1SutLDpso="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "latexrestricted" ]; + + # upstream has no tests + doCheck = false; + + meta = { + homepage = "https://github.com/gpoore/latexrestricted"; + description = "Python library for creating executables compatible with LaTeX restricted shell escape"; + changelog = "https://github.com/gpoore/latexrestricted/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.lppl13c; + maintainers = with lib.maintainers; [ romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index 5010d81530..4885fa1452 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { python-gnupg python-u2flib-host websocket-client - ] ++ lib.optionals stdenv.isLinux [ bleak ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bleak ]; # No tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix index 8afa1ea14c..0cbc048ee6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = [ setuptools setuptools-scm - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; propagatedBuildInputs = [ cryptography click diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix index dbf4d5a502..e7e581174b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "anthonyharrison"; repo = "lib4sbom"; rev = "refs/tags/v${version}"; - hash = "sha256-Uqv6E9qMJRsfYICVAiZEQGlG/0w8aECuh8wMa85FnlE="; + hash = "sha256-NWrHz4G5Ps5GoZUcx0LiSQzbTZlU4eGYgli6znG+NSs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix index 730d1a9217..b81e67f8f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { patches = [ ./libasyncns-fix-res-consts.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace resquery.c \ --replace '' '' ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index a0863f9bfd..3ccf4c8e12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix index 37ed199cd8..980109e499 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "libmambapy"; - version = "2024.08.31"; + version = "2024.09.20"; pyproject = true; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "refs/tags/${version}"; - hash = "sha256-RRHu0JM1okFprNIrQLLIYN7xZdZ+A6OuCZM5E1oPoFg="; + hash = "sha256-/mfZEfpB4CQ2f8zyzYbnjvBgK4VEPngTNQJT4Oh62Qs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix index eae30cc740..39a2b99ddf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; rev = "refs/tags/v${version}"; - hash = "sha256-QH+H1UubDDv2SZa/razs+JYu4BbZzWHh7DLWfZEWCes="; + hash = "sha256-c/MbO8KST2QnP32Y2FfXjJcfh6O7hqQFcZOn1U0FqRM="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix index 9b015e335b..fa0c17487d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { "test_cite_badversion" "test_cite_unreleased" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # crashing the python interpreter "test_unknown_time_unit" "test_unknown_wavaxis" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 0bb5cb5cda..917b20ef07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -47,12 +47,12 @@ buildPythonPackage rec { # Assertion error "test_capture_pane_start" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # tests/test_pane.py:113: AssertionError "test_capture_pane_start" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_test.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index 6e07d603b1..5c52a73507 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -29,7 +29,7 @@ boost, ocl-icd, opencl-headers, - gpuSupport ? stdenv.isLinux && !cudaSupport, + gpuSupport ? stdenv.hostPlatform.isLinux && !cudaSupport, cudaSupport ? config.cudaSupport, cudaPackages, }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix index dcce596ff3..decda0e742 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.44.22"; + version = "1.47.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-0F972vEW6ebbbaJ6c0db3cDtFJIRUN81Gp0OMo0fgqY="; + hash = "sha256-onFBSClB+FDbpc7VYkm2jks8G6L/LGsZq9tyFW+uHZc="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix index 8da8f5e2d2..8fd9274eac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix @@ -6,13 +6,13 @@ deprecated, dirtyjson, fetchFromGitHub, - fetchzip, fsspec, jsonpath-ng, llamaindex-py-client, nest-asyncio, networkx, nltk, + nltk-data, numpy, openai, pandas, @@ -33,21 +33,9 @@ typing-inspect, }: -let - stopwords = fetchzip { - url = "https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/stopwords.zip"; - hash = "sha256-tX1CMxSvFjr0nnLxbbycaX/IBnzHFxljMZceX5zElPY="; - }; - - punkt = fetchzip { - url = "https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt.zip"; - hash = "sha256-SKZu26K17qMUg7iCFZey0GTECUZ+sTTrF/pqeEgJCos="; - }; -in - buildPythonPackage rec { pname = "llama-index-core"; - version = "0.11.9"; + version = "0.11.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -56,7 +44,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-IebrdKC73Rwj4AgN26Ga3qqMEAeuVDMmFhDqQ9VIWIw="; + hash = "sha256-6wQs6hB609Du5/n5sKJT5E0OJCj3dMKvpKxJ9C75HpI="; }; sourceRoot = "${src.name}/${pname}"; @@ -67,12 +55,12 @@ buildPythonPackage rec { # Setting `NLTK_DATA` to a writable path can also solve this problem, but it needs to be done in # every package that depends on `llama-index-core` for `pythonImportsCheck` not to fail, so this # solution seems more elegant. - patchPhase = '' + postPatch = '' mkdir -p llama_index/core/_static/nltk_cache/corpora/stopwords/ - cp -r ${stopwords}/* llama_index/core/_static/nltk_cache/corpora/stopwords/ + cp -r ${nltk-data.stopwords}/corpora/stopwords/* llama_index/core/_static/nltk_cache/corpora/stopwords/ mkdir -p llama_index/core/_static/nltk_cache/tokenizers/punkt/ - cp -r ${punkt}/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ + cp -r ${nltk-data.punkt}/tokenizers/punkt/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ ''; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 723ff4069f..8b113fe587 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.2.7"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-pwmiazL4JwzoYhMZQTcqv3ZMwPgbBxMTOEjH7/x9MPs="; + hash = "sha256-VjdvOeOkAlO1xPuQ0Ptq8JPyG7KTWSVhXwwooo0CgYc="; }; pythonRemoveDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix index 1f45758dcd..9026edb153 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-ILAOCbFNG1ehsEDkvWFDbVH0Nza3tRADBypNBbA170Q="; + hash = "sha256-PHTaEkbJvdYdY7f8ISBA6i29IY1H/JhqGOOXTmRZG4A="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix index 4fa525fa4d..a110a8082c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ''; # On Darwin, the test requires macFUSE to be installed outside of Nix. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook which diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index 9d76e64fde..19941cd4b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { cd $out ''; - __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix index 5423a1abb3..04e4bc881b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix @@ -4,7 +4,7 @@ fetchPypi, setuptools, pbr, - nose, + pytestCheckHook, }: buildPythonPackage rec { @@ -14,25 +14,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"; + hash = "sha256-au0C3gPLok76vNYAswVAFAY0/AbPpgOCLVCNU2Hp95k="; }; + patches = [ ./fix-tests.patch ]; + build-system = [ pbr setuptools ]; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postcheck - ''; - - meta = with lib; { + meta = { homepage = "https://launchpad.net/pylockfile"; description = "Platform-independent advisory file locking capability for Python applications"; - license = licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/fix-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/fix-tests.patch new file mode 100644 index 0000000000..882a7dc2af --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/fix-tests.patch @@ -0,0 +1,28 @@ +diff --git a/test/compliancetest.py b/test/compliancetest.py +index bf4e59c..f55e258 100644 +--- a/test/compliancetest.py ++++ b/test/compliancetest.py +@@ -6,18 +6,19 @@ import lockfile + + + class ComplianceTest(object): +- def __init__(self): +- self.saved_class = lockfile.LockFile ++ @classmethod ++ def setup_class(cls): ++ cls.saved_class = lockfile.LockFile + + def _testfile(self): + """Return platform-appropriate file. Helper for tests.""" + import tempfile + return os.path.join(tempfile.gettempdir(), 'trash-%s' % os.getpid()) + +- def setup(self): ++ def setup_method(self): + lockfile.LockFile = self.class_to_test + +- def teardown(self): ++ def teardown_method(self): + try: + tf = self._testfile() + if os.path.isdir(tf): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix index b3ec041169..216a206633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_type_hinting.py" # avoid dependency on mypy - ] ++ lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ]; disabledTests = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { # Slow test "test_time_rotation" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix index eb0e1ebd53..df79cc9dc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "test_hashandlers" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin) [ # Exception: unable to connect to Redis server "tests/test_redis.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loompy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loompy/default.nix new file mode 100644 index 0000000000..1240a01be0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/loompy/default.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + h5py, + numpy, + scipy, + numba, + click, + numpy-groupies, + setuptools, + pytestCheckHook, +}: +let + finalAttrs = { + pname = "loompy"; + version = "3.0.7"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-tc33tUc0xr7ToYHRGUevcK8sbg3K3AL9Docd8jL6qPQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + h5py + numpy + scipy + numba + click + numpy-groupies + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Deprecated numpy attributes access + disabledTests = [ + "test_scan_with_default_ordering" + "test_get" + ]; + + pythonImportsCheck = [ "loompy" ]; + + meta = { + changelog = "https://github.com/linnarsson-lab/loompy/releases"; + description = "Python implementation of the Loom file format"; + homepage = "https://github.com/linnarsson-lab/loompy"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "loompy"; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ltpycld2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ltpycld2/default.nix index 7635b63117..510259d72d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ltpycld2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ltpycld2/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/LibreTranslate/pycld2"; license = licenses.asl20; maintainers = with maintainers; [ misuzu ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix index 935fbf9cfd..cabfcea92c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.1"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-RYPWdFDZvvLJVCSQPXdJw0xMrUN3Kr8QRWTYZfBB9og="; + hash = "sha256-ccLWHjgxG/si08ie1F409FUmefuzVjNwcTt9Og4TU68="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix index bc09e20503..c035c52467 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { libxslt.dev cython setuptools - ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ libxml2 libxslt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lzallright/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lzallright/default.nix index 697acafb6e..ee5be2d8dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lzallright/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lzallright/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "lzallright" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix index 75f1e94f3b..1043325e10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-Wno-error=implicit-function-declaration" "-Wno-error=incompatible-pointer-types" ]); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 55bc5da3fd..d98cfa2595 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { mock ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # these tests fail in Darwin's sandbox "src/wormhole_mailbox_server/test/test_web.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index e765a52cc7..01c714e414 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { 'return "${placeholder "out"}/bin/wormhole"' '' # fix the location of the ifconfig binary - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; @@ -88,7 +88,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.dilation - ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix index 0c670a8137..444f4d844e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ mihaimaruseac ]; mainProgram = "magika"; # Currently, disabling on AArch64 as it onnx runtime crashes on ofborg - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix index 144aae89c7..307ed168ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix @@ -49,10 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "mahotas" ]; - disabled = stdenv.isi686; # Failing tests + disabled = stdenv.hostPlatform.isi686; # Failing tests meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Computer vision package based on numpy"; homepage = "https://mahotas.readthedocs.io/"; maintainers = with maintainers; [ luispedro ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mamba-ssm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mamba-ssm/default.nix new file mode 100644 index 0000000000..11ac68c1e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mamba-ssm/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + causal-conv1d, + einops, + ninja, + setuptools, + torch, + transformers, + triton, + cudaPackages, + rocmPackages, + config, + cudaSupport ? config.cudaSupport, + which, +}: + +buildPythonPackage rec { + pname = "mamba"; + version = "2.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "state-spaces"; + repo = "mamba"; + rev = "refs/tags/v${version}"; + hash = "sha256-R702JjM3AGk7upN7GkNK8u1q4ekMK9fYQkpO6Re45Ng="; + }; + + build-system = [ + ninja + setuptools + torch + ]; + + nativeBuildInputs = [ which ]; + + buildInputs = ( + lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h, -lcudart + cuda_cccl + libcusparse # cusparse.h + libcusolver # cusolverDn.h + cuda_nvcc + libcublas + ] + ) + ); + + dependencies = [ + causal-conv1d + einops + torch + transformers + triton + ]; + + env = { + MAMBA_FORCE_BUILD = "TRUE"; + } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }; + + # pytest tests not enabled due to nvidia GPU dependency + pythonImportsCheck = [ "mamba_ssm" ]; + + meta = with lib; { + description = "Linear-Time Sequence Modeling with Selective State Spaces"; + homepage = "https://github.com/state-spaces/mamba"; + license = licenses.asl20; + maintainers = with maintainers; [ cfhammill ]; + # The package requires CUDA or ROCm, the ROCm build hasn't + # been completed or tested, so broken if not using cuda. + broken = !cudaSupport; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix index d1ca10b9e8..940dc355e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket # on the x86_64-darwin builder. # - # TODO: change this back to `doCheck = stdenv.isLinux` after + # TODO: change this back to `doCheck = stdenv.hostPlatform.isLinux` after # https://github.com/ionelmc/python-manhole/issues/54 is fixed doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix index c0f8e475b3..6a1876ed63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; propagatedBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mapclassify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mapclassify/default.nix index 0045daf1bd..9a01fd4790 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mapclassify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mapclassify/default.nix @@ -7,6 +7,7 @@ geopandas, libpysal, + matplotlib, networkx, numpy, pandas, @@ -17,15 +18,15 @@ buildPythonPackage rec { pname = "mapclassify"; - version = "2.6.1"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pysal"; repo = "mapclassify"; - rev = "v${version}"; - hash = "sha256-lb2Ui6zdx6MQBtBrL/Xj9k7cm6De8aLEuBLZDhPPDnE="; + rev = "refs/tags/v${version}"; + hash = "sha256-VClkMOR8P9sX3slVjJ2xYYLVnvZuOgVYZiCGrBxoZEc="; }; build-system = [ setuptools-scm ]; @@ -42,16 +43,21 @@ buildPythonPackage rec { pytestCheckHook geopandas libpysal + matplotlib ]; # requires network access - disabledTestPaths = [ "mapclassify/tests/test_greedy.py" ]; + disabledTestPaths = [ + "mapclassify/tests/test_greedy.py" + "mapclassify/tests/test_rgba.py" + ]; pythonImportsCheck = [ "mapclassify" ]; meta = { description = "Classification Schemes for Choropleth Maps"; homepage = "https://pysal.org/mapclassify/"; + changelog = "https://github.com/pysal/mapclassify/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = lib.teams.geospatial.members; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix index 5ed9926e10..15eb58f35d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.8.15"; + version = "0.8.18"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-S+lhoyM8s6wLFq1oGJMdzq+s+Uhn76qMgbkMUwpVr44="; + hash = "sha256-7gAxD1N2z80qDtC2PrijuJwO/UdgAGvpryYjwEoUTMo="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix index 1754ec45b7..f50f6e8e30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { preCheck = '' rm -r benchmarking ''; - doCheck = !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isi686; pythonImportsCheck = [ "markdown_it" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/materialx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/materialx/default.nix index b1e11ba6de..0ebcc21261 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/materialx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/materialx/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { openimageio imath ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ OpenGL Cocoa ] ) - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXt libGL @@ -54,7 +54,9 @@ buildPythonPackage rec { (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) # don't build MSL shader back-end on x86_x64-darwin, as it requires a newer SDK with metal support - (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" (stdenv.isLinux || (stdenv.isAarch64 && stdenv.isDarwin))) + (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" ( + stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) + )) ]; pythonImportsCheck = [ "MaterialX" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 2bcf4d246c..d91c96e6dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -52,7 +52,7 @@ # Tk # Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter - enableTk ? (!stdenv.isDarwin && !isPyPy), + enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy), tcl, tk, tkinter, @@ -114,7 +114,7 @@ buildPythonPackage rec { --replace-fail '"numpy>=2.0.0rc1,<2.3",' "" patchShebangs tools '' - + lib.optionalString (stdenv.isLinux && interactive) '' + + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) '' # fix paths to libraries in dlopen calls (headless detection) substituteInPlace src/_c_internal_utils.cpp \ --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \ @@ -139,10 +139,10 @@ buildPythonPackage rec { tcl tk ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; build-system = [ certifi diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotx/default.nix index 978e35e240..8baa52efcf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotx/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index d510be3b3a..0dffe55031 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # The multiprocessing tests fail on Darwin because multiprocessing uses spawn instead of fork, # resulting in an exception when it can’t pickle the `lookup` local function. - disabledTests = lib.optionals stdenv.isDarwin [ "multiprocessing" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "multiprocessing" ]; meta = with lib; { description = "Reader for the MaxMind DB format"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meteoswiss-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meteoswiss-async/default.nix new file mode 100644 index 0000000000..b837f49c08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/meteoswiss-async/default.nix @@ -0,0 +1,52 @@ +{ + lib, + aiohttp, + asyncstdlib, + buildPythonPackage, + dataclasses-json, + fetchFromGitHub, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "meteoswiss-async"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "albertomontesg"; + repo = "meteoswiss-async"; + rev = "refs/tags/${version}"; + hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + asyncstdlib + dataclasses-json + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + pytest-cov-stub + ]; + + pythonImportsCheck = [ "meteoswiss_async" ]; + + meta = { + description = "Asynchronous client library for MeteoSwiss API"; + homepage = "https://github.com/albertomontesg/meteoswiss-async"; + changelog = "https://github.com/albertomontesg/meteoswiss-async/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix index 68b4624125..29c00af47c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix @@ -1,29 +1,34 @@ { - appdirs, + lib, buildPythonPackage, fetchFromGitHub, + + # dependencies + appdirs, keras, - lib, mhcgnomes, - nose, pandas, - pytestCheckHook, pyyaml, scikit-learn, tensorflow, + tf-keras, tqdm, + + # tests + nose, + pytestCheckHook, }: buildPythonPackage rec { pname = "mhcflurry"; - version = "2.1.1"; + version = "2.1.3"; pyproject = true; src = fetchFromGitHub { owner = "openvax"; repo = "mhcflurry"; rev = "refs/tags/v${version}"; - hash = "sha256-absIKvcFo6I1Uu0t+l8OLOU/AQ4kD295P4+KVwMAWMc="; + hash = "sha256-Xz3Myd+pifNQMTH1BC2qsQEy7UorYNQNj+7ysMVmCOs="; }; # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. @@ -35,6 +40,7 @@ buildPythonPackage rec { pyyaml scikit-learn tensorflow + tf-keras tqdm ]; @@ -88,7 +94,7 @@ buildPythonPackage rec { changelog = "https://github.com/openvax/mhcflurry/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ]; - # ModuleNotFoundError: No module named 'keras.api._v2' as tensorflow is too outdated - broken = true; + # Requires a recent version of tensorflow + broken = lib.versionOlder tensorflow.version "2.15.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix index e7e98b265e..0f86ee5250 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox CoreAudio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix index b65a4ccdcf..2cf9cd45c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.8"; + version = "7.2.9"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-BWzG8qYfTxk59lRAAL78YFCuHku8L2VxCSNpbi8Dr3k="; + hash = "sha256-ObbU0skqNBebkmX5gtJ9/QHlSZFB3tvaFnitmD+lKBc="; }; postPatch = '' @@ -39,9 +39,9 @@ buildPythonPackage rec { --replace-fail "assertEquals" "assertEqual" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ argon2-cffi certifi urllib3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix index a23ef91c8a..04d8a08bf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools which ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix index 16ecf80905..63f2eeb59d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { downloadPage = "https://github.com/coin-or/python-mip/releases"; changelog = "https://github.com/coin-or/python-mip/releases/tag/${version}"; license = licenses.epl20; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ nessdoor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix index bc2ed16940..cbe1442da0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv mitmproxy-macos diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index 2c4d1da6e6..5e01020bb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { urwid wsproto zstandard - ] ++ lib.optionals stdenv.isDarwin [ mitmproxy-macos ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mitmproxy-macos ]; nativeCheckInputs = [ hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix index 738c6cf57f..1e159a90fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.9"; + version = "0.3.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; rev = "refs/tags/v${version}"; - hash = "sha256-dfOufUvDsrBFvnz8/mp7iY9Tm52KoFFuQQnbq85qTGs="; + hash = "sha256-ndT5bAiUpjkgD2oeS0s/u69a4bBHI4zoXbudcWogTAU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix index cbf15d0754..45b009ad92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.34"; + version = "9.5.35"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-Gozh4/c9IvhgTU87RWSshlXOWQ3sdtxLA8SQuD/JSEg="; + hash = "sha256-iiukdgkC2B8xWf8abtiSWjEBiCwk/2+1iJqkV9d43VQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix index 0fd14edd7b..b23ca45032 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix @@ -1,26 +1,29 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies numpy, - pytestCheckHook, + + # tests absl-py, + pytestCheckHook, }: buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jax-ml"; repo = "ml_dtypes"; rev = "refs/tags/v${version}"; - hash = "sha256-3qZ1lS1IdSXNLRNE9tyuO9qauVBDlECZvmmwaOffD30="; + hash = "sha256-+6job9fEHVguh9JBE/NUv+QezwQohuKPO8DlhbaawZ4="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. # Hence, we rely on the bundled eigen library. @@ -29,20 +32,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "numpy~=1.21.2" "numpy" \ - --replace "numpy~=1.23.3" "numpy" \ - --replace "numpy~=1.26.0" "numpy" \ - --replace "numpy==2.0.0rc1" "numpy" \ - --replace "setuptools~=68.1.0" "setuptools" + --replace-fail "numpy~=2.0" "numpy" \ + --replace-fail "setuptools~=73.0.1" "setuptools" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ - pytestCheckHook absl-py + pytestCheckHook ]; preCheck = '' @@ -53,12 +53,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "ml_dtypes" ]; - meta = with lib; { + meta = { description = "Stand-alone implementation of several NumPy dtype extensions used in machine learning libraries"; homepage = "https://github.com/jax-ml/ml_dtypes"; changelog = "https://github.com/jax-ml/ml_dtypes/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage samuela ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix index 89992981ea..7191e048a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "mmengine"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -77,6 +77,14 @@ buildPythonPackage rec { "tests/test_runner/test_activation_checkpointing.py" # missing dependencies "tests/test_visualizer/test_vis_backend.py" + # Tests are outdated (runTest instead of run_test) + "mmengine/testing/_internal" + "tests/test_dist/test_dist.py" + "tests/test_dist/test_utils.py" + "tests/test_hooks/test_sync_buffers_hook.py" + "tests/test_model/test_wrappers/test_model_wrapper.py" + "tests/test_optim/test_optimizer/test_optimizer.py" + "tests/test_optim/test_optimizer/test_optimizer_wrapper.py" ]; disabledTests = [ @@ -106,6 +114,7 @@ buildPythonPackage rec { changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ rxiao ]; - broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); + broken = + stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix index eb5ffb2b24..1df4cc1eef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -74,12 +74,12 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.12") [ aiohttp ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' ${redis-server}/bin/redis-server & REDIS_PID=$! ''; - postCheck = lib.optionalString stdenv.isLinux '' + postCheck = lib.optionalString stdenv.hostPlatform.isLinux '' kill $REDIS_PID ''; @@ -98,7 +98,7 @@ buildPythonPackage rec { "test_no_dangling_fds" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/main/test_redis.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/main/test_redis.py" ]; pythonImportsCheck = [ "mocket" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix index 04655a6137..43459fc5a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "modeled" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Universal data modeling for Python"; homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl-window/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl-window/default.nix index 27fd4ef966..5539d053a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl-window/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl-window/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; inherit (mesa.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monotonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monotonic/default.nix index 8b138a3830..46e8e0f354 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monotonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monotonic/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7"; }; - __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib"; - patchPhase = lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace monotonic.py --replace \ "ctypes.util.find_library('c')" "'${stdenv.cc.libc}/lib/libc.so'" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix index 00a6a7c533..d7e31fa4af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "morecantile"; - version = "5.3.0"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "developmentseed"; repo = "morecantile"; rev = version; - hash = "sha256-F7xYQrOngoRsZjmS6ZHRGN0/GD53AYcMQzyY1LZ1O7I="; + hash = "sha256-kUAde+6IUu95tFHFCB6kWoYsRf9GxR+gRJki/tvhIaY="; }; nativeBuildInputs = [ flit ]; @@ -42,6 +43,11 @@ buildPythonPackage rec { rasterio ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # https://github.com/developmentseed/morecantile/issues/156 + "test_tiles_when_tms_bounds_and_provided_bounds_cross_antimeridian" + ]; + pythonImportsCheck = [ "morecantile" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix index 1d27f9e0db..487de3c322 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/dermotduffy/motioneye-client"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mozart-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mozart-api/default.nix index 25fa7c882b..053b922c14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mozart-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "3.4.1.8.7"; + version = "3.4.1.8.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-RMhc/rFXFGt2GBium3NlPg3TYIMxvpEAb1Hqj1oVqpM="; + hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix index 411b434bba..b7bddc916a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-n0mAMuTRNEN+bCOvKoDFwL7nlv2mboO65nn6fDCITk4="; + hash = "sha256-r8awjj4yo8BXQ0vZiJW+ky1sTvC04FzcViJY725/P6k="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix index 9c262b5221..1a8e6c78c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ivpk3zZFp6xiFAqdDjjdV/7fg2GBR6NyK7+nPWgs1QA="; + hash = "sha256-Vud/MaRmY/xmTJXofF8BHpl3TRxfrxlUdX0xDHKpwIA="; }; build-system = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix index 78e368360a..0940653108 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; # Build failures - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix index de6d7320f1..9c3d5e35e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix @@ -78,8 +78,8 @@ rec { "sha256-/muCi4o6A3bmAvc4w5lSla9ZtE3rMkJoL3LlEjzKoms="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.35.0" - "sha256-C+E2aFhPewVkNm0bIAdX2g19A+UoTIFaPM+cE8Khy3A="; + buildMypyBoto3Package "apigateway" "1.35.25" + "sha256-6jtBmuho1j8GE+6sxqdYYf1XtonWoUu3Vi7tMDkTpa4="; mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.35.0" @@ -142,8 +142,8 @@ rec { "sha256-l5hKmbwel2Z5BvQbuKXRsfusKU28laF5mVDDPW+Ij0g="; mypy-boto3-athena = - buildMypyBoto3Package "athena" "1.35.0" - "sha256-f/q3R4ZvUQ2+r/XXdGT/MFqiilKaCmdRwj7QuCJ1ZJo="; + buildMypyBoto3Package "athena" "1.35.25" + "sha256-XcD23pDz3oaNwME+iqmDQr9Lbz8z7NVduFEiTnxV55c="; mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.35.0" @@ -182,8 +182,8 @@ rec { "sha256-scTtp5URLSljLwCJHu80+bUBL4LNW8zL+rOa9vBmPJE="; mypy-boto3-ce = - buildMypyBoto3Package "ce" "1.35.0" - "sha256-/nhw7TUfQmFmcm94Omgkp6/zAFGlvZIPCb7hKAtMoEI="; + buildMypyBoto3Package "ce" "1.35.22" + "sha256-1MB5ldBGqYDZMkYaEJ0nK+jM5q/TkcN3wllT1X8YnQc="; mypy-boto3-chime = buildMypyBoto3Package "chime" "1.35.0" @@ -266,8 +266,8 @@ rec { "sha256-NXttDVG1iAGoYefRXROKaXiQUnRXxiOcOUad7ZuA2xE="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.35.5" - "sha256-AecAyPT6AQCpezwqoJHCPpORKCdsjCbHBL6i+PKIAis="; + buildMypyBoto3Package "codebuild" "1.35.21" + "sha256-sCIMOBe3VppVALMDc4BV3rK+RYlCbxK80YUKPnckvT8="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.35.0" @@ -430,12 +430,12 @@ rec { "sha256-Fzdqwy9NA+R2ZYNuXcxTv5RlY9X1d609CZHbSQUp3Is="; mypy-boto3-ds = - buildMypyBoto3Package "ds" "1.35.0" - "sha256-B6fR0fPc1vTN+WtsHXyE8gbl87yVd/QdxmmLmtftlxQ="; + buildMypyBoto3Package "ds" "1.35.22" + "sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.35.15" - "sha256-epE4c+VCicXTkuGGJu83lxFTDUBu2ndmy36NARTCy8E="; + buildMypyBoto3Package "dynamodb" "1.35.24" + "sha256-Vb+Jeh0ONUV57bBQAfS8T0crlFK63Z2ySHbDG98/cqE="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.35.0" @@ -446,24 +446,24 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.8" - "sha256-9M2+Uk/0A5ZozBaOPG+caASEgasz37D12JK78kKNHvI="; + buildMypyBoto3Package "ec2" "1.35.25" + "sha256-+dD1Rkw+iYThkoPgjL69njG1PXZJWGx/hlYC34VA9lE="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" "sha256-0Xe77fz+lA+nuUGK+PjU0EgWeQ7AJ9Smsb/4yK1tow0="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.35.17" - "sha256-puWH6dq/wpO0t2PFGeG7hibi0Jru3ELyOmqrjvCxves="; + buildMypyBoto3Package "ecr" "1.35.21" + "sha256-1+jCQIbOOyWeSsKicfw07U7/3pnHiZrH1kwto8/wrNc="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.35.0" "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.2" - "sha256-DELGxyFD0U7IEoEXZebyuFuac94pVxWgU2OPK3aiKgA="; + buildMypyBoto3Package "ecs" "1.35.21" + "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" @@ -506,8 +506,8 @@ rec { "sha256-ARmcy8oINHgph9PqNtQYyBVEVshBuSHDeju2ynNSqQ8="; mypy-boto3-emr-serverless = - buildMypyBoto3Package "emr-serverless" "1.35.0" - "sha256-50WhDh7x/5EPaxeZzNAZrM6FbwvNQlSVpobfSvdBl04="; + buildMypyBoto3Package "emr-serverless" "1.35.25" + "sha256-9aQOr3oGVejk34AInlyoS9//4DBIR0JBbHGumvanOtw="; mypy-boto3-entityresolution = buildMypyBoto3Package "entityresolution" "1.35.3" @@ -574,8 +574,8 @@ rec { "sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.35.18" - "sha256-NwWn0GsbAhUy5JEUO0LJsfP0jwlnSle5L4E87RpDz+U="; + buildMypyBoto3Package "glue" "1.35.25" + "sha256-hWpxnfHPaCUlxFg/3vNhluQnc2IHYoNVq9owH3D2eME="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.35.0" @@ -594,8 +594,8 @@ rec { "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.35.17" - "sha256-OAA5OwjH4oXVV908NXoiXS6M87LwDf1IIrPDTTRzo58="; + buildMypyBoto3Package "guardduty" "1.35.22" + "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ="; mypy-boto3-health = buildMypyBoto3Package "health" "1.35.0" @@ -770,8 +770,8 @@ rec { "sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.35.3" - "sha256-LnjBKnuk0tnJm3X61YgE/ZmCDpVKtVfxTwmdbIWogqs="; + buildMypyBoto3Package "lambda" "1.35.23" + "sha256-I70ebuqU7cWYu+rAWqaUbNNiXdq9JZL/dm8++OiJxao="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.35.0" @@ -862,12 +862,12 @@ rec { "sha256-v+a4wc62OnHXJv5BHy/oq88FRn3piimmenmAPAOZXOA="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.35.18" - "sha256-QyyTcFluG5S6CQFwxahz/a9zj40dqhiqyD+OuUn79/0="; + buildMypyBoto3Package "mediaconvert" "1.35.23" + "sha256-TvkVif/foJUzw1tPg8l2Y81neHUfxeZ9aDKtaIYKyRg="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.35.20" - "sha256-/tGt9kyF1LtOzejqC9F4qStNZa67tXeUf9yxc6UXs6M="; + buildMypyBoto3Package "medialive" "1.35.23" + "sha256-emjiDJ1sZylGgclL3E90nYBwqJgJq20fQx2Ug4e9UbQ="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.35.0" @@ -942,8 +942,8 @@ rec { "sha256-J1tV2BTUW2Bu8ll+Yn0cJpUpMCCCkfqUEAnis/OJxrA="; mypy-boto3-neptune = - buildMypyBoto3Package "neptune" "1.35.0" - "sha256-YCZMfLWkodIcSsbOmzR6GfR+kMFzcbondo9FyzQexBo="; + buildMypyBoto3Package "neptune" "1.35.24" + "sha256-2hgamfnf5SPWo8R15FWJHO37IC0y2oLDTHsb/oPjArE="; mypy-boto3-neptunedata = buildMypyBoto3Package "neptunedata" "1.35.0" @@ -1074,8 +1074,8 @@ rec { "sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.35.9" - "sha256-DDn++YB0SylR31Sv5bBcbghb5aa4b1vjsDMMVJy5gn0="; + buildMypyBoto3Package "quicksight" "1.35.23" + "sha256-ljk8uB17CDpGT9TIAncsrZBGbI9UrPAPU3HQ9Cz2zYE="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.35.0" @@ -1086,8 +1086,8 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.20" - "sha256-sjAaaFf5Lvb2EXbjxBNoBskNLGRIXxddaVZ2zgkImbU="; + buildMypyBoto3Package "rds" "1.35.25" + "sha256-I4lTEWslkWlrayRnTG9wZcSdihSEDd51F37a/zdaMY8="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.0" @@ -1114,8 +1114,8 @@ rec { "sha256-MKlBdSJGl7WCnD66fx5nCPhGAtLtLjoahe08KHTT+KM="; mypy-boto3-resource-explorer-2 = - buildMypyBoto3Package "resource-explorer-2" "1.35.0" - "sha256-SWlnIn6Xn5rhngjMTHQWPyqfzZieE9WN1iCB5WxCsnM="; + buildMypyBoto3Package "resource-explorer-2" "1.35.25" + "sha256-49Ysavsq6tDUQAcJiP4GQkt5zgBz36qufByA88bltco="; mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.35.0" @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.16" - "sha256-WZVn4yfqq+TN0MImwHyshQQx0EgWarpJwqFiAx7EiTQ="; + buildMypyBoto3Package "s3" "1.35.22" + "sha256-n2ThGW/+zCxqt77pXoSGkrX0ZKHfFCETYepru8IDg4c="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.12" @@ -1174,8 +1174,8 @@ rec { "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.35.15" - "sha256-16P85xGM98ExA6Cphg2nTviTLu6CF/Hj3/sZ7P3OkJo="; + buildMypyBoto3Package "sagemaker" "1.35.24" + "sha256-VLhoJLXWsQIWK+N9KC2nNi2VDC5SUeN/FJJJLefWix8="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0" @@ -1194,8 +1194,8 @@ rec { "sha256-ES0cThhoMFB4NKVTzThXATiicjq+MTRunsDCMC6YPbI="; mypy-boto3-sagemaker-metrics = - buildMypyBoto3Package "sagemaker-metrics" "1.35.0" - "sha256-zixUmBhFo3joSB0UUWRjNbbrpgt/21OyfOzDkn2Y7kg="; + buildMypyBoto3Package "sagemaker-metrics" "1.35.24" + "sha256-WBwXrGv877AZv6wIxYGwFNTVofmcmTqv/hqXAcraDyQ="; mypy-boto3-sagemaker-runtime = buildMypyBoto3Package "sagemaker-runtime" "1.35.15" @@ -1294,8 +1294,8 @@ rec { "sha256-YXUvHCvy76OBX2TUPCW0o529vZ5HKuSKoY18bSp6brg="; mypy-boto3-ssm = - buildMypyBoto3Package "ssm" "1.35.0" - "sha256-07yY7lzE2hSaTvIQCU+YWoTE1PenxJnsXGsEHfJ6EJc="; + buildMypyBoto3Package "ssm" "1.35.21" + "sha256-XtVcdQn63aYVVxj+WXKbPasPi3b/HgN6h6v/ndJHX0k="; mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.35.0" @@ -1426,12 +1426,12 @@ rec { "sha256-Om/TFPBZh3xr0inpGzCpvTNij9DTPq8dV1ikX8g4YtE="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.35.8" - "sha256-fZ2uc54mRcpO/66YvK+com7nRPG61ldnM7tPAznUFk8="; + buildMypyBoto3Package "workspaces" "1.35.24" + "sha256-j7eEUDul3+bMWN80+gH+/gFBWqQHVQ2yN+YBx5VFZNM="; mypy-boto3-workspaces-web = - buildMypyBoto3Package "workspaces-web" "1.35.0" - "sha256-+96DquSZ2c+ijrO1ZBo6y4YohHsOQwGPCwvvxGnoO7A="; + buildMypyBoto3Package "workspaces-web" "1.35.23" + "sha256-/uATkqLhOOPKwegWRQOSRGeM2tmq+VbWY3t780IvSek="; mypy-boto3-xray = buildMypyBoto3Package "xray" "1.35.0" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh index 5a6e63dde0..53622b479e 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh @@ -229,7 +229,7 @@ packages=( mypy-boto3-migrationhub-config mypy-boto3-migrationhuborchestrator mypy-boto3-migrationhubstrategy - mypy-boto3-mobile + # mypy-boto3-mobile mypy-boto3-mq mypy-boto3-mturk mypy-boto3-mwaa diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index 97628a5e3e..520919e7fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-dCJ8EfdtA0lPQ7d4hlmxYblPTe3vIwopEkEryMPJ5VM="; + hash = "sha256-lhtABWVwKcqJiSpMde2/CFbFTOr2FyNotGv3Z2wfdwA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/n3fit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/n3fit/default.nix deleted file mode 100644 index 01c5665946..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/n3fit/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - hyperopt, - keras, - nnpdf, - psutil, - tensorflow, - validphys2, -}: - -buildPythonPackage rec { - pname = "n3fit"; - version = "4.0"; - format = "setuptools"; - - inherit (nnpdf) src; - - prePatch = '' - cd n3fit - ''; - - postPatch = '' - substituteInPlace src/n3fit/version.py \ - --replace '= __give_git()' '= "'$version'"' - ''; - - propagatedBuildInputs = [ - hyperopt - keras - psutil - tensorflow - validphys2 - ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")" - done - ''; - - doCheck = false; # no tests - pythonImportsCheck = [ "n3fit" ]; - - meta = with lib; { - description = "NNPDF fitting framework"; - homepage = "https://docs.nnpdf.science"; - inherit (nnpdf.meta) license; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanoemoji/default.nix similarity index 61% rename from third_party/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/nanoemoji/default.nix index 88b1cad122..9d2dfffcaf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nanoemoji/default.nix @@ -1,19 +1,38 @@ -{ lib -, python3 -, fetchFromGitHub -, resvg -, pngquant +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pytestCheckHook, + setuptools, + setuptools-scm, + resvg, + pngquant, + absl-py, + fonttools, + lxml, + ninja, + picosvg, + pillow, + regex, + toml, + tomlkit, + ufo2ft, + ufolib2, + zopfli, }: -python3.pkgs.buildPythonApplication rec { + +buildPythonPackage rec { pname = "nanoemoji"; version = "0.15.1"; + pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; - repo = pname; - rev = "v${version}"; + repo = "nanoemoji"; + rev = "refs/tags/v${version}"; hash = "sha256-P/lT0PnjTdYzyttICzszu4OL5kj+X8GHZ8doL3tpXQM="; }; + patches = [ # this is necessary because the tests clear PATH/PYTHONPATH otherwise ./test-pythonpath.patch @@ -21,17 +40,23 @@ python3.pkgs.buildPythonApplication rec { ./fix-test.patch ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = [ + setuptools setuptools-scm + ]; + nativeBuildInputs = [ pngquant resvg ]; # these two packages are just prebuilt wheels containing the respective binaries - pythonRemoveDeps = [ "pngquant-cli" "resvg-cli" ]; + pythonRemoveDeps = [ + "pngquant-cli" + "resvg-cli" + ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = [ absl-py fonttools lxml @@ -46,15 +71,19 @@ python3.pkgs.buildPythonApplication rec { zopfli ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = [ pytestCheckHook - ninja picosvg ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ pngquant resvg ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + pngquant + resvg + ] + }" ]; preCheck = '' @@ -65,6 +94,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Wee tool to build color fonts"; homepage = "https://github.com/googlefonts/nanoemoji"; + changelog = "https://github.com/googlefonts/nanoemoji/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ _999eagle ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/fix-test.patch b/third_party/nixpkgs/pkgs/development/python-modules/nanoemoji/fix-test.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/nanoemoji/fix-test.patch rename to third_party/nixpkgs/pkgs/development/python-modules/nanoemoji/fix-test.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/test-pythonpath.patch b/third_party/nixpkgs/pkgs/development/python-modules/nanoemoji/test-pythonpath.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/nanoemoji/test-pythonpath.patch rename to third_party/nixpkgs/pkgs/development/python-modules/nanoemoji/test-pythonpath.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index e96ba513b1..4a28fc2c57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { "test_ordered_consumer_larger_streams" "test_object_file_basics" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_subscribe_iterate_next_msg" "test_buf_size_force_flush_timeout" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix index 9263ed7b04..f3b766f086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.29"; + version = "2.3.31"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N5oO77DiLMzybQiE45mIIfu5DoT3/nR0iejB/SPpWLQ="; + hash = "sha256-a0BOBwzlZ1HFvpamqQHn8rtgghdkTfr9778wW84q7Xo="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix index 55ec525d44..d3eb0a25ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { mkdir $out/include cp python/ndtypes/*.h $out/include '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix index 9ca4600148..04ab642d75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.9.1"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-hB5ySup7vd01VPyRuNT5d3FufuMvbHF8x5ULOzR1TWY="; + hash = "sha256-VhX0KDlGf0J6fiO1RzOoqJ4WMDM8Bb2+lYYMlgQ9nkc="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nh3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nh3/default.nix index 1699b18c18..f438525e51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nh3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nh3/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix index 9319ba10cd..946d129e95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nice-go"; - version = "0.3.8"; + version = "0.3.9"; pyproject = true; src = fetchFromGitHub { owner = "IceBotYT"; repo = "nice-go"; rev = "refs/tags/${version}"; - hash = "sha256-d035AA8N2yjkUJh2TBqkp2RLvH89cJXC4mFrny1sJ6k="; + hash = "sha256-Gb6VDHADtqmVXMPwic0NokWm5GmhTpy7g+o/rYxrBZk="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix index da8452a437..6169a0f69d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -93,7 +93,7 @@ buildPythonPackage rec { ]; # checks on darwin inspect memory which doesn't work in build environment - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display and not test_no_et_multiproc' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix index 6cc35b662c..35b8eb4c46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; # tests hang indefinitely + doCheck = !stdenv.hostPlatform.isDarwin; # tests hang indefinitely pythonImportsCheck = [ "nitime" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nodriver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nodriver/default.nix index b91737a2d7..9a19815af9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nodriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nodriver/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, pythonOlder, deprecated, mss, @@ -9,16 +9,14 @@ setuptools, }: -buildPythonPackage { +buildPythonPackage rec { pname = "nodriver"; version = "0.37"; pyproject = true; - src = fetchFromGitHub { - owner = "ultrafunkamsterdam"; - repo = "nodriver"; - rev = "1bb6003c7f0db4d3ec05fdf3fc8c8e0804260103"; - hash = "sha256-8q+9RX9ugrT6/fjlTSIecVcR6lPdZwg7nF+cSTSLlEc="; + src = fetchPypi { + inherit pname version; + hash = "sha256-FF/E0hNZvo26Urtgw+nBH5Rmk7UCaqAsckCLDMuCK0A="; }; disabled = pythonOlder "3.9"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix index 237329f8ed..34dd918982 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-4CT5WBpWoK7c8bS7hw0F5mL8MDg8ud+f3SITC5lEVFM="; + hash = "sha256-7LzReT1iuCbZYNJWjDriMaCljLzpyKWfCX6HjTt18ls="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix index 38f4ff5af1..cc46dbe77f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }; patches = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # hardcode paths to aplay and notify-send (substituteAll { src = ./linux-paths.patch; @@ -39,7 +39,7 @@ buildPythonPackage rec { notifysend = "${libnotify}/bin/notify-send"; }) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # hardcode path to which (substituteAll { src = ./darwin-paths.patch; @@ -53,19 +53,19 @@ buildPythonPackage rec { pythonRelaxDeps = [ "loguru" ]; - propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.isLinux [ jeepney ]; + propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney ]; - nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ dbus ]; + nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus ]; checkPhase = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' # Tests search for "afplay" binary which is built in to macOS and not available in nixpkgs mkdir $TMP/bin ln -s ${coreutils}/bin/true $TMP/bin/afplay PATH="$TMP/bin:$PATH" pytest '' - else if stdenv.isLinux then + else if stdenv.hostPlatform.isLinux then '' dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notobuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notobuilder/default.nix new file mode 100644 index 0000000000..0dce59c8d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/notobuilder/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unstableGitUpdater, + setuptools, + setuptools-scm, + fonttools, + ufomerge, + fontmake, + glyphslib, + ttfautohint-py, + ufo2ft, + gftools, + fontbakery, + diffenator2, + chevron, + sh, + ninja, +}: + +buildPythonPackage { + pname = "notobuilder"; + version = "0-unstable-2024-08-03"; + pyproject = true; + + src = fetchFromGitHub { + owner = "notofonts"; + repo = "notobuilder"; + rev = "d7bcfc8e5c5ee9b273e7b1eeb2dd6d619da68c33"; + hash = "sha256-1tdHbJixd1s1grGh0enqXhp+u5TEic6/W88X/f8vagM="; + }; + + postPatch = '' + substituteInPlace Lib/notobuilder/__main__.py \ + --replace-fail '"ninja"' '"${lib.getExe ninja}"' + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + ufomerge + fontmake + glyphslib + ttfautohint-py + ufo2ft + gftools + fontbakery + diffenator2 + chevron + sh + ] ++ gftools.optional-dependencies.qa; + + pythonImportsCheck = [ + "notobuilder" + "notoqa" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Python module for building Noto fonts"; + homepage = "https://github.com/notofonts/notobuilder"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index 10f622b377..18bd264c5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { "dldir = [ '${addDriverRunpath.driverLink}/lib', " ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; build-system = [ setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.nix index ade66d14b8..2bd7a44903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.nix @@ -105,7 +105,7 @@ buildPythonPackage rec { meson-python pkg-config ] - ++ lib.optionals (stdenv.isDarwin) [ xcbuild.xcrun ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; buildInputs = [ @@ -155,13 +155,13 @@ buildPythonPackage rec { # https://github.com/numpy/numpy/issues/24548 disabledTests = - lib.optionals stdenv.isi686 [ + lib.optionals stdenv.hostPlatform.isi686 [ "test_new_policy" # AssertionError: assert False "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 ] - ++ lib.optionals stdenv.isAarch32 [ + ++ lib.optionals stdenv.hostPlatform.isAarch32 [ "test_impossible_feature_enable" # AssertionError: Failed to generate error "test_features" # AssertionError: Failure Detection "test_new_policy" # AssertionError: assert False @@ -173,10 +173,10 @@ buildPythonPackage rec { "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... "test_multinomial_pvals_float32" # Failed: DID NOT RAISE ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_big_arrays" # OOM on a 16G machine ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # can fail on virtualized machines confused over their cpu identity "test_dispatcher" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/2.nix index 5b71602d72..e8f6d36b73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/2.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { meson-python pkg-config ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; # we default openblas to build with 64 threads @@ -144,7 +144,7 @@ buildPythonPackage rec { # https://github.com/numpy/numpy/issues/26713 "test_iter_refcount" ] - ++ lib.optionals stdenv.isAarch32 [ + ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # https://github.com/numpy/numpy/issues/24548 "test_impossible_feature_enable" # AssertionError: Failed to generate error "test_features" # AssertionError: Failure Detection @@ -157,7 +157,7 @@ buildPythonPackage rec { "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... "test_multinomial_pvals_float32" # Failed: DID NOT RAISE ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh') "test_loss_of_precision" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix index dd5aca045f..a1aed20a52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -14,23 +13,31 @@ numpy, tqdm, - # checks + # tests + # Our current version of tensorflow (2.13.0) is too old and doesn't support python>=3.12 + # We remove optional test dependencies that require tensorflow and skip the corresponding tests to + # avoid introducing a useless incompatibility with python 3.12: + # dm-haiku, + # flax, + # tensorflow-probability, funsor, + graphviz, + optax, + pyro-api, pytestCheckHook, -# TODO: uncomment when tensorflow-probability gets fixed. -# , tensorflow-probability + scikit-learn, }: buildPythonPackage rec { pname = "numpyro"; - version = "0.15.2"; + version = "0.15.3"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit version pname; - hash = "sha256-6G3TrDyQ5N2uuzLzzEus1czCtvg3M0wBorLo2vQZozE="; + src = fetchFromGitHub { + owner = "pyro-ppl"; + repo = "numpyro"; + rev = "refs/tags/${version}"; + hash = "sha256-g+ep221hhLbCjQasKpiEAXkygI5A3Hglqo1tV8lv5eg="; }; build-system = [ setuptools ]; @@ -44,9 +51,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + # dm-haiku + # flax funsor + graphviz + optax + pyro-api pytestCheckHook - # TODO: uncomment when tensorflow-probability gets fixed. + scikit-learn # tensorflow-probability ]; @@ -63,17 +75,50 @@ buildPythonPackage rec { "test_kl_dirichlet_dirichlet" "test_kl_univariate" "test_mean_var" + # Tests want to download data "data_load" "test_jsb_chorales" + # RuntimeWarning: overflow encountered in cast "test_zero_inflated_logits_probs_agree" + # NameError: unbound axis name: _provenance "test_model_transformation" + + # require dm-haiku + "test_flax_state_dropout_smoke" + "test_flax_module" + "test_random_module_mcmc" + + # require flax + "test_haiku_state_dropout_smoke" + "test_haiku_module" + "test_random_module_mcmc" + + # require tensorflow-probability + "test_modified_bessel_first_kind_vect" + "test_diag_spectral_density_periodic" + "test_kernel_approx_periodic" + "test_modified_bessel_first_kind_one_dim" + "test_modified_bessel_first_kind_vect" + "test_periodic_gp_one_dim_model" + "test_no_tracer_leak_at_lazy_property_sample" + + # flaky on darwin + # TODO: uncomment at next release (0.15.4) as it has been fixed: + # https://github.com/pyro-ppl/numpyro/pull/1863 + "test_change_point_x64" ]; - # TODO: remove when tensorflow-probability gets fixed. - disabledTestPaths = [ "test/test_distributions.py" ]; + disabledTestPaths = [ + # require jaxns (unpackaged) + "test/contrib/test_nested_sampling.py" + + # requires tensorflow-probability + "test/contrib/test_tfp.py" + "test/test_distributions.py" + ]; meta = { description = "Library for probabilistic programming with NumPy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nutils-poly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nutils-poly/default.nix index 3acda2fe55..e15b2fcd2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nutils-poly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nutils-poly/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; build-system = [ rustPlatform.maturinBuildHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/okonomiyaki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/okonomiyaki/default.nix index 816b93c833..d8b909b9a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/okonomiyaki/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \ --replace 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \ --replace 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' ''; diff --git a/third_party/nixpkgs/pkgs/by-name/om/omniorbpy/package.nix b/third_party/nixpkgs/pkgs/development/python-modules/omniorbpy/default.nix similarity index 52% rename from third_party/nixpkgs/pkgs/by-name/om/omniorbpy/package.nix rename to third_party/nixpkgs/pkgs/development/python-modules/omniorbpy/default.nix index a288dc34c6..c541ddd2ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/om/omniorbpy/package.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omniorbpy/default.nix @@ -1,54 +1,58 @@ { lib, - stdenv, + buildPythonPackage, fetchurl, omniorb, pkg-config, - python3, + python, }: -stdenv.mkDerivation (finalAttrs: { +buildPythonPackage rec { pname = "omniorbpy"; version = "4.3.2"; + pyproject = false; src = fetchurl { - url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${finalAttrs.version}.tar.bz2"; + url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${version}.tar.bz2"; hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs="; }; - nativeBuildInputs = [ - pkg-config + outputs = [ + "out" + "dev" ]; - propagatedBuildInputs = [ - omniorb - ]; + nativeBuildInputs = [ pkg-config ]; + + propagatedBuildInputs = [ omniorb ]; configureFlags = [ "--with-omniorb=${omniorb}" "PYTHON_PREFIX=$out" - "PYTHON=${lib.getExe python3}" + "PYTHON=${python.interpreter}" ]; # Transform omniidl_be into a PEP420 namespace postInstall = '' - rm $out/${python3.sitePackages}/omniidl_be/__init__.py - rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc + rm $out/${python.sitePackages}/omniidl_be/__init__.py + rm $out/${python.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc ''; # Ensure both python & cxx backends are available - doInstallCheck = true; - postInstallCheck = '' - export PYTHONPATH=$out/${python3.sitePackages}:${omniorb}/${python3.sitePackages}:$PYTHONPATH - ${lib.getExe python3} -c "import omniidl_be.cxx; import omniidl_be.python" - ''; - + pythonImportsCheck = [ + "omniidl_be.cxx" + "omniidl_be.python" + "omniORB" + ]; meta = with lib; { description = "Python backend for omniorb"; homepage = "http://omniorb.sourceforge.net"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; + license = with licenses; [ + gpl2Plus + lgpl21Plus + ]; maintainers = with maintainers; [ nim65s ]; platforms = platforms.unix; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onecache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onecache/default.nix index 03a8520bbf..fb1aa5c654 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onecache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onecache/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest-asyncio ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # test fails due to unknown reason on darwin "test_lru_and_ttl_refresh" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index a0cc441e2e..f8bdd75368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -123,7 +123,7 @@ buildPythonPackage rec { "test_vgg19_cpu" "test_zfnet512_cpu" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # AssertionError: Output 0 of test 0 in folder "test__pytorch_converted_Conv2d_depthwise_padded" "test__pytorch_converted_Conv2d_dilated" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix index c0227ee831..48c342c162 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { chmod +w dist ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; # This project requires fairly large dependencies such as sympy which we really don't always need. pythonRemoveDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix index dc3bf4d785..a315c3d0d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { # fails due to type errors "test_num_shards" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "test_training" "test_training_coca" "test_training_unfreezing_vit" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index 5583f0a426..e879bec838 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.46.0"; + version = "1.47.1"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-f8t/6T7IwWgt3WjMMdx04dunR7i4j6FBDN/abuGlEU0="; + hash = "sha256-8zH9G28Z4CpbqQxGkPnKiD4DxasuDuK1t4jr9PpPv3I="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix index bd5b97ab28..bfaa8b8f1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { [ "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reconstruction_incremental" "test_reconstruction_triangulation" ]; @@ -121,7 +121,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "opensfm" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ lib.maintainers.SomeoneSerge ]; license = lib.licenses.bsd2; changelog = "https://github.com/mapillary/OpenSfM/blob/${src.rev}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix index be333be876..c5bbc68e3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix @@ -39,7 +39,7 @@ buildPythonPackage { '' stestr run -e <(echo " '' - + lib.optionalString stdenv.isAarch64 '' + + lib.optionalString stdenv.hostPlatform.isAarch64 '' openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix index 6fc86512d4..fdaa41d289 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -7,7 +7,6 @@ hatchling, importlib-metadata, opentelemetry-test-utils, - setuptools, pytestCheckHook, writeScript, }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 9cf347c046..26bde1eaae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # RuntimeError: Failed to bind to address "TestOpenTelemetryServerInterceptorUnix" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix index cfa6e62495..9e4b577a60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -6,7 +6,6 @@ opentelemetry-api, opentelemetry-semantic-conventions, opentelemetry-test-utils, - setuptools, typing-extensions, pytestCheckHook, }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentype-feature-freezer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentype-feature-freezer/default.nix new file mode 100644 index 0000000000..3d7d953dce --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentype-feature-freezer/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unstableGitUpdater, + pytestCheckHook, + fonttools, + poetry-core, + configparser, + biplist, +}: + +buildPythonPackage { + pname = "opentype-feature-freezer"; + version = "0-unstable-2022-07-09"; + pyproject = true; + + src = fetchFromGitHub { + owner = "twardoch"; + repo = "fonttools-opentype-feature-freezer"; + rev = "2ae16853bc724c3e377726f81d9fc661d3445827"; + hash = "sha256-mIWQF9LTVKxIkwHLCTVK1cOuiaduJyX8pyBZ/0RKIVE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail poetry.masonry.api poetry.core.masonry.api \ + --replace-fail "poetry>=" "poetry-core>=" + ''; + + build-system = [ + poetry-core + configparser + ]; + + dependencies = [ fonttools ]; + + nativeCheckInputs = [ + pytestCheckHook + biplist + ]; + + disabledTestPaths = [ + # Wants to check path outside of nix store + "src/opentype_feature_freezer/cli.py" + # NameError: name 'defines' is not defined + "app/dmgbuild_settings.py" + # Missing module + "app/OTFeatureFreezer.py" + # AttributeError: 'types.SimpleNamespace' object has no attribute 'suffix' + "tests/test_rename.py" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Permanently \"apply\" OpenType features to fonts, by remapping their Unicode assignments"; + homepage = "https://github.com/twardoch/fonttools-opentype-feature-freezer"; + license = lib.licenses.asl20; + mainProgram = "pyftfeatfreeze"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix index f281bc352d..7315865b75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix @@ -60,7 +60,8 @@ buildPythonPackage rec { hash = "sha256-akwLIB5YUbnDiaQXX/K5YLXzWlTYWZG51dtxbSFxPt0="; }; - stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = + if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; outputs = [ "out" ] ++ lib.optional withDocs "doc"; @@ -92,7 +93,7 @@ buildPythonPackage rec { (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) (lib.cmakeBool "PXR_BUILD_USD_TOOLS" withTools) (lib.cmakeBool "PXR_ENABLE_MATERIALX_SUPPORT" true) - (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin && withOsl)) + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.hostPlatform.isDarwin && withOsl)) ]; nativeBuildInputs = @@ -124,15 +125,15 @@ buildPythonPackage rec { ptex tbb ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXt ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) ++ lib.optionals withOsl [ osl ] ++ lib.optionals withUsdView [ qt6.qtbase ] - ++ lib.optionals (withUsdView && stdenv.isLinux) [ + ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtbase qt6.qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix index 523e4f857a..3db1f35784 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -94,6 +94,6 @@ buildPythonPackage rec { license = [ lib.licenses.gpl3 ]; maintainers = [ lib.maintainers.lucasew ]; # Segmentation fault during tests - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix index 50a1e95691..28c97fdb42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyqtgraph pyqtwebengine typing-extensions - ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ]; pythonImportsCheck = [ "orangewidget" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orbax-checkpoint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orbax-checkpoint/default.nix index ccf370682b..511542d0a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { "orbax.checkpoint" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Probably failing because of a filesystem impurity # self.assertFalse(os.path.exists(dst_dir)) # AssertionError: True is not false diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix index 650d8a634d..9fd8fe941a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { maturinBuildHook ]); - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osc-placement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osc-placement/default.nix new file mode 100644 index 0000000000..8165e098dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/osc-placement/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-serialization, + oslo-utils, + oslotest, + pbr, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "osc-placement"; + version = "4.5.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "osc-placement"; + rev = "refs/tags/${version}"; + hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + keystoneauth1 + osc-lib + oslo-utils + pbr + ]; + + nativeCheckInputs = [ + oslo-serialization + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "osc_placement" ]; + + meta = { + homepage = "https://opendev.org/openstack/osc-placement"; + description = "OpenStackClient plugin for the Placement service"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix index f794b91fb0..bb16aa7d40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { preCheck = "HOME=$TOP/tmp"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/openSUSE/osc"; description = "opensuse-commander with svn like handling"; mainProgram = "osc"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix index fe80b0ac42..ef90df289a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "oscrypto" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Tests require network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index b6cdf96619..81a9bd5b8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { oslo-utils pbr python-dateutil - ] ++ lib.optionals stdenv.isLinux [ pyinotify ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pyinotify ]; nativeCheckInputs = [ eventlet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix index e18bc804cf..ad9bb84c74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "21.4.4"; format = "setuptools"; - disabled = pythonOlder "3.7" || stdenv.isDarwin; + disabled = pythonOlder "3.7" || stdenv.hostPlatform.isDarwin; src = fetchFromGitHub { owner = "greenbone"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix index 118e59dc82..0af996f622 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "osxphotos"; - version = "0.68.5"; + version = "0.68.6"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; rev = "refs/tags/v${version}"; - hash = "sha256-JhtbbtiCxIGurRAFvk7UP9qzyXw1CCaGlyLHGs/G/uE="; + hash = "sha256-5cKxlfm4i743bJlS2HVPBO1Fbvz1c6wgkkG8Vle8Ajo="; }; build-system = [ setuptools ]; @@ -107,6 +107,6 @@ buildPythonPackage rec { changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/overly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/overly/default.nix index f234c91086..ea3b291700 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/overly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/overly/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/theelous3/overly"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; # https://github.com/theelous3/overly/issues/2 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/theelous3/overly/issues/2 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix index 2388807940..8263ae8ec8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix @@ -76,7 +76,7 @@ buildPythonPackage { ) ); - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/1.nix index 8358210276..437f7899fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/1.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { six ] ++ lib.optionals (!isPy3k) [ mock ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix index 437aa9884b..890cf28a74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix @@ -37,7 +37,7 @@ in buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paintcompiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paintcompiler/default.nix new file mode 100644 index 0000000000..c2e6009fa4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/paintcompiler/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + fonttools, + black, +}: + +buildPythonPackage rec { + pname = "paintcompiler"; + version = "0.3.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simoncozens"; + repo = "paintcompiler"; + rev = "v${version}"; + hash = "sha256-dmVBQUUyFc71zq8fXBQ4ii/llrGdtUCOponCzSeut6g="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fonttools + black + ]; + + pythonImportsCheck = [ + "paintcompiler" + "paintdecompiler" + ]; + + meta = { + description = "Paint compiler for COLRv1 fonts"; + homepage = "https://github.com/simoncozens/paintcompiler"; + license = lib.licenses.asl20; + mainProgram = "paintcompiler"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix index 62cefd16c3..f216673fc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix @@ -89,10 +89,10 @@ buildPythonPackage rec { "test_timedelta_cmp" "test_timestamp_cmp" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy' ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Disable tests for types that are not supported on aarch64 in `numpy` < 2.0 "test_astype_float" # `f16` and `float128` "test_astype_complex" # `c32` and `complex256` diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 3323c5c9a8..83103314bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -184,11 +184,11 @@ let pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies) - ++ lib.optionals (stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ # for locale executable glibc ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # for locale executable adv_cmds ]; @@ -213,13 +213,13 @@ let # AssertionError: Did not see expected warning of class 'FutureWarning' "test_parsing_tzlocal_deprecated" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1} "test_binops" # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. "test_rolling" ] - ++ lib.optional stdenv.is32bit [ + ++ lib.optional stdenv.hostPlatform.is32bit [ # https://github.com/pandas-dev/pandas/issues/37398 "test_rolling_var_numerical_issues" ]; @@ -234,7 +234,7 @@ let '' # TODO: Get locale and clipboard support working on darwin. # Until then we disable the tests. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy echo "#!${runtimeShell}" > pbcopy echo "#!${runtimeShell}" > pbpaste @@ -246,7 +246,7 @@ let meta = with lib; { # pandas devs no longer test i686, it's commonly broken - # broken = stdenv.isi686; + # broken = stdenv.hostPlatform.isi686; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; description = "Powerful data structures for data analysis, time series, and statistics"; downloadPage = "https://github.com/pandas-dev/pandas"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix index 2a5352b9d0..3c310b72b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { # pytest 8 compat "test_read_with_valid_file_extension" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # might fail due to the sandbox "test_end2end_autosave_slow_notebook" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix index 06c4f97cde..f7f36edfb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -100,7 +100,7 @@ buildPythonPackage rec { "test_valid_dblp_key" "test_validate_arxivid" "test_yaml" - ] ++ lib.optionals stdenv.isDarwin [ "test_default_opener" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_default_opener" ]; pythonImportsCheck = [ "papis" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix index feaef66da2..fa0ae199bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { "test_unzip_file" "test_zip" "test_zip_file" - ] ++ lib.optionals stdenv.isDarwin [ "test_ar" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ]; meta = with lib; { description = "portable archive file manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix index af91594808..12d347227a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix @@ -49,7 +49,7 @@ buildPythonPackage { python-docx ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # on linux the icon file can only be xbm format convert $out/${python.sitePackages}/pdf2docx/gui/icon.ico \ $out/${python.sitePackages}/pdf2docx/gui/icon.xbm diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix index 3a653ec5f4..9e74fa5191 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "pdoc_pyo3_sample_library" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix index 827e45f125..ea618df329 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "pebble" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pendulum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pendulum/default.nix index 627769ff18..bd74e66c69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pendulum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pendulum/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ iconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; propagatedBuildInputs = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/benchmarks" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime' "tests/testing/test_time_travel.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix index 78cd6bdaf9..e713588573 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix index 1e03c7734d..9bb487e856 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix @@ -117,7 +117,7 @@ buildPythonPackage rec { # ImportError: cannot import name 'pytest_plugins' from 'pettingzoo.classic' "test_chess" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Crashes on darwin: `Fatal Python error: Aborted` "test_multi_episode_parallel_env_wrapper" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix index 38bbed27ee..ce812bcdf2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { disabledTests = [ # requires running postgres "test_application_name_in_env" - ] ++ lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_name_db_uri" ]; meta = with lib; { description = "Command-line interface for PostgreSQL"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix index 2e938d5115..f147b22ad9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # a few tests are failing on aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Tool to simplify SVGs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix index d512839a79..5c8488b9f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix @@ -90,12 +90,12 @@ buildPythonPackage rec { # Time based "test_decode_threads" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/bigcat88/pillow_heif/issues/89 # not reproducible in nixpkgs "test_opencv_crash" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265 "test_open_heif_compare_non_standard_modes_data" "test_open_save_disable_16bit" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index e913a10b4f..2d3551d171 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -44,7 +44,8 @@ import ../pillow/generic.nix ( }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; homepage = "https://python-pillow.github.io/pillow-perf/"; description = "Friendly PIL fork - SIMD version"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix index 36fe5b0421..1ecaea6b20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "test_basic" "test_custom_metadata" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable darwin tests which require executables: `iconutil` and `screencapture` "test_grab" "test_grabclipboard" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix index 3e7f183662..67e1f109c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Pandas support for pint"; license = lib.licenses.bsd3; homepage = "https://github.com/hgrecco/pint-pandas"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 10f83a4203..9d44c2e383 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tomli-w ]; - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix index 811aa8ce82..e27e2a33ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix @@ -12,6 +12,7 @@ setuptools, setuptools-scm, playwright-driver, + nixosTests, nodejs, }: @@ -73,7 +74,7 @@ buildPythonPackage rec { git setuptools-scm setuptools - ] ++ lib.optionals stdenv.isLinux [ auditwheel ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ]; pythonRelaxDeps = [ "pyee" ]; @@ -93,10 +94,14 @@ buildPythonPackage rec { passthru = { inherit driver; - tests = { - driver = playwright-driver; - browsers = playwright-driver.browsers; - }; + tests = + { + driver = playwright-driver; + browsers = playwright-driver.browsers; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit (nixosTests) playwright-python; + }; updateScript = ./update.sh; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwright/update.sh b/third_party/nixpkgs/pkgs/development/python-modules/playwright/update.sh index eb04e619fe..2b283d3b60 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwright/update.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwright/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps +#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip set -euo pipefail root="$(dirname "$(readlink -f "$0")")" @@ -11,18 +11,60 @@ version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.c setup_py_url="https://github.com/microsoft/playwright-python/raw/v${version}/setup.py" driver_version=$(curl -Ls "$setup_py_url" | grep '^driver_version =' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') +# TODO: skip if update-source-version reported the same version update-source-version playwright-driver "$driver_version" update-source-version python3Packages.playwright "$version" -# Update package-lock.json files for all npm deps that are built in playwright -# TODO: skip if update-source-version reported the same version -driver_file="$root/../../web/playwright/driver.nix" +playwright_dir="$root/../../web/playwright" +driver_file="$playwright_dir/driver.nix" repo_url_prefix="https://github.com/microsoft/playwright/raw" -temp_dir=$(mktemp -d) +temp_dir=$(mktemp -d) trap 'rm -rf "$temp_dir"' EXIT + +# update binaries of browsers, used by playwright. +replace_sha() { + sed -i "s|$2 = \".\{44,52\}\"|$2 = \"$3\"|" "$1" +} + +prefetch_browser() { + nix store prefetch-file --json --hash-type sha256 --unpack "$1" | jq -r .hash +} + +update_browser() { + name="$1" + suffix="$2" + arm64_suffix="${3:-$2-arm64}" + revision="$(jq -r ".browsers.$name.revision" "$playwright_dir/browsers.json")" + replace_sha "$playwright_dir/$name.nix" "x86_64-linux" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip")" + replace_sha "$playwright_dir/$name.nix" "aarch64-linux" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$arm64_suffix.zip")" +} + +curl -fsSl \ + "https://raw.githubusercontent.com/microsoft/playwright/v${driver_version}/packages/playwright-core/browsers.json" \ + | jq ' + .comment = "This file is kept up to date via update.sh" + | .browsers |= ( + [.[] + | select(.installByDefault) | del(.installByDefault)] + | map({(.name): . | del(.name)}) + | add + ) + ' > "$playwright_dir/browsers.json" + +# We currently use Chromium from nixpkgs, so we don't need to download it here +# Likewise, darwin can be ignored here atm as we are using an impure install anyway. +update_browser "firefox" "ubuntu-22.04" +update_browser "webkit" "ubuntu-22.04" +update_browser "ffmpeg" "linux" + + +# Update package-lock.json files for all npm deps that are built in playwright + # Function to download `package-lock.json` for a given source path and update hash update_hash() { local source_root_path="$1" @@ -30,7 +72,6 @@ update_hash() { # Formulate download URL local download_url="${repo_url_prefix}/v${driver_version}${source_root_path}/package-lock.json" - # Download package-lock.json to temporary directory curl -fsSL -o "${temp_dir}/package-lock.json" "$download_url" @@ -45,7 +86,6 @@ update_hash() { while IFS= read -r source_root_line; do [[ "$source_root_line" =~ sourceRoot ]] || continue source_root_path=$(echo "$source_root_line" | sed -e 's/^.*"${src.name}\(.*\)";.*$/\1/') - # Extract the current npmDepsHash for this sourceRoot existing_hash=$(grep -A1 "$source_root_line" "$driver_file" | grep 'npmDepsHash' | sed -e 's/^.*npmDepsHash = "\(.*\)";$/\1/') diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index df90729366..b018fdfbd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-CVgcqyg5DDtEJxE/oen5MJP+mV4B+Sq0uopEZTOCfV0="; + hash = "sha256-lMcehjG1Zc9s02MBsRUXZHQjxcrZetOgOSne0nCGVV0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix index 6a77e4a560..f0398ac862 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "plyer" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Plyer is a platform-independent api to use features commonly found on various platforms"; homepage = "https://github.com/kivy/plyer"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix index 7535ae218c..a1eeda11a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { buildInputs = [ rust-jemalloc-sys' ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix index 0895056318..3bce5e7962 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-RjzB7S3qTCl6fo+qZ+mVCsQg6CLUnSwutNse5QPQOHU="; + hash = "sha256-3K0FdqsEjt5cTymgxmt0Ohud/+bsILe9bDclZXJqPV8="; }; pythonRelaxDeps = [ "future" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 6e1f724a35..76bab71771 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { python-hglib pygit2 pyuv - ] ++ lib.optionals (!stdenv.isDarwin) [ i3ipc ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ i3ipc ]; # tests are travis-specific doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix index 53eaa5657e..a2672cc5e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; # darwin seems to hang - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix index 646d2b3435..55058f846d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # Note: this is not likely to ever work on Darwin # https://github.com/pre-commit/pre-commit-hooks/pull/655 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # the tests require a functional git installation which requires a valid HOME # directory. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix index 336042e595..83f57c4a70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython setuptools - ] ++ lib.optionals stdenv.isDarwin [ gcc ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; nativeCheckInputs = [ click diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix index 12df2934bf..91bffd81e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.2.0"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; + hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix deleted file mode 100644 index 25c9715e7e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-openvpn"; - version = "0.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-openvpn"; - rev = "refs/tags/v${version}"; - hash = "sha256-eDBcpuz37crfAFX6oysB4FCkSmVLyfLJ0R2L0cZgjRo="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-network-manager - ]; - - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the OpenVPN protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix deleted file mode 100644 index e32a4b5a1b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-killswitch-network-manager-wireguard, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-wireguard"; - version = "0.4.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-DZXixcm2VwXhbN4buABlkybDgXIg/mbeUVHOpdoj0Kw="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-killswitch-network-manager-wireguard - proton-vpn-network-manager - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the Wireguard protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index fea0d2e304..2103b9c148 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.5.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-hTJE9sUjPMsE9d0fIA/OhoasumtfsWuFwn0aTm10PN4="; + hash = "sha256-fbA3kvhU3l20+7irThiTk/fDe60yR4aWxhE3Ol2K7ow="; }; nativeBuildInputs = [ @@ -54,6 +54,11 @@ buildPythonPackage rec { pytest-asyncio ]; + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + meta = { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix index 7502d2daf3..ee28623610 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix @@ -41,7 +41,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.isDarwin [ "test_tv2_1d" ]; + disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_tv2_1d" ]; meta = with lib; { homepage = "https://github.com/albarji/proxTV"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix index 72c8da5f54..8003780b86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix index 4c0a93d2fa..ee3f390b79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { buildInputs = # workaround for https://github.com/NixOS/nixpkgs/issues/146760 - lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ CoreFoundation ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ CoreFoundation ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; nativeCheckInputs = [ pytestCheckHook ]; # Segfaults on darwin: # https://github.com/giampaolo/psutil/issues/1715 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # In addition to the issues listed above there are some that occure due to # our sandboxing which we can work around by disabling some tests: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix index e74f113f3c..aaaf362eab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix @@ -174,7 +174,7 @@ buildPythonPackage rec { pytestCheckHook postgresql ] - ++ lib.optional (stdenv.isLinux) postgresqlTestHook + ++ lib.optional (stdenv.hostPlatform.isLinux) postgresqlTestHook ++ passthru.optional-dependencies.c ++ passthru.optional-dependencies.pool; @@ -188,7 +188,7 @@ buildPythonPackage rec { '' cd .. '' - + lib.optionalString (stdenv.isLinux) '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' export PSYCOPG_TEST_DSN="host=/build/run/postgresql user=$PGUSER" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix index c8959b948f..aaab94547a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { sphinx-better-theme ]; - buildInputs = [ postgresql ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + buildInputs = [ postgresql ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; sphinxRoot = "doc/src"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix index b8c86c970a..4201bd1540 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; # FATAL: could not create shared memory segment: Operation not permitted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ postgresqlTestHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index d2b48a9830..3103506106 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20240915"; + version = "1.0.2.20240920"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fUo6D2QF1TMpC04Em97V1QDKN4mBq5bJzLbOT5xmZVM="; + hash = "sha256-LZDAepnKR2/BfU/grBE1Aw3wXwt9atAPu3dfh9KZ9tE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index 837c838549..a72a476617 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.51.0"; + version = "6.52.0"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-aEyi4zFj0Q3KNBXjUX5J7nmmPCcnYn5w0mIC02gbGJc="; + hash = "sha256-EYDvhgUOWMj2kahzwkg8L43D42YGo2IHrrmKFhMPOb0="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index 390c651208..6874fd866e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { installShellCompletion --bash extra/bash_completion.d/shellcraft ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/bin" makeWrapper "${debugger}/bin/${debuggerName}" "$out/bin/pwntools-gdb" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix index 24521f5289..72ea11e585 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix index cf73487294..8485fe8c28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # On Darwin sysctl is used to read CPU information. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cpuinfo/cpuinfo.py \ --replace "len(_program_paths('sysctl')) > 0" "True" \ --replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix index b66839c072..b5d8e7f4ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, - setuptools, cython_0, zfs, }: @@ -32,7 +31,7 @@ buildPythonPackage rec { buildInputs = [ zfs ]; # Passing CFLAGS in configureFlags does not work, see https://github.com/truenas/py-libzfs/issues/107 - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace configure \ --replace-fail \ 'CFLAGS="-DCYTHON_FALLTHROUGH"' \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 51915de513..123562c8d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix index 38bdf6c4c1..e9f0efe240 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; # Work around Python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; pythonImportsCheck = [ "pyexiv2" ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Python binding to the library exiv2"; homepage = "https://launchpad.net/py3exiv2"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index b131b1b11b..efbd9d96f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.22.0"; + version = "4.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-hP9MXv3/754ouvPgyOZKzBtEU2BugHUUE/e8biZPLFY="; + hash = "sha256-R/RbkiKkhcZd17hgDJnEpr3OCVMvn744YM+lmzSXKWs="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix index d8a2da0da9..2ed166b9a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.7.2"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-itv5tVM8ff2gNUDGxY4aMKrpJVgfwPB/FWYog+CzJY4="; + hash = "sha256-qggtwz6cSz5mLKLVY0i7gWs09EcOoxlWWQoHZv+TDc8="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for decoding and encoding AIS messages (AIVDM/AIVDO)"; homepage = "https://github.com/M0r13n/pyais"; - changelog = "https://github.com/M0r13n/pyais/blob/${version}/CHANGELOG.txt"; + changelog = "https://github.com/M0r13n/pyais/blob/v${version}/CHANGELOG.txt"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index 3c9b1d3bc2..e22429f071 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -122,7 +122,7 @@ buildPythonPackage rec { # expects arrow-cpp headers to be bundled "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data" @@ -136,7 +136,7 @@ buildPythonPackage rec { # Repr output is printing number instead of enum name so these tests fail "--deselect=pyarrow/tests/test_fs.py::test_get_file_info" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # this test requires local networking "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" ]; @@ -152,7 +152,7 @@ buildPythonPackage rec { mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index bf3fe63b47..3ffed8bd8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -95,7 +95,7 @@ buildPythonPackage rec { # https://github.com/postlund/pyatv/issues/2365 "test_simple_dispatch" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix index 6dab8d700d..750ee618f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix @@ -33,7 +33,7 @@ let # support for C++17 aligned allocations on macOS. # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. stdenv' = - if stdenv.isDarwin && stdenv.isx86_64 then + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then python.stdenv.override (oldStdenv: { buildPlatform = oldStdenv.buildPlatform // { darwinMinVersion = "10.13"; @@ -115,7 +115,7 @@ buildPythonPackage rec { "tests/extra_setuptools/test_setuphelper.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # expects KeyError, gets RuntimeError # https://github.com/pybind/pybind11/issues/4243 "test_cross_module_exception_translator" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybluez/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybluez/default.nix index d3842358db..ca745113c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybluez/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybluez/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/pybluez/pybluez"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars ]; - broken = stdenv.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa + broken = stdenv.hostPlatform.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix index 65f9afc409..631bebd566 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix @@ -30,19 +30,19 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ xclip xvfb-run ]; checkPhase = '' runHook preCheck - ${lib.optionalString stdenv.isLinux "xvfb-run -s '-screen 0 800x600x24'"} pytest tests + ${lib.optionalString stdenv.hostPlatform.isLinux "xvfb-run -s '-screen 0 800x600x24'"} pytest tests runHook postCheck ''; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Cross-platform clipboard utilities supporting both binary and text data"; mainProgram = "pyclip"; homepage = "https://github.com/spyoungtech/pyclip"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycookiecheat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycookiecheat/default.nix index be5d6f82cb..97b7d7d48c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycookiecheat/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "test_load_firefox_cookie_db" "test_no_cookies" "test_warns_for_string_browser" - ] ++ lib.optionals stdenv.isDarwin [ "test_slack_config" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_slack_config" ]; meta = with lib; { description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix index f95b0d7d21..c09682e636 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ anyio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix index 79c1646b10..8a89193a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-hD44XB2/aUmWyoTvAqfzDCg3YDVYj1++rNa64AXPfI0="; }; - buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ cups ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # Wants to connect to CUPS doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index 689e23e3c1..5f9334ebb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { # https://github.com/pycurl/pycurl/issues/836 "test_proxy_tlsauth" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Segmentation fault "cadata_test" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix index 48e8f7188b..77d3395258 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix @@ -47,7 +47,7 @@ let typing-extensions ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix index 8cb99dd980..207e5e5c9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { # https://github.com/fabioz/PyDev.Debugger/issues/269 "test_evaluate_expression" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing_simple" "test_evaluate_exception_trace" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix index e2d86333c1..94822a24d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix @@ -66,11 +66,11 @@ buildPythonPackage { # tries to remove a dicom inside $HOME/.pydicom/data/ and download it again "test_fetch_data_files" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/pydicom/pydicom/issues/1386 "test_array" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky, hard to reproduce failure outside hydra "test_time_check" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix index 163e49e38f..3161bb8aaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.8.0"; + version = "2024.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-svy2bYyXDmN4mZK3VqVjr7GLUgnin09aEoTMKKbPJxk="; + hash = "sha256-8S1Ce4MW/iD8xRloUtKbUhFIN0+nconnklqxBy7xMm0="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix index e8ea8acf0c..7333019c90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2024.5.1"; + version = "2024.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-huzv7f1Aq/n3cD9S4oXqGQogq7VpPpzAUqkOhiB879A="; + hash = "sha256-h4OB4V4O645QAPdtO+OtLWffTuA7xlzIveIl+Cyhg3w="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix index e9b916c888..b4172a8550 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix @@ -6,22 +6,36 @@ scipy, sympy, setuptools, - nose, + pytestCheckHook, cython, + fetchpatch2, }: buildPythonPackage rec { pname = "pydy"; version = "0.7.1"; - pyproject = true; - build-system = [ setuptools ]; src = fetchPypi { inherit pname version; hash = "sha256-aaRinJMGR8v/OVkeSp1hA4+QLOrmDWq50wvA6b/suvk="; }; + build-system = [ setuptools ]; + + patches = [ + # Migrate tests to pytest + (fetchpatch2 { + url = "https://github.com/pydy/pydy/commit/e679638fecf80def25f5ed20f01c49c5d931e4d8.patch?full_index=1"; + hash = "sha256-wJmYkyc5Yh0152OyNL5ZbZJxmpX7C65Hqrms4gm3zt0="; + excludes = [ + ".github/workflows/oldest.yml" + ".github/workflows/tests.yml" + "bin/test" + ]; + }) + ]; + dependencies = [ numpy scipy @@ -29,24 +43,16 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pytestCheckHook cython ]; - checkPhase = '' - runHook preCheck - - nosetests pydy - - runHook postCheck - ''; - pythonImportsCheck = [ "pydy" ]; - meta = with lib; { + meta = { description = "Python tool kit for multi-body dynamics"; homepage = "http://pydy.org"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix index 0ada1b1306..d1fec77647 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix @@ -39,7 +39,8 @@ buildPythonPackage rec { preBuild = let - ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnvName = + if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' # required for the custom _find_library function in setup.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix index 68352b43aa..ed474ac2f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.35"; + version = "0.2.36"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-lwsLP29lQmb7MJYPrOfgspdj4qepx7TirEksMASqrb4="; + hash = "sha256-JezjKbCO75JFHLsDzk3zNMHO6Xpz2xTjecTfrXhgUiA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index ff29175870..0486b2b7f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { --replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \ --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows" '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' # this test fails on darwin due to case-insensitive file system substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix index 7887c9f5f5..c5cf2f3512 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nielstron"; repo = "pyfronius"; - rev = "release-${version}"; + rev = "refs/tags/release-${version}"; hash = "sha256-7GtY/6uuLe7K9T7xMVt2ytpA6MKVWnyEoLtA5dSMiH4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -34,7 +34,9 @@ buildPythonPackage rec { description = "Python module to communicate with Fronius Symo"; homepage = "https://github.com/nielstron/pyfronius"; changelog = "https://github.com/nielstron/pyfronius/releases/tag/release-${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + # https://github.com/nielstron/pyfronius/issues/18 + broken = versionAtLeast aiohttp.version "3.10.1"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix index c4af9f668e..5c9e2432c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # flaky rm test/system_test.py substituteInPlace test/meson.build \ @@ -102,7 +102,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; nativeCheckInputs = [ numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix index f788c969a8..43ce26585f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}+renpy${renpy_version}.tar.gz"; - hash = "sha256-Zib39NyQ1pGVCWPrK5/Tl3dAylUlmKZKxU8pf+OpAdY="; + hash = "sha256-bcTrdXWLTCnZQ/fP5crKIPoqJiyz+o6s0PzRChV7TQE="; }; # force rebuild of headers needed for install diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix index 65315b3243..94efd4227e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; preConfigure = '' ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index 80cd4b04b4..db08e6efe9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-pjVSX/x0EoZp3i9jRgqUydVgljSkh1wKr85RD97sF6w="; }; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix index 2b674559b6..1bd193e0cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-2yuYu02Nd9B3UfzrM0p19hDM5HmvigBf48gu+ZSO0kU="; + hash = "sha256-+L0rF5wy4iL/6nPdLSXwYazxsobH2G3pCATrqYe9B6U="; }; pythonRelaxDeps = [ @@ -71,6 +71,7 @@ buildPythonPackage rec { "test_read_metadata_bad_response" "test_read_metadata_no_remediation_message" "test_read_metadata_remediation_message" + "test_retrieve_secret_incident" "test_sca_client_scan_diff" "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix index c75cf68715..8128de3769 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { # Fixes hanging tests on Darwin __darwinAllowLocalNetworking = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix index 5536490860..11bd26ee95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix @@ -5,7 +5,6 @@ pytestCheckHook, setuptools-scm, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix index 77d2669ee0..8526902333 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; # pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ sikmir ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index 185e7fd5dd..1f4592c7dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { buildInputs = [ cairo glib - ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ]; propagatedBuildInputs = [ pycairo diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix index f8cf0d88cb..cf46658aec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix @@ -130,6 +130,6 @@ buildPythonPackage rec { maintainers = [ ]; # Most tests fail with: # OSError: One or more parameters passed to a function were not valid. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyheck/default.nix index 7b7e520544..fca55ff984 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyheck/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix index 221c1e936f..112d9392d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix @@ -12,7 +12,6 @@ pyflakes, vulture, setuptools, - isort, pylint, pytestCheckHook, }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylance/default.nix index 95e9cc8326..ff66678e66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylance/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { libiconv protobuf ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security @@ -100,7 +100,7 @@ buildPythonPackage rec { cd python/python/tests ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: module 'torch.distributed' has no attribute 'is_initialized' "test_convert_int_tensors" "test_ground_truth" @@ -127,6 +127,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ natsukium ]; # test_indices.py ...sss.Fatal Python error: Fatal Python error: Illegal instructionIllegal instruction # File "/nix/store/wiiccrs0vd1qbh4j6ki9p40xmamsjix3-python3.12-pylance-0.17.0/lib/python3.12/site-packages/lance/indices.py", line 237 in train_ivf - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix index 33f1b807ac..e7b1fa52a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ bcdarwin ]; # x86-linux: test_encode.py::TestEncodeBuffer failures # darwin: numerous test failures, seemingly due to issues setting up test data - broken = (stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 73976a1d60..9076d39d83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -101,7 +101,7 @@ buildPythonPackage rec { # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] "test_functional_relation_extraction" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix index c80f512e74..6f570f8d83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { sed -i "/--cov/d" setup.cfg ''; - disabledTests = lib.optionals stdenv.is32bit [ + disabledTests = lib.optionals stdenv.hostPlatform.is32bit [ # test_compressed_complex is broken on 32-bit platforms # this can be removed on the next version bump # see also https://github.com/pinterest/pymemcache/pull/480 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix index cb23141284..212e8e54dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; preBuild = '' ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index f54a8b7a84..4ee28f0b62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -88,7 +88,7 @@ buildPythonPackage rec { }; # TODO: manually add mupdf rpath until upstream fixes it - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for lib in */*.so $out/${python.sitePackages}/*/*.so; do install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" done @@ -175,7 +175,7 @@ buildPythonPackage rec { # Exclude lint tests "test_flake8" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # darwin does not support OCR right now "test_tesseract" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix index 9206787f49..46af3ed5db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ which ]; propagatedBuildInputs = [ python-dateutil ]; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix index 562e5ab869..99964e420c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.41"; + version = "1.0.42"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; rev = "refs/tags/v${version}"; - hash = "sha256-c80OACBwohlTBGvBZValv+AMOKLd32PrPf/JzqETjDU="; + hash = "sha256-hlGqc4vZ/C98vQwJewK0cfC3zP9xyO0oXXtlyNUDg0Y="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix index ed6b964f0c..6d73c35e5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix @@ -44,11 +44,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev xlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ ApplicationServices @@ -61,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Library to control and monitor input devices"; homepage = "https://github.com/moses-palmer/pynput"; license = licenses.lgpl3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix index 15a0a2dbdb..bb10f18811 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pyusb pyyaml typing-extensions - ] ++ lib.optionals (!stdenv.isLinux) [ hidapi ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ hidapi ]; pythonImportsCheck = [ "pyocd" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index 6ec97843fa..edf4a4bfe7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -27,7 +27,7 @@ let os-specific-buildInputs = - if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; + if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; @@ -92,6 +92,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; # ld: symbol(s) not found for architecture arm64 - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix index a66fcc6463..a4c4b1cbf2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { let ext = stdenv.hostPlatform.extensions.sharedLibrary; in - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Theses lines are patching the name of dynamic libraries # so pyopengl can find them at runtime. substituteInPlace OpenGL/platform/glx.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopengltk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopengltk/default.nix index 2f0440d83d..b50780336e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopengltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopengltk/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; license = lib.licenses.mit; # not supported yet, see: https://github.com/jonwright/pyopengltk/issues/12 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix index b9691b2a28..0d8ae7f649 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { "test_dump_certificate_request" "test_export_text" ] - ++ lib.optionals stdenv.is32bit [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ # https://github.com/pyca/pyopenssl/issues/974 "test_verify_with_time" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index 664054df07..fabca67003 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix @@ -13,6 +13,7 @@ pythonOlder, pytest-httpserver, pytestCheckHook, + setuptools, shapely, werkzeug, isPyPy, @@ -22,18 +23,20 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.7.0"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; - disabled = pythonOlder "3.6" || isPyPy; + disabled = pythonOlder "3.7" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; - repo = pname; + repo = "pyosmium"; rev = "refs/tags/v${version}"; - hash = "sha256-DBFDAKNrD93MRXjoM8dIJQ/HJ9Aj8oMJuPVQxTrKYfI="; + hash = "sha256-HYp1MzXSa0tx0hY0JyMf2bmEvm5YuS2R+o25TsO8J6I="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -47,7 +50,7 @@ buildPythonPackage rec { lz4 ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; preBuild = "cd .."; @@ -58,11 +61,13 @@ buildPythonPackage rec { pytest-httpserver ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Python bindings for libosmium"; homepage = "https://osmcode.org/pyosmium"; changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix index ebdd762b6d..24acecdaf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py '' - + lib.optionalString stdenv.isi686 '' + + lib.optionalString stdenv.hostPlatform.isi686 '' # remove some integers in this test case which overflow on 32bit systems sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ tests/test__ped_ped.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix index 784a5e213c..1b9dc08d67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { disabledTests = [ "test_show_clip" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Password manager pass in Python"; mainProgram = "pypass"; homepage = "https://github.com/aviau/python-pass"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix index d2ee305052..e39adf2566 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_connection_lost" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_connection_lost" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyperscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyperscan/default.nix index fae3060a74..7f2bde698e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyperscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyperscan/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - buildInputs = [ vectorscan ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ vectorscan ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; pythonImportsCheck = [ "pyperscan" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index 2fdd86b3b5..5e1c966735 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -23,7 +23,7 @@ withSerialPort ? false, withTools ? false, pkgsBuildTarget, - dbusSupport ? !stdenv.isDarwin, + dbusSupport ? !stdenv.hostPlatform.isDarwin, }: buildPythonPackage rec { @@ -59,7 +59,7 @@ buildPythonPackage rec { # Due to bug in SIP .whl name generation we have to bump minimal macos sdk upto 11.0 for # aarch64-darwin. This patch can be removed once SIP will fix it in upstream, # see https://github.com/NixOS/nixpkgs/pull/186612#issuecomment-1214635456. - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' minimum-macos-version = "11.0" '' + '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix index 8c5653826d..9f031347d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix @@ -118,7 +118,7 @@ buildPythonPackage rec { setuptools ] # ld: library not found for -lcups - ++ lib.optionals (withPrintSupport && stdenv.isDarwin) [ cups ]; + ++ lib.optionals (withPrintSupport && stdenv.hostPlatform.isDarwin) [ cups ]; passthru = { inherit sip pyqt6-sip; @@ -145,7 +145,7 @@ buildPythonPackage rec { # ++ lib.optional withConnectivity "PyQt6.QtConnectivity" ++ lib.optional withLocation "PyQt6.QtPositioning"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-address-of-temporary"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-address-of-temporary"; meta = with lib; { description = "Python bindings for Qt6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index 6bfa11c30f..629f96d76d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { # https://github.com/pyqtgraph/pyqtgraph/issues/2110 "test_PolyLineROI" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/pyqtgraph/pyqtgraph/issues/2645 "test_rescaleData" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix index 60801a0c96..11d0f847d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -60,7 +60,9 @@ buildPythonPackage ( setuptools ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + autoSignDarwinBinariesHook + ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix index 6e9c6ca53f..84e97f2bf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.14.2"; + version = "4.14.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-9P2AJPr65jNOHsKuF9qYcF/8s8IIIb9WeNUfAwrnlgE="; + hash = "sha256-kGrOvec2q1GoVweu5tTbz8kvnjG6RAfjlF64Uf3RTxw="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix index 12262cdff9..56894f1c4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ readstat diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index 1dc215bf0e..8d9406666f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index 3fd9d3c2fb..4582cc1852 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -13,7 +13,7 @@ let # Package does not support configuring the pcsc library. - withApplePCSC = stdenv.isDarwin; + withApplePCSC = stdenv.hostPlatform.isDarwin; in buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix index 3fb8236f9b..f2c07cd5e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { openssl pcsclite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security libiconv @@ -62,6 +62,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; # Broken since the 0.1.20 update according to ofborg. The errors are not clear... - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix index ba92fdaebd..7e4cff21d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { # KeyError: 'Packet of index 0 does not exist in capture' "test_getting_packet_summary" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on darwin # _pickle.PicklingError: logger cannot be pickled "test_iterate_empty_psml_capture" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index d66ef9a522..2a3ff3c5ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -1,6 +1,5 @@ { python, - pythonAtLeast, fetchurl, lib, stdenv, @@ -35,28 +34,9 @@ stdenv.mkDerivation rec { ./Modify-sendCommand-signatures.patch ]; - postPatch = - (lib.optionalString (pythonAtLeast "3.12") '' - substituteInPlace \ - ez_setup.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/utils.py \ - build_scripts/wheel_override.py \ - build_scripts/wheel_utils.py \ - sources/pyside2/CMakeLists.txt \ - --replace-fail "from distutils" "import setuptools; from distutils" - substituteInPlace \ - build_scripts/config.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/setup_runner.py \ - build_scripts/utils.py \ - --replace-fail "import distutils" "import setuptools; import distutils" - '') - + '' - cd sources/pyside2 - ''; + postPatch = '' + cd sources/pyside2 + ''; cmakeFlags = [ "-DBUILD_TESTS=OFF" @@ -69,8 +49,12 @@ stdenv.mkDerivation rec { cmake ninja qt5.qmake - python - python.pkgs.setuptools + (python.withPackages ( + ps: with ps; [ + distutils + setuptools + ] + )) ]; buildInputs = @@ -113,6 +97,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix index 2dc0078c36..088f4e785a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix @@ -71,24 +71,26 @@ stdenv.mkDerivation (finalAttrs: { 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ 'set (found_basepath 0)' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/PySideHelpers.cmake \ --replace-fail \ "Designer" "" ''; # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds." - env = lib.optionalAttrs stdenv.isDarwin { LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; + }; nativeBuildInputs = [ cmake ninja python pythonImportsCheckHook - ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; buildInputs = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then # qtwebengine fails under darwin # see https://github.com/NixOS/nixpkgs/pull/312987 packages ++ [ python.pkgs.qt6.qtwebengine ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysilero-vad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysilero-vad/default.nix index bee85a4b2b..020677f05e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysilero-vad/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { # what(): /build/source/include/onnxruntime/core/common/logging/logging.h:294 static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() Attempt to use DefaultLogger but none has been registered. - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; description = "Pre-packaged voice activity detector using silero-vad"; homepage = "https://github.com/rhasspy/pysilero-vad"; changelog = "https://github.com/rhasspy/pysilero-vad/blob/${src.rev}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix index febe4a190b..73a2d67ed8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix @@ -12,28 +12,28 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.1.2"; - format = "pyproject"; + version = "0.1.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mtdcr"; - repo = pname; + repo = "pysml"; rev = "refs/tags/${version}"; - hash = "sha256-TLIpc0bVx1As2oLyYD+BBMalwJiKdvBCcrd1tUNyh6Y="; + hash = "sha256-LmybrMHHWsLd6Y2xMqJ8g65SQCsysBGxeL43qouo3SM="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout bitstring pyserial-asyncio ]; - # Project has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ "sml" ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for EDL21 smart meters using Smart Message Language (SML)"; homepage = "https://github.com/mtdcr/pysml"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix index b0d7af3aca..d334e09990 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmlight/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; rev = "refs/tags/v${version}"; - hash = "sha256-qpE2bKEuCfhELKtYEstGAL5h01J/8qH3mE5c0LQtaHE="; + hash = "sha256-b1f17jOEDQFtwBJa2zhbI8j2rRoMNJy8/WsVWanf6BI="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix index f6f0de014d..e148d8af8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysptk" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Wrapper for Speech Signal Processing Toolkit (SPTK)"; homepage = "https://pysptk.readthedocs.io/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix index 9c485b2c0d..06b7557176 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,29 +1,36 @@ { lib, aiohttp, + async-timeout, buildPythonPackage, fetchFromGitHub, pytest-asyncio, pytestCheckHook, pythonAtLeast, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.8.1"; - format = "setuptools"; + version = "0.9.2"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "rajlaud"; - repo = pname; + repo = "pysqueezebox"; rev = "refs/tags/v${version}"; - hash = "sha256-d+8/YyA6tTBxZpiR9pu/5K1v0FOiSrR7RZ7MMBwOzdA="; + hash = "sha256-gHv1dSWU0erzesneodMhCR1LQYutpDVithZ5M1lgk3I="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ + async-timeout + aiohttp + ]; nativeCheckInputs = [ pytest-asyncio @@ -45,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous library to control Logitech Media Server"; homepage = "https://github.com/rajlaud/pysqueezebox"; + changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystatgrab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystatgrab/default.nix index 04d460bdf5..942fe48d95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystatgrab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystatgrab/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { buildInputs = [ libstatgrab - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix index 3df9edb39f..24c75bf05e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix @@ -29,15 +29,18 @@ buildPythonPackage rec { patches = [ ./replace-python-first.patch ]; - buildInputs = [ - bash - subversion - apr - aprutil - expat - neon - openssl - ] ++ lib.optionals stdenv.isLinux [ e2fsprogs ] ++ lib.optionals stdenv.isDarwin [ gcc ]; + buildInputs = + [ + bash + subversion + apr + aprutil + expat + neon + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; preConfigure = '' cd Source @@ -84,6 +87,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; # g++: command not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix index 0eb36db863..332a1b40e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -1,18 +1,22 @@ { lib, buildPythonPackage, + cryptography, defusedxml, fetchFromGitHub, + gql, + graphql-core, marshmallow, + pytest-cov-stub, pytest-datafiles, pytest-vcr, pytestCheckHook, python-box, python-dateutil, pythonOlder, - requests, requests-pkcs12, requests-toolbelt, + requests, responses, restfly, semver, @@ -22,7 +26,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.5.0"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,10 +35,13 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-uLZ1TQx5awHOOF+IR3aWTwwYTd71O/V+EHaDrb1LAXU="; + hash = "sha256-SGfvaYzqJ+OsJ9sGyR3pgCbEkPondhMQMNrE/r/nIY0="; }; - pythonRelaxDeps = [ "defusedxml" ]; + pythonRelaxDeps = [ + "cryptography" + "defusedxml" + ]; build-system = [ setuptools ]; @@ -42,6 +49,9 @@ buildPythonPackage rec { defusedxml marshmallow python-box + cryptography + gql + graphql-core python-dateutil requests requests-toolbelt @@ -51,6 +61,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-cov-stub pytest-datafiles pytest-vcr pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 8d3b1bfdeb..bc8106a999 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "test_connection_failure_v2" "test_connection_failure_extra_inventory_v2" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # These tests fail in the Darwin sandbox "test_ansible_facts" "test_func" @@ -74,7 +74,7 @@ buildPythonPackage rec { # Test want s to execute pytest in a subprocess "tests/integration/test_molecule.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # These tests fail in the Darwin sandbox "tests/test_adhoc.py" "tests/test_adhoc_result.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix index 477be61ebe..cc0096db1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_flask" ]; - pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_live_server.py" ]; + pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [ + "--ignore=tests/test_live_server.py" + ]; meta = with lib; { description = "Set of pytest fixtures to test Flask applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix index 64c43164a0..6a508417e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; disabledTests = - if (pythonAtLeast "3.12" && stdenv.isDarwin && stdenv.isx86_64) then + if (pythonAtLeast "3.12" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then [ # non reproducible test failure on hydra, works on community builder # https://hydra.nixos.org/build/252537267 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix index 2347105452..dd9e84b351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { disabledTests = [ "test_block_network_with_allowed_hosts" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Missing socket.AF_NETLINK "test_other_socket" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix index 6eecdcbc95..522202a510 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, decorator, fetchPypi, - invocations, invoke, pytest, pytestCheckHook, @@ -27,7 +26,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator ]; nativeCheckInputs = [ - invocations invoke pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-aodhclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-aodhclient/default.nix new file mode 100644 index 0000000000..9c3b015a53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-aodhclient/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-serialization, + oslo-utils, + oslotest, + osprofiler, + pbr, + pyparsing, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-aodhclient"; + version = "3.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-aodhclient"; + rev = "refs/tags/${version}"; + hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + cliff + keystoneauth1 + osc-lib + oslo-i18n + oslo-serialization + oslo-utils + osprofiler + pbr + pyparsing + ]; + + nativeCheckInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "aodhclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-aodhclient"; + description = "Client library for OpenStack Aodh API"; + license = lib.licenses.asl20; + mainProgram = "aodh"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-can/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-can/default.nix index 26bd3a2747..8224de600a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-can/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-can/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { "test_pack_unpack" "test_receive" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # timing sensitive "test_general" "test_gap" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix index f5c1306f66..efa1e5aed5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix @@ -3,7 +3,6 @@ arrow, buildPythonPackage, fetchFromGitHub, - fetchpatch, freezegun, pytestCheckHook, pythonOlder, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index a7eb7fe8dd..6a534a249f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -53,9 +53,9 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix index 27d768c4e9..031efa7b31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix @@ -39,7 +39,7 @@ buildPythonPackage { ]; # arm64 is an unsupported platform on etcd 3.4. should be able to be removed on >= etcd 3.5 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' for file in "test_auth" "integration/test_simple"; do diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ffmpeg/default.nix index 3eba0ddb1d..1991f74926 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ffmpeg/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://github.com/jonghwanhyeon/python-ffmpeg"; description = "Python binding for FFmpeg which provides sync and async APIs"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/default.nix index 8034a621f8..47fdc3cfa0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildAndTestSubdir = "pyflirt"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fx/default.nix index 0d906cd2e3..40b09992d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fx/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { ]; # FAILED tests/test_event_loops.py::TwistedEventLoopTest::test_run - AssertionError: 'callback called with future outcome: True' not found in ['... - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "pyfx" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix index 32c9ccd33a..77a960e889 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.2"; + version = "0.5.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AdgBOTHJ+j9Fgku+pwVMA9bhHyWKcufghuFo28uRhUw="; + hash = "sha256-KQ2N25zWPfls/pKEubJl8Z/W4UXlWC3Fj9cnHwJtCkc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index 763999be86..6d346d6c63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # No running SSH available "test_connect_error" "test_feed_xml_error" - ] ++ lib.optionals stdenv.isDarwin [ "test_feed_xml_error" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_feed_xml_error" ]; pythonImportsCheck = [ "gvm" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index 8afb965dba..e06a0760fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # test uses timeout mechanism unsafe for use with the "spawn" # multiprocessing backend used on macos - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tests/test_jenkins_sockets.py \ --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix index 4f1c9bd963..ebb042b848 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { "test_tls_ext_noca" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix index 0b66eb44f8..cc7671ebc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-uenFr86WXSFzo3PlDz/KyMgG06QDzm69z0TM59UP6pg="; + hash = "sha256-IFDVIUBB/8FZMn6CKmZBbOEB3ghzer7Fe6YLhwtjJSU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix index eed723f10d..c06251663e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ./python-mapnik_std_optional.patch ]; - stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; build-system = [ setuptools ]; @@ -103,7 +103,7 @@ buildPythonPackage rec { # import from $out rm -r mapnik '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Replace the hardcoded /tmp references with $TMPDIR sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py ''; @@ -114,7 +114,7 @@ buildPythonPackage rec { "test_passing_pycairo_context_pdf" "test_pdf_printing" "test_render_with_scale_factor" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_passing_pycairo_context_png" "test_passing_pycairo_context_svg" "test_pycairo_pdf_surface1" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix index 6335a612a5..a97d7be877 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-motionmount"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vogelsproducts"; repo = "python-MotionMount"; rev = "refs/tags/${version}"; - hash = "sha256-BOzv0IuEXK0uzJuO1F1k8baL8KmzV/KFWcKJPSHORsU="; + hash = "sha256-07wTlyfUSt44dBwOXjkXADA+HDy8531KYxJAKqBWKeQ="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix index 890fc02a1a..f7edf890d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix @@ -5,7 +5,9 @@ ddt, openstackdocstheme, osc-lib, + osc-placement, pbr, + python-aodhclient, python-barbicanclient, python-cinderclient, python-designateclient, @@ -74,6 +76,8 @@ buildPythonPackage rec { optional-dependencies = { # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst cli-plugins = [ + osc-placement + python-aodhclient python-barbicanclient python-designateclient python-heatclient diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix index e50bbeff87..a891f0a0e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { # For Django tests preCheck = "export DJANGO_SETTINGS_MODULE=test_project.settings"; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # fail on Darwin because it defaults to multiprocessing `spawn` "test_reset_signalizes" "test_reset_all_signalizes" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index add99dfb34..289a4e4100 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { dacite paho-mqtt pycryptodome - ] ++ lib.optionals stdenv.isDarwin [ pycryptodomex ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ]; nativeCheckInputs = [ pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix index f29a3097c6..818eeb919b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libjack2 alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreMIDI CoreServices diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 5494169e3b..b664291e2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.5"; + version = "21.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-i1YEcN615xeI4HcygXV9kzuXpT2yDSnlNU6bZqu1dPM="; + hash = "sha256-FwAlceRqQfTjCCi+Mqrf0LCxSZD4mV/CVN6YPs947c4="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix index edcb3e0047..f5594e983a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { ''; # hangs on darwin + sandbox - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' rm test/{test_exempi,test_files}.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix index f01fb4ca46..755834eecd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXi fontconfig rapidjson - ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; cmakeFlags = [ "-Wno-dev" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 832f2e6666..19678c0193 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { "test_get_nearest_neighbors" "test_list_of_text" "test_untrained_indexer" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: module 'torch.distributed' has no attribute 'init_process_group' "test_single_proc" ] ++ lib.optionals cudaSupport [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix index df854d4073..deeddc6b6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyttsx3"; - version = "2.91"; + version = "2.97"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "sha256-jxkhfE1lpGhw4LgvLn6xVw7CssqAUX++7gleVPdvc+I="; + sha256 = "sha256-GM4wZDtnutHZc2H7s6PHyo/MdQ7Y6YrCJuu2I7AeSw8="; dist = "py3"; python = "py3"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytubefix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytubefix/default.nix index a42273fee7..343bcca0a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytubefix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytubefix/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/JuanBindez/pytubefix"; description = "Pytube fork with additional features and fixes"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix index 13073a59f4..f7b75f0ff2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-LpRUJ6IWdIk7uXYyQB22ITnZHOoe6WE3zHsHrSIZj8c="; }; - postPatch = lib.optionalString stdenvNoCC.isLinux '' + postPatch = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunbound/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunbound/default.nix index a5d33cbfa4..13357faec5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyunbound/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyunbound/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { rm -r $out/bin $out/share $out/include $out/etc/unbound '' # patchelf is only available on Linux and no patching is needed on darwin - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --replace-needed libunbound.so.8 $out/${python.sitePackages}/libunbound.so.8 $out/${python.sitePackages}/_unbound.so ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix deleted file mode 100644 index bfbd39ce5c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - lib, - aiofiles, - aiohttp, - aioshutil, - async-timeout, - buildPythonPackage, - dateparser, - fetchFromGitHub, - ffmpeg, - hatch-vcs, - hatchling, - ipython, - orjson, - packaging, - pillow, - platformdirs, - py, - pydantic, - pyjwt, - pytest-aiohttp, - pytest-asyncio, - pytest-benchmark, - pytest-timeout, - pytest-xdist, - pytestCheckHook, - python-dotenv, - pythonOlder, - pytz, - termcolor, - typer, -}: - -buildPythonPackage rec { - pname = "pyunifiprotect"; - version = "5.1.2"; - pyproject = true; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "briis"; - repo = "pyunifiprotect"; - rev = "refs/tags/v${version}"; - hash = "sha256-DtQm6u3O0kdVJ23Ch+hJQ6HTOt5iAMdhCzC1K/oICWk="; - }; - - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--strict-markers -ra -Wd --ignore=.* --no-cov-on-fail --cov=pyunifiprotect --cov-append --maxfail=10 -n=auto" "" - ''; - - build-system = [ - hatch-vcs - hatchling - ]; - - dependencies = [ - aiofiles - aiohttp - aioshutil - dateparser - orjson - packaging - pillow - platformdirs - pydantic - pyjwt - pytz - typer - ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - - passthru.optional-dependencies = { - shell = [ - ipython - python-dotenv - termcolor - ]; - }; - - nativeCheckInputs = [ - ffmpeg # Required for command ffprobe - py - pytest-aiohttp - pytest-asyncio - pytest-benchmark - pytest-timeout - pytest-xdist - pytestCheckHook - ]; - - pythonImportsCheck = [ "pyunifiprotect" ]; - - pytestFlagsArray = [ "--benchmark-disable" ]; - - meta = with lib; { - description = "Library for interacting with the Unifi Protect API"; - mainProgram = "unifi-protect"; - homepage = "https://github.com/briis/pyunifiprotect"; - changelog = "https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 4fe56684d5..39f5574596 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.118"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-LRJSecKAQAg5Axfi8h//cc3xozOiPUkZD49VJIE6shE="; + hash = "sha256-c9CaftT7VInEMRsWN7FhDHwXJccma5wkUfiN9EpjUTQ="; }; build-system = [ setuptools ]; @@ -30,12 +30,12 @@ buildPythonPackage rec { pycparser ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace vex/Makefile-gcc \ --replace-fail '/usr/bin/ar' 'ar' ''; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix index 0bfb49ebc3..65c469091e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${version}"; license = with licenses; [ lgpl2Only ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzx/default.nix index a391f26a31..d39d2b48ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzx/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - pythonRelaxDepsHook, pytestCheckHook, setuptools, ipywidgets, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix index e5a2688d00..71cfa49045 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcelemental" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Periodic table, physical constants and molecule parsing for quantum chemistry"; homepage = "https://github.com/MolSSI/QCElemental"; changelog = "https://github.com/MolSSI/QCElemental/blob/v${version}/docs/changelog.rst"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index 4c2db9b41f..d6bd8c8095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -50,11 +50,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes_contrib_drivers" ]; disabledTests = - lib.optionals (stdenv.isDarwin) [ + lib.optionals (stdenv.hostPlatform.isDarwin) [ # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' "test_stability_diagram_external" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # AssertionError: assert ['outp:trig4:...9999996', ...] == ['outp:trig4:...t 0.266', ...] "test_stability_diagram_external" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock new file mode 100644 index 0000000000..e014440032 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock @@ -0,0 +1,3879 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-object-pool" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "333c456b97c3f2d50604e8b2624253b7f787208cb72eb75e64b0ad11b221652c" +dependencies = [ + "async-std", +] + +[[package]] +name = "async-process" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" +dependencies = [ + "async-channel 2.3.1", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite", + "rustix", + "tracing", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-socks5" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77f634add2445eb2c1f785642a67ca1073fedd71e73dc3ca69435ef9b9bdedc7" +dependencies = [ + "async-trait", + "thiserror", + "tokio", +] + +[[package]] +name = "async-std" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" +dependencies = [ + "async-attributes", + "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "basic-cookies" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7" +dependencies = [ + "lalrpop", + "lalrpop-util", + "regex", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "cc" +version = "1.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bcde016d64c21da4be18b655631e5ab6d3107607e71a73a9f53eb48aae23fb" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.77", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_builder" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +dependencies = [ + "derive_builder_core", + "syn 2.0.77", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.77", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "ena" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" +dependencies = [ + "log", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "tempfile", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "httpmock" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ec9586ee0910472dec1a1f0f8acf52f0fdde93aea74d70d4a3107b4be0fd5b" +dependencies = [ + "assert-json-diff", + "async-object-pool", + "async-std", + "async-trait", + "base64 0.21.7", + "basic-cookies", + "crossbeam-utils", + "form_urlencoded", + "futures-util", + "hyper", + "lazy_static", + "levenshtein", + "log", + "regex", + "serde", + "serde_json", + "serde_regex", + "similar", + "tokio", + "url", +] + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-proxy" +version = "0.9.1" +source = "git+https://github.com/rigetti/hyper-proxy#e08329b56787326d6ec8d0bbcc1f96913af105c8" +dependencies = [ + "bytes", + "futures-util", + "headers", + "http", + "hyper", + "hyper-rustls", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "webpki", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-socks2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4" +dependencies = [ + "async-socks5", + "futures", + "http", + "hyper", + "thiserror", + "tokio", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[package]] +name = "ipnet" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lalrpop" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" +dependencies = [ + "ascii-canvas", + "bit-set", + "ena", + "itertools 0.11.0", + "lalrpop-util", + "petgraph", + "pico-args", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", + "walkdir", +] + +[[package]] +name = "lalrpop-util" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-http" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry_api", +] + +[[package]] +name = "opentelemetry_api" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "ordered-float", + "percent-encoding", + "rand", + "regex", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pbjson" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90" +dependencies = [ + "base64 0.21.7", + "serde", +] + +[[package]] +name = "pbjson-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735" +dependencies = [ + "heck 0.4.1", + "itertools 0.11.0", + "prost", + "prost-types", +] + +[[package]] +name = "pbjson-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12" +dependencies = [ + "bytes", + "chrono", + "pbjson", + "pbjson-build", + "prost", + "prost-build", + "serde", +] + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.5.0", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn 2.0.77", +] + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "version_check", + "yansi", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 2.0.77", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "pyo3" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +dependencies = [ + "cfg-if", + "indoc", + "inventory", + "libc", + "memoffset", + "num-complex", + "parking_lot", + "portable-atomic", + "pyo3-build-config 0.20.3", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-asyncio" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "tokio", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +dependencies = [ + "libc", + "pyo3-build-config 0.20.3", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config 0.20.3", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "qcs-api-client-common" +version = "0.10.2" +dependencies = [ + "async-trait", + "backoff", + "base64 0.22.1", + "chrono", + "derive_builder", + "figment", + "futures", + "home", + "http", + "httpmock", + "jsonwebtoken", + "paste", + "pyo3", + "pyo3-asyncio", + "pyo3-build-config 0.22.3", + "reqwest", + "rigetti-pyo3", + "rstest 0.21.0", + "serde", + "serial_test", + "shellexpand", + "thiserror", + "time", + "tokio", + "toml", + "tracing", + "url", + "urlpattern", +] + +[[package]] +name = "qcs-api-client-grpc" +version = "0.10.2" +dependencies = [ + "async-std", + "backoff", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-proxy", + "hyper-socks2", + "jsonwebtoken", + "once_cell", + "opentelemetry", + "opentelemetry-http", + "opentelemetry_api", + "opentelemetry_sdk", + "pbjson", + "pbjson-build", + "pbjson-types", + "prost", + "prost-build", + "qcs-api-client-common", + "rstest 0.17.0", + "serde", + "serde_json", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tonic-health", + "tonic-web", + "tower", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", + "url", + "urlpattern", +] + +[[package]] +name = "qcs-api-client-openapi" +version = "0.11.2" +dependencies = [ + "anyhow", + "qcs-api-client-common", + "reqwest", + "reqwest-middleware", + "reqwest-tracing", + "rstest 0.17.0", + "serde", + "serde_json", + "task-local-extensions", + "tokio", + "tracing", + "url", + "urlpattern", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "relative-path" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tokio-socks", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest-middleware" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +dependencies = [ + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror", +] + +[[package]] +name = "reqwest-tracing" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190838e54153d7a7e2ea98851304b3ce92daeabf14c54d32b01b84a3e636f683" +dependencies = [ + "anyhow", + "async-trait", + "getrandom", + "matchit", + "opentelemetry", + "reqwest", + "reqwest-middleware", + "task-local-extensions", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "rigetti-pyo3" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59068763670399bb3e895a17cc631d9214c3172b64fc74d3ab63dac7371c340" +dependencies = [ + "num-complex", + "num-traits", + "paste", + "pyo3", + "time", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rstest" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros 0.17.0", + "rustc_version", +] + +[[package]] +name = "rstest" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros 0.21.0", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", + "unicode-ident", +] + +[[package]] +name = "rstest_macros" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +dependencies = [ + "cfg-if", + "glob", + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "relative-path", + "rustc_version", + "syn 2.0.77", + "unicode-ident", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scc" +version = "2.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c947adb109a8afce5fc9c7bf951f87f146e9147b3a6a58413105628fb1d1e66" +dependencies = [ + "sdd", +] + +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdd" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a7b59a5d9b0099720b417b6325d91a52cbf5b3dcb5041d864be53eefa58abc" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared", + "precomputed-hash", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "task-local-extensions" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +dependencies = [ + "indexmap 2.5.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "rustls-native-certs 0.7.3", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "tonic-health" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cef6e24bc96871001a7e48e820ab240b3de2201e59b517cf52835df2f1d2350" +dependencies = [ + "async-stream", + "prost", + "tokio", + "tokio-stream", + "tonic", +] + +[[package]] +name = "tonic-web" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc3b0e1cedbf19fdfb78ef3d672cb9928e0a91a9cb4629cc0c916e8cff8aaaa1" +dependencies = [ + "base64 0.21.7", + "bytes", + "http", + "http-body", + "hyper", + "pin-project", + "tokio-stream", + "tonic", + "tower-http", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log 0.1.4", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log 0.2.0", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "urlpattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +dependencies = [ + "derive_more", + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.77", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client-common/default.nix new file mode 100644 index 0000000000..fc0a04a74b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client-common/default.nix @@ -0,0 +1,77 @@ +{ + buildPythonPackage, + cargo, + fetchFromGitHub, + grpc-interceptor, + grpcio, + httpx, + lib, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + rustc, + rustPlatform, + syrupy, +}: + +buildPythonPackage rec { + pname = "qcs-api-client-common"; + version = "0.10.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rigetti"; + repo = "qcs-api-client-rust"; + rev = "refs/tags/common/v${version}"; + hash = "sha256-WXTqzdbBZmBj/+mVK/watOuaq/WqKtaMVhp+ogjmhqM="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "hyper-proxy-0.9.1" = "sha256-P9/qMHfq56rkQoBQF3o/SmbOfcePcFf8yh1YQve3oGM="; + }; + }; + + # FIXME use + # buildAndTestSubdir = "qcs-api-client-common"; + # instead, which makes the tests fail + postPatch = '' + cd qcs-api-client-common + ''; + cargoRoot = ".."; + + build-system = [ rustPlatform.maturinBuildHook ]; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + + dependencies = [ + grpc-interceptor + grpcio + httpx + ]; + + preCheck = '' + # import from $out + rm -r qcs_api_client_common + ''; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + syrupy + ]; + + meta = { + changelog = "https://github.com/rigetti/qcs-api-client-rust/blob/${src.rev}/qcs-api-client-common/CHANGELOG-py.md"; + description = "Contains core QCS client functionality and middleware implementations"; + homepage = "https://github.com/rigetti/qcs-api-client-rust/tree/main/qcs-api-client-common"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock index 2309fd0205..6a205f2832 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock @@ -1592,18 +1592,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lexical" -version = "6.1.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" +checksum = "8ecd3381ac77c22d4e2607284ac71e44b21c21bd3785ee807d21976d54ee16f9" dependencies = [ "lexical-core", ] [[package]] name = "lexical-core" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +checksum = "0885f6cdfe75c96e45bbf1c4e49511f128201391ce3b56e60e29f5a1fadbc1c1" dependencies = [ "lexical-parse-float", "lexical-parse-integer", @@ -1614,9 +1614,9 @@ dependencies = [ [[package]] name = "lexical-parse-float" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +checksum = "924f7ec090cd4f60bd873f160b0fb69a0c80bb3a98f2e778a1893ae0e5c4b0b9" dependencies = [ "lexical-parse-integer", "lexical-util", @@ -1625,9 +1625,9 @@ dependencies = [ [[package]] name = "lexical-parse-integer" -version = "0.8.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +checksum = "8feab1da84a2ab0ddbbad2fb1830b755f71a9a8d996c7a1f2a553faf72aa3686" dependencies = [ "lexical-util", "static_assertions", @@ -1635,18 +1635,18 @@ dependencies = [ [[package]] name = "lexical-util" -version = "0.8.5" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +checksum = "591ce1a12ecd3b26d4121ab360a6a4483a67f05a5372add6acbfd0b65c9285d9" dependencies = [ "static_assertions", ] [[package]] name = "lexical-write-float" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +checksum = "05b0f3f9ddada5942b54e97654d535df37c9340ad66c24b50360a90619779f41" dependencies = [ "lexical-util", "lexical-write-integer", @@ -1655,9 +1655,9 @@ dependencies = [ [[package]] name = "lexical-write-integer" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +checksum = "48c6d47254ddb292771dce7697ae2be9619f8e369d01a9ccda15ef2ff50443fc" dependencies = [ "lexical-util", "static_assertions", @@ -2551,7 +2551,7 @@ dependencies = [ "num-complex", "parking_lot", "portable-atomic", - "pyo3-build-config", + "pyo3-build-config 0.20.3", "pyo3-ffi", "pyo3-macros", "unindent", @@ -2580,6 +2580,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "pyo3-build-config" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7879eb018ac754bba32cb0eec7526391c02c14a093121857ed09fbf1d1057d41" +dependencies = [ + "once_cell", + "target-lexicon", +] + [[package]] name = "pyo3-ffi" version = "0.20.3" @@ -2587,7 +2597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", - "pyo3-build-config", + "pyo3-build-config 0.20.3", ] [[package]] @@ -2621,7 +2631,7 @@ checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ "heck 0.4.1", "proc-macro2", - "pyo3-build-config", + "pyo3-build-config 0.20.3", "quote", "syn 2.0.66", ] @@ -2674,7 +2684,7 @@ dependencies = [ [[package]] name = "qcs" -version = "0.23.2" +version = "0.24.1" dependencies = [ "assert2", "async-trait", @@ -2736,19 +2746,25 @@ dependencies = [ [[package]] name = "qcs-api-client-common" -version = "0.8.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "040552f233992abe94376304cf17dab2d79ff62d4a9ee986d75efe3d19337f57" +checksum = "1cf1692d12ab36478f43f1ef493a8b2445f7f5d17164f739d8b0fd57ad59e6e6" dependencies = [ "async-trait", "backoff", + "base64 0.22.1", "derive_builder 0.20.0", "figment", "futures", "home", "http", "jsonwebtoken", + "paste", + "pyo3", + "pyo3-asyncio", + "pyo3-build-config 0.22.1", "reqwest", + "rigetti-pyo3 0.3.6", "serde", "shellexpand", "thiserror", @@ -2762,9 +2778,9 @@ dependencies = [ [[package]] name = "qcs-api-client-grpc" -version = "0.8.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb755cd59b1b3ce99abe52ff6898ad74ca26463e94300c103cafaac4f345c4f3" +checksum = "b6224aeaaafb92d44439a398a03b042889edacbe23a115cfb1ff1e17c80c8bf2" dependencies = [ "backoff", "http", @@ -2795,9 +2811,9 @@ dependencies = [ [[package]] name = "qcs-api-client-openapi" -version = "0.9.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008d06c4051dd4b3e7d5b6c1f31457c68384f8f36b05b304de6059bbd81c6128" +checksum = "c5107bbd313d31d1eede8dec2bc9c69e0aa50ffc6207457bb4d8c3ab3cb32434" dependencies = [ "anyhow", "qcs-api-client-common", @@ -2815,7 +2831,7 @@ dependencies = [ [[package]] name = "qcs-sdk-python" -version = "0.19.3" +version = "0.20.1" dependencies = [ "async-trait", "numpy", @@ -2823,9 +2839,10 @@ dependencies = [ "opentelemetry 0.23.0", "opentelemetry_sdk 0.23.0", "paste", + "prost", "pyo3", "pyo3-asyncio", - "pyo3-build-config", + "pyo3-build-config 0.20.3", "pyo3-log", "pyo3-opentelemetry", "pyo3-tracing-subscriber", @@ -2835,7 +2852,7 @@ dependencies = [ "qcs-api-client-grpc", "qcs-api-client-openapi", "quil-rs", - "rigetti-pyo3", + "rigetti-pyo3 0.4.1", "serde_json", "thiserror", "tokio", @@ -2850,8 +2867,8 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quil-rs" -version = "0.27.1" -source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.11.1#ab5b976573b38f3ba2605f57482ccadb1f13bf30" +version = "0.28.1" +source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.12.1#a0f2776893d3ce33eb9f29449f3b4b0e9ed24174" dependencies = [ "approx", "indexmap 2.2.6", @@ -3099,6 +3116,19 @@ dependencies = [ "time", ] +[[package]] +name = "rigetti-pyo3" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f924032d36104a859f936762576a9e6fc0811b37a1f4a8144c0b9b25ee89607b" +dependencies = [ + "num-complex", + "num-traits", + "paste", + "pyo3", + "time", +] + [[package]] name = "ring" version = "0.16.20" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/default.nix index b0d4808f9e..854ed41a34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -8,6 +8,7 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + qcs-api-client-common, quil, rustPlatform, darwin, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.19.3"; + version = "0.20.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,13 +27,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-sdk-rust"; rev = "python/v${version}"; - hash = "sha256-TyXUkuiYdz6Z6s96DD33QdEuI0ch4hRjUGWahEBpkX4="; + hash = "sha256-OuFEygZWfNnhRDLeEY10gGYD9EF5LkPd+K3Uu8X0hwY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "quil-rs-0.27.1" = "sha256-w97kkdwRnVVfKNTIKypl3shFQJV5Rh/kF6jp7jCiyqw="; + "quil-rs-0.28.1" = "sha256-nyKLBL5Q51u2OTkpr9oKb0c5saWeW3wmZC3g7vxyeEQ="; }; }; @@ -43,13 +44,16 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - dependencies = [ quil ]; + dependencies = [ + qcs-api-client-common + quil + ]; optional-dependencies = { tracing-opentelemetry = [ opentelemetry-api ]; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration libiconv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix index 4410fcd51b..d54ac47473 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.11.1"; + version = "1.11.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-NIGmQMtGvm6zifYJIMFx+d9w9IZmQUAqieBo/3JmYbM="; + hash = "sha256-DVyaBQ8r52H9q2NNDsplfPxoxwZeK3pHNfnyw9a9hvw="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix deleted file mode 100644 index 34876b7aaa..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - boto, - inflection, - requests, - six, - urllib3, - mock, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "qds-sdk"; - version = "1.16.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "qubole"; - repo = "qds-sdk-py"; - rev = "refs/tags/V${version}"; - hash = "sha256-8aPIE2E3Fy2EiBM2FPRyjnJolIBdOzafI3Fvlod5hxU="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - boto - inflection - requests - six - urllib3 - ]; - - nativeCheckInputs = [ - pytestCheckHook - mock - ]; - - pythonImportsCheck = [ "qds_sdk" ]; - - meta = with lib; { - description = "Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API"; - homepage = "https://github.com/qubole/qds-sdk-py"; - license = licenses.asl20; - maintainers = with maintainers; [ shahrukh330 ]; - mainProgram = "qds.py"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index a5744586b1..a51ad99805 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { [ "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues. ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index 44ae18a933..eb433a22e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix index bab2320b0d..2ef0d3280f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonPackages.setuptools ]; buildInputs = [ qtbase ]; - propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; + propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; dontWrapQtApps = true; @@ -47,7 +47,7 @@ buildPythonPackage rec { echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \ >> pyproject.toml '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace project.py \ --replace \ "if self.project.qsci_external_lib: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix index ea68441599..9663e8e1fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 1024 ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quil/default.nix index c1cd530a21..98175f1cbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "quil"; - version = "0.11.4"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "quil-rs"; rev = "quil-py/v${version}"; - hash = "sha256-I8LV7lqJP2xc8eVxMbixeHMRYiTpmpSahfA3WWRjoHA="; + hash = "sha256-OCQp8WKOxyZNMu2waeasSZ4E8VhFqDZcgGbDoMpKeHg="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-U9AVJ4i9E0TeG5cPxdx9hJcMKkZvUXcRfZF7VkM7ddI="; + hash = "sha256-EmSDjheLEyFr0w6XOvJYdRmGGlv2L/wh3qAN8Nn5lyg="; }; buildAndTestSubdir = "quil-py"; @@ -38,7 +38,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 02ef0d753f..64246e6835 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { '' export RAPIDFUZZ_BUILD_EXTENSION=1 '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; @@ -74,7 +74,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # segfaults "test_cdist" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index eef3e3b975..5739ca88b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -115,7 +115,7 @@ buildPythonPackage { meta = { # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/v${version}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 8536f1bc98..3365f12c1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_outer_boundless_pixel_fidelity" - ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix index 5d5a474d49..4ce40625e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-LaTzHub21e+qDQs4/sxCIVzaE8leAVs8y4P1jighkT8="; + hash = "sha256-KZMkQeaKt9rTWydsdjZwv0Lr9yHN3E9N6CAL2SrAXFg="; }; cp311 = { - hash = "sha256-Iym0IdxjsC4w5GV497RQfufdjMV/NbdGgQG9xkdy+js="; + hash = "sha256-tCAnnKFPAswn/Fkv8fKNqaoIuWIxa/Zd3zcNuHcILpE="; }; cp312 = { - hash = "sha256-KXAxrkdyHKzX9pgpTTZ2PiwsXEeac0BFG6dQOkJ0seU="; + hash = "sha256-AmjHvC6Ltu+buJaSmd61hXv2cr/LWdqV23SVqKUC+Lo="; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix index a2fe180820..6a9532f953 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix @@ -56,7 +56,7 @@ let pname = "ray"; - version = "2.36.0"; + version = "2.37.0"; in buildPythonPackage rec { inherit pname version; @@ -162,6 +162,7 @@ buildPythonPackage rec { changelog = "https://github.com/ray-project/ray/releases/tag/ray-${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ billhuang ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/raylib-python-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/raylib-python-cffi/default.nix index 6069a6bdfe..eaaa13c96c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { physac raygui ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL Cocoa IOKit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix index b0f2b4c7cd..17bf74863a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { "test_guess_format_for_parse" "rdflib.extras.infixowl" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Require loopback network access "TestGraphHTTP" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix index e676918cb6..7c75c32be2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { timeout-decorator ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Test is broken on darwin. Fix in master from https://github.com/buriy/python-readability/pull/178 "test_many_repeated_spaces" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index 4b63eb5dd7..fd4d306c1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.8"; + version = "0.9.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-3rwL47mXVzWBL4REE1Dchg8GQLWJn+bzoZnmXHgKX40="; + hash = "sha256-wN2rWoRuxP5uLl2TkSnxlEwl29z6C8dDo9UkJ7amExo="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix deleted file mode 100644 index ec88a805dd..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - flit, - jinja2, - ruamel-yaml, - matplotlib, - pandas, - pandoc, - pygments, - blessings, - curio, - hypothesis, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "reportengine"; - version = "0.31"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE="; - }; - - nativeBuildInputs = [ flit ]; - - propagatedBuildInputs = [ - jinja2 - ruamel-yaml - matplotlib - pandas - pygments - blessings - curio - ]; - - nativeCheckInputs = [ - hypothesis - pandoc - pytestCheckHook - ]; - - pythonImportsCheck = [ "reportengine" ]; - - meta = with lib; { - description = "Framework for declarative data analysis"; - homepage = "https://github.com/NNPDF/reportengine/"; - license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ veprbl ]; - # Incompatibility with ruamel >= 0.18 - # https://github.com/NNPDF/reportengine/issues/60 - broken = versionAtLeast ruamel-yaml.version "0.18"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix index c1c8473c26..09a1c303c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.22"; + version = "0.23"; pyproject = true; disabled = pythonOlder "3.9"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-OAHhpVQIAT3+f/+Oo2MNcS+xP7KB/LVvXLpOyY1rumM="; + hash = "sha256-IZjPdfg6q5uWEpvQE3djekvChcB7HWbbPqAv/0tu6fM="; }; pythonRelaxDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix index ffa706fcd5..70a5eebacd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyspnego ] # Avoid broken Python krb5 package on Darwin - ++ lib.optionals (!stdenv.isDarwin) pyspnego.optional-dependencies.kerberos; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) pyspnego.optional-dependencies.kerberos; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix index c8ec3c490e..6ffe869c0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix @@ -72,13 +72,13 @@ buildPythonPackage rec { "TestRequests" "TestTimeout" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Aborted "test_basic_response" "test_text_response" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Aborted "tests/test_lowlevel.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rerun-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rerun-sdk/default.nix index add95c23c9..13b7226782 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rerun-sdk/default.nix @@ -75,7 +75,7 @@ buildPythonPackage { ]; inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase; - postPhases = lib.optionals stdenv.isLinux [ "addDlopenRunpathsPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; disabledTestPaths = [ # "fixture 'benchmark' not found" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix index e7cb1dcbf6..3cdb15c004 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix @@ -3,36 +3,43 @@ arrow, buildPythonPackage, fetchFromGitHub, + pytest-cov-stub, pytest-datafiles, pytest-vcr, pytestCheckHook, python-box, pythonOlder, - responses, requests, + responses, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "restfly"; - version = "1.4.7"; - format = "setuptools"; + version = "1.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stevemcgrath"; - repo = pname; - rev = version; - hash = "sha256-PPXJHatJKve9fIjveVYRnTSIDHFmnSDWTnkgO91twJs="; + repo = "restfly"; + rev = "refs/tags/${version}"; + hash = "sha256-Zdn/hUvAZ9TaAWyDpNiEiA9mYDbWmiXBUa+IV/g8n2M="; }; - propagatedBuildInputs = [ - requests + build-system = [ setuptools ]; + + dependencies = [ arrow python-box + requests + typing-extensions ]; nativeCheckInputs = [ + pytest-cov-stub pytest-datafiles pytest-vcr pytestCheckHook @@ -49,7 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python RESTfly API Library Framework"; homepage = "https://github.com/stevemcgrath/restfly"; - license = with licenses; [ mit ]; + changelog = "https://github.com/librestfly/restfly/blob/${version}/CHANGELOG.md"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index 209ca7090c..4bfbc9d1e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -8,8 +8,8 @@ fetchPypi, firebase-messaging, freezegun, + hatchling, oauthlib, - poetry-core, pytest-asyncio, pytest-freezer, pytest-mock, @@ -18,11 +18,12 @@ pythonOlder, pytz, typing-extensions, + websockets, }: buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.9.3"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,12 +31,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-jzhboyDq3PXkwKKrAehX1F1UEUo9qofb+Z4/W5vwjiU="; + hash = "sha256-NnKcUr0SExXRDkNCIGU3LtwU1LIMAZzurn2Aoua1lzA="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiofiles @@ -44,6 +45,7 @@ buildPythonPackage rec { oauthlib pytz typing-extensions + websockets ]; optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix index 008fb69e8a..88e126d4d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix @@ -23,25 +23,17 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "6.6.1"; + version = "6.7.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cogeotiff"; repo = "rio-tiler"; - rev = version; - hash = "sha256-MR6kyoGM3uXt6JiIEfGcsmTmxqlLxUF9Wn+CFuK5LtQ="; + rev = "refs/tags/${version}"; + hash = "sha256-i70Bh7RHPgLLaqBo9vHRrJylsNE3Ly3xJq9j12Ch58E="; }; - patches = [ - # fix xarray tests, remove on next release - (fetchpatch { - url = "https://github.com/cogeotiff/rio-tiler/commit/7a36ed58b649d2f4d644f280b54851ecb7ffa4e9.patch"; - hash = "sha256-QlX5ZKpjSpXevi76gx39dXok0aClApkLU0cAVpCuYYs="; - }) - ]; - build-system = [ hatchling ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix index 0e876aecbb..49b38e2e34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly: "test_progressive_resize_integration" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix index 0dd92d2830..d77410a53a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.7"; + version = "0.7.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-cNOVk7JCu4kMevH9MAWWvtLIzfbBBy+h7bhTBhkfrvI="; + hash = "sha256-O3dxfO8MrTKaYRCBNygZlXKuIA3rjEr8TCtR/vrUYmo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index cfd0c71d38..c32adc8dc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "robotframework-seleniumlibrary"; - version = "6.5.0"; + version = "6.6.1"; pyproject = true; # no tests included in PyPI tarball @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sB2lWFFpCGgF0XFes84fBBvR8GF+S8aWWJoih+xBmW8="; + sha256 = "sha256-ULY0FH1RFQIlhS45LU3vUKi6urZJHiDgi6NdqU5tV2g="; }; build-system = [ setuptools ]; @@ -46,6 +46,8 @@ buildPythonPackage rec { mkdir utest/output_dir ''; + __darwinAllowLocalNetworking = true; + meta = { changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; description = "Web testing library for Robot Framework"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ronin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ronin/default.nix deleted file mode 100644 index 63d6d419cf..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/ronin/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - blessings, - colorama, - glob2, -}: - -buildPythonPackage rec { - pname = "ronin"; - version = "1.1.1"; - format = "setuptools"; - - src = fetchPypi { - inherit version pname; - hash = "sha256-5gZ8S0NR4JzKBIdi/xYtVmFg9ObbCSkT7sz+OKWnK/U="; - }; - - propagatedBuildInputs = [ - blessings - colorama - glob2 - ]; - - pythonImportsCheck = [ "ronin" ]; - - meta = with lib; { - homepage = "https://github.com/tliron/ronin/"; - description = "Straightforward but powerful build system based on Ninja and Python"; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 1fd58cb565..582e355085 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { simplegeneric ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # https://github.com/rpy2/rpy2/issues/1111 disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix index a9873de906..336ddca0bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "rpyc" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix index a403db7086..206f9192d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. "test_error_without_config_file_macos" "test_file_1_is_bad_without_config_macos" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix index 6d8bf78b6d..cdb87a0c86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { nativeBuildInputs = [ cython_0 ]; buildInputs = - lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreMIDI CoreServices diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix index 13bcdefa34..a363c4c7d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices libiconv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix index 44a1b89397..f7c96b10d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; # tests very flaky & hang often on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # test files do indeed need to be executed separately checkPhase = '' pushd ruffus/test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix index b0be3a5157..3f17b45e2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; checkInputs = [ fixtures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix index 9bbac4b454..3102568bcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix @@ -3,13 +3,14 @@ fetchPypi, buildPythonPackage, pythonOlder, - nose, + setuptools, }: buildPythonPackage rec { pname = "rx"; version = "3.2.0"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; # Use fetchPypi to avoid the updater script to migrate it to `reactivex` which @@ -20,12 +21,9 @@ buildPythonPackage rec { sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c"; }; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; - # Some tests are nondeterministic. (`grep sleep -r tests`) - # test_timeout_schedule_action_cancel: https://hydra.nixos.org/build/74954646 - # test_new_thread_scheduler_timeout: https://hydra.nixos.org/build/74949851 - doCheck = false; + doCheck = false; # PyPI tarball does not provides tests pythonImportsCheck = [ "rx" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix index e138d2193a..d245c6b0b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603. # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork - lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ]; + lib.optionals stdenv.hostPlatform.isDarwin [ "tests/unit/test_compat.py" ]; pythonImportsCheck = [ "s3transfer" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix index 7228a840d6..584cc1e7d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ h5py @@ -64,7 +64,7 @@ buildPythonPackage rec { "tests/test_paddle_comparison.py" "tests/test_tf_comparison.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # don't require mlx (not in Nixpkgs) to run tests "tests/test_mlx_comparison.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/salib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/salib/default.nix new file mode 100644 index 0000000000..9b1f1ccd79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/salib/default.nix @@ -0,0 +1,64 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + hatchling, + hatch-vcs, + numpy, + scipy, + matplotlib, + pandas, + multiprocess, + pathos, +}: +let + finalAttrs = { + pname = "salib"; + version = "1.5.1"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-5KnDGbjdAplajcmD9XxFLLflttvUPnt4VskMtqMyu18="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + numpy + scipy + matplotlib + pandas + multiprocess + ]; + + optional-dependencies = { + distributed = [ pathos ]; + }; + + # There are no tests in the pypi package + doCheck = false; + + pythonImportsCheck = [ + "SALib" + "SALib.analyze" + "SALib.plotting" + "SALib.sample" + "SALib.test_functions" + "SALib.util" + ]; + + meta = { + changelog = "https://github.com/SALib/SALib/releases"; + description = "Python implementations of commonly used sensitivity analysis methods, useful in systems modeling to calculate the effects of model inputs or exogenous factors on outputs of interest"; + homepage = "https://github.com/SALib/SALib"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "salib"; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix index 1f27c46dd6..0e47b565bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix @@ -6,7 +6,6 @@ pyyaml, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 04f00668ed..6979926cd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -5,7 +5,7 @@ aioquic, beautifulsoup4, buildPythonPackage, - doCheck ? !stdenv.isDarwin, # on Darwin, tests fail but pkg still works + doCheck ? !stdenv.hostPlatform.isDarwin, # on Darwin, tests fail but pkg still works fetchFromGitHub, gunicorn, html5tagger, @@ -82,7 +82,7 @@ buildPythonPackage rec { # needed for relative paths for some packages cd tests '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix index c6ea5ba796..3c07433547 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix @@ -27,7 +27,6 @@ scipy, setuptools, simpleitk, - six, tifffile, wheel, }: @@ -126,7 +125,7 @@ let "skimage/io/tests/test_io.py::test_imread_http_url" "skimage/restoration/tests/test_rolling_ball.py::test_ndim" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Matplotlib tests are broken inside darwin sandbox "skimage/feature/tests/test_util.py::test_plot_matches" "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" @@ -134,7 +133,7 @@ let # See https://github.com/scikit-image/scikit-image/issues/7061 and https://github.com/scikit-image/scikit-image/issues/7104 "skimage/measure/tests/test_fit.py" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # https://github.com/scikit-image/scikit-image/issues/7104 "skimage/measure/tests/test_moments.py" ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index 7e975cb159..eeba3f116d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -80,12 +80,12 @@ buildPythonPackage rec { ''; # PermissionError: [Errno 1] Operation not permitted: '/nix/nix-installer' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Skip test_feature_importance_regression - does web fetch "test_feature_importance_regression" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # doesn't seem to produce correct results? # possibly relevant: https://github.com/scikit-learn/scikit-learn/issues/25838#issuecomment-2308650816 "test_sparse_input" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix index e4d56716ee..3cbaf5f39e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; }; - env = lib.optionalAttrs stdenv.isDarwin { MPLBACKEND = "Agg"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { MPLBACKEND = "Agg"; }; nativeCheckInputs = [ pytest-mock @@ -83,7 +83,7 @@ buildPythonPackage rec { # test_calibration.py generates a divide by zero error on darwin # https://github.com/scikit-rf/scikit-rf/issues/972 disabledTestPaths = lib.optional ( - stdenv.isAarch64 && stdenv.isDarwin + stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin ) "skrf/calibration/tests/test_calibration.py"; pythonImportsCheck = [ "skrf" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix index e2d4ebff28..78e58877d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { "test_survival_svm" "test_tree" ] - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # floating point mismatch on aarch64 # 27079905.88052468 to far from 27079905.880496684 "test_coxnet"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix index e9b5a8a7ff..4677b47f11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -112,7 +112,7 @@ buildPythonPackage { pkg-config setuptools ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Minimal version required according to: # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 (xcbuild.override { @@ -141,7 +141,7 @@ buildPythonPackage { # The following tests are broken on aarch64-darwin with newer compilers and library versions. # See https://github.com/scipy/scipy/issues/18308 - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "test_a_b_neg_int_after_euler_hypergeometric_transformation" "test_dst4_definition_ortho" "test_load_mat4_le" @@ -150,7 +150,7 @@ buildPythonPackage { "test_uint64_max" ]; - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); preConfigure = '' @@ -187,7 +187,9 @@ buildPythonPackage { # # ldr x0, [x0, ___stack_chk_guard];momd # - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ + "stackprotector" + ]; # remove references to dev dependencies postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index f291798d05..010481da31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -117,7 +117,7 @@ buildPythonPackage rec { # Test fails on Hydra "test_start_requests_laziness" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_xmliter_encoding" "test_download" "test_reactor_default_twisted_reactor_select" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix index dc32cbb1dd..9f1a6c3a6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "screeninfo" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix index 8736930939..e311b2f2f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; buildInputs = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then [ Accelerate ] else [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium-wire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium-wire/default.nix index defbf1fe8f..b301c953bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium-wire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium-wire/default.nix @@ -36,9 +36,9 @@ buildPythonPackage rec { hash = "sha256-KgaDxHS0dAK6CT53L1qqx1aORMmkeaiXAUtGC82hiIQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ blinker brotli certifi @@ -73,5 +73,6 @@ buildPythonPackage rec { changelog = "https://github.com/wkeeling/selenium-wire/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + broken = versionAtLeast blinker.version "1.8"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 9009d6bf3c..ab3b46b438 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -47,11 +47,11 @@ buildPythonPackage rec { cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $DST_PREFIX/common/macos ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/macos/ '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $DST_PREFIX/common/linux/ ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/linux/ ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix index 06beaabdbc..f497e2fef4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix index 2b0177ffc3..b9cf305a8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-Kp0B3+1zK45KypCaxH02U/JdzTBGwFAoxtmzek94QNI="; + hash = "sha256-YtAgv0vH2aL7UX3ETVfwDEQYEWYo5Pj/R45CeH7T3BU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/1.nix index 3f57549a1e..db47e03c01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/1.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Issue with the asseration diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix index 51a4a9d842..655e93f4e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://github.com/amoffat/sh/issues/684 "test_general_signal" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable tests that fail on Darwin sandbox "test_background_exception" "test_cwd" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix index db6e185cb9..0959a8e3e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { cd $out ''; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # FIXME(lf-): these logging tests are broken, which is definitely our # fault. I've tried figuring out the cause and failed. # diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix index e35ca8ff6f..88f59fc86e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix @@ -1,6 +1,5 @@ { python, - pythonAtLeast, lib, stdenv, pyside2, @@ -15,35 +14,20 @@ stdenv.mkDerivation { inherit (pyside2) version src patches; - postPatch = - (lib.optionalString (pythonAtLeast "3.12") '' - substituteInPlace \ - ez_setup.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/utils.py \ - build_scripts/wheel_override.py \ - build_scripts/wheel_utils.py \ - sources/shiboken2/CMakeLists.txt \ - sources/shiboken2/data/shiboken_helpers.cmake \ - --replace-fail "from distutils" "import setuptools; from distutils" - substituteInPlace \ - build_scripts/config.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/setup_runner.py \ - build_scripts/utils.py \ - --replace-fail "import distutils" "import setuptools; import distutils" - '') - + '' - cd sources/shiboken2 - ''; + postPatch = '' + cd sources/shiboken2 + ''; CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; nativeBuildInputs = [ cmake - (python.withPackages (ps: with ps; [ setuptools ])) + (python.withPackages ( + ps: with ps; [ + distutils + setuptools + ] + )) ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix index e3d5490a6c..2c491e193d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix @@ -28,7 +28,7 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake (python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ])) - ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ llvmPackages.llvm diff --git a/third_party/nixpkgs/pkgs/development/python-modules/show-in-file-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/show-in-file-manager/default.nix index a43b08ee1c..a08a874d69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/show-in-file-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/show-in-file-manager/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ packaging ] ++ lib.optional (stdenv.isLinux) pyxdg; + propagatedBuildInputs = [ packaging ] ++ lib.optional (stdenv.hostPlatform.isLinux) pyxdg; meta = with lib; { homepage = "https://github.com/damonlynch/showinfilemanager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix index 74c88e6a56..2759c82924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { changelog = "https://github.com/aresio/simpful/releases/tag/${version}"; license = with licenses; [ lgpl3Only ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix index bbebbfd358..b8d70a31b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "simplejson" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix index 15806e8b1b..8e27202ad8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \ 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]' '' - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \ --replace "-march=armv7-a" "-march=armv8-a" \ --replace "-mfpu=neon" "" \ @@ -42,7 +42,7 @@ buildPythonPackage rec { --replace "defined(SK_CPU_ARM64)" "0" '' + - lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) # old compiler? + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) # old compiler? '' patch -p1 <= 3.11 - # https://github.com/brandon-rhodes/assay/issues/15 - doCheck = pythonOlder "3.11"; + doCheck = true; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index 8d1087f4ab..240c0a65d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -100,6 +100,6 @@ buildPythonPackage rec { mainProgram = "skytemple_export_maps"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marius851000 ]; - broken = stdenv.isDarwin; # pyobjc is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc is missing }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix index ed60b724f8..83873d2e0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-0a57RmZPztcIeRs7GNYe18JO+LlWoeNWG3nD9cG0XIU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index ce57cb147a..2f4c2d0f00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.33.0"; + version = "3.33.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-S41OyTyFjEfKvTlKwxHq7P/uzWreMIHimI6pECItTzo="; + hash = "sha256-OcGzpYwa8Ouf1ojQS9KnqlL37EYCZo5yjNeXXrkd0B4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix index dea81113d3..9c8031a6b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "XMPP library for Python"; license = licenses.mit; homepage = "http://sleekxmpp.com/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix index e531acb40b..68405f52be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/jborean93/smbprotocol/issues/119 "test_copymode_local_to_local_symlink_dont_follow" "test_copystat_local_to_local_symlink_dont_follow_fail" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix index 64c6d4b421..18925b034c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - snakemake, snakemake-interface-storage-plugins, snakemake-interface-common, sysrsync, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix index 99a540790b..4050206191 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-storage-plugin-xrootd"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wo6eF8XlHh9OiD2rTMCchyq1sQ8gjkKnoD4JsKDmJ2A="; + hash = "sha256-1plBss9jRzIIGQE7rXDEnAomFxNzSUKsw0VyhYA2mIc="; }; # xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix index a0192ee118..13a86fb63e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # AssertionError: Expected 'fileno' to not have been called. Called 1 times. "test_client_stop_no_wait" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 5d4e946c85..bcf489a453 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dependencies = [ regex ]; # loops forever - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "somajo" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix index 819975014f..3e421ab2ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.12.1"; format = "setuptools"; # https://github.com/bastibe/python-soundfile/issues/157 - disabled = isPyPy || stdenv.isi686; + disabled = isPyPy || stdenv.hostPlatform.isi686; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sourmash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sourmash/default.nix index aefb730b22..8e29c2845d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sourmash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sourmash/default.nix @@ -21,7 +21,8 @@ pytestCheckHook, }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; + stdenv' = + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; in buildPythonPackage rec { pname = "sourmash"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix index 66b1c20655..9315953b5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Fails because spacy_alignments module cannot be loaded correctly. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 51d20b3f24..03fffb27b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - blis, buildPythonPackage, callPackage, catalogue, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix index 444761c461..d9c3e64661 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. - disabledTestPaths = lib.optionals stdenv.isDarwin [ "spectral_cube/tests/test_visualization.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "spectral_cube/tests/test_visualization.py" + ]; pythonImportsCheck = [ "spectral_cube" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix index febf8c66dd..6c18f7e382 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # dependencies aiohttp, @@ -52,12 +51,12 @@ buildPythonPackage rec { pname = "spyder"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/UUtSpSkt1hJeIZfBLe8owP82jRx02kUF6TdfCsq6CY="; + hash = "sha256-cJeC6ICRWIu+YU3m673ntHVEpNbCJeGZ3lrSK3fYsTA="; }; patches = [ ./dont-clear-pythonpath.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-file/default.nix index 3fad04838a..0cd6d46988 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-file/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { export LOCAL_PATH="$PWD/.storage" ''; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # very flaky, sandbox issues? # libcloud.storage.types.ContainerDoesNotExistError # sqlite3.OperationalError: attempt to write a readonly database diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/1_4.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/1_4.nix index 4566429235..b741a7710c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -36,21 +36,18 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "1.4.53"; + version = "1.4.54"; pyproject = true; src = fetchFromGitHub { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-CpFvL0W/X7/4N/FpufAdud5o11LHBuox8m+8EailqXg="; + hash = "sha256-6qAjyqMVrugABHssAQuql3z1YHTAOSm5hARJuJXJJvo="; }; postPatch = '' sed -i '/tag_build = dev/d' setup.cfg - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=44,<69.3" "setuptools" ''; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix index 6eaae84d6f..f180d5c6c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { # Test requires network access "test_config_expansions" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test fails with sandbox enabled "test_checksum" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette-admin/default.nix index 41f3a10013..a60768ef42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette-admin/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { export LOCAL_PATH="$PWD/.storage" ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # flaky, depends on test order "test_ensuring_pk" # flaky, of-by-one @@ -99,7 +99,7 @@ buildPythonPackage rec { # needs mongodb running on port 27017 "tests/mongoengine" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # very flaky, sandbox issues? # libcloud.storage.types.ContainerDoesNotExistError # sqlite3.OperationalError: attempt to write a readonly database diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stookwijzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stookwijzer/default.nix index e7ca1728ee..6a2cb56f11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stookwijzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stookwijzer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stookwijzer"; - version = "1.4.9"; + version = "1.4.10"; pyproject = true; src = fetchFromGitHub { owner = "fwestenberg"; repo = "stookwijzer"; rev = "refs/tags/v${version}"; - hash = "sha256-QXCusmbt40Tg73ozl9nIDgMtQJ152uNhOuFyHn+OEA8="; + hash = "sha256-uvmv35rdmqfr+psGQdnb3g2q72qCx4ew3gJdGeun6W8="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix index 1ef214dd0a..71ce1b81aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { typing-extensions tzlocal validators - ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; # pypi package does not include the tests, but cannot be built with fetchFromGitHub doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 1d9ec9df13..3d3bd39ca1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "10.10.0"; + version = "10.12.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gjUfnhBVwhYdw4wIqbv1xLbH8cr/z5EemZpwEjaUFeI="; + hash = "sha256-Wr7ERUjTgUvB4HCqGFK8s/xcwCnpR8D3MxVusfjIcDA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix index d722b36875..20233c1f7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preBuild = '' cd python diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index e1bfc94cea..34cec394a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -103,7 +103,7 @@ buildPythonPackage rec { ''; # darwin has write permission issues - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix index e75998606b..8a6bb95f3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svg-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svg-py/default.nix index b59d23c539..30396791e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svg-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svg-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "svg-py"; - version = "1.4.3"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "orsinium-labs"; repo = "svg.py"; rev = "refs/tags/${version}"; - hash = "sha256-rnxznJM3ihuEJrD3ba6uMdGMozIrLw/QyGzA3JPygH4="; + hash = "sha256-Lxzk3IVCD4PG36Pozz2crccwxCAAAM2QfS4rgwbjs6g="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix index d9a0c20070..9daa9648fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip on macOS because /etc/localtime is accessed through the pendulum # library, which is not allowed in a sandboxed build. "test_create_parser_filter_dates" "test_parse_args" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip on macOS because /etc/localtime is accessed through the pendulum # library, which is not allowed in a sandboxed build. "tests/test_datetime.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 72deddbe14..1e36afd6e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1233"; + version = "3.0.1239"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-PGchoNGaynhKSRxWtW/vV6q1+9mZFTqNOi8hksbIlw0="; + hash = "sha256-clFRMofnDhC+9+cIGfhSq/03rxujG6WDu3xW1PC/hUI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix index e0c4231be4..aab6bc7e9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget') "test_onnx_graph" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fails with a mysterious error in pytorch: # RuntimeError: required keyword attribute 'name' has the wrong type "test_pytorch_graph" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix index fff726f5be..1ad591e13b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { # torch._dynamo.exc.BackendCompilerFailed # Requires a more recent version of triton # Re-enable when https://github.com/NixOS/nixpkgs/pull/328247 is merged + "test_functional" "test_linear" "test_seq" "test_seq_lmbda" @@ -90,7 +91,7 @@ buildPythonPackage rec { "test_map_iter_interrupt_early" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: # OpenMP support not found. "test/test_compile.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index dd80ee581e..7b059969eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -63,7 +63,7 @@ let bazel = bazel_6; bazelTargets = [ ":pip_pkg" ]; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { sha256 = "sha256-TbWcWYidyXuAMgBnO2/k0NKCzc4wThf2uUeC3QxdBJY="; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index b0371e7a20..c187737eee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -45,7 +45,7 @@ # - the source build doesn't work on NVIDIA Jetson platforms # unsupported combination -assert !(stdenv.isDarwin && cudaSupport); +assert !(stdenv.hostPlatform.isDarwin && cudaSupport); let packages = import ./binary-hashes.nix; @@ -160,7 +160,7 @@ buildPythonPackage { rpath = lib.makeLibraryPath (libpaths ++ cudapaths); in - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' # This is an array containing all the directories in the tensorflow2 # package that contain .so files. # diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 31639d48f9..69df6b23d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -107,7 +107,7 @@ let stdenv = if cudaSupport then cudaPackages.backendStdenv - else if originalStdenv.isDarwin then + else if originalStdenv.hostPlatform.isDarwin then llvmPackages.stdenv else originalStdenv; @@ -274,7 +274,7 @@ let ''; }; bazel-build = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then _bazel-build.overrideAttrs (prev: { bazelFlags = prev.bazelFlags ++ [ "--override_repository=rules_cc=${rules_cc_darwin_patched}" @@ -341,16 +341,16 @@ let cudnnMerged ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation Security ] - ++ lib.optionals (!stdenv.isDarwin) [ nsync ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ nsync ]; # arbitrarily set to the current latest bazel version, overly careful TF_IGNORE_MAX_BAZEL_VERSION = true; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; # Take as many libraries from the system as possible. Keep in sync with # list of valid syslibs in @@ -395,7 +395,7 @@ let "wrapt" "zlib" ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "nsync" # fails to build on darwin ] ); @@ -598,12 +598,12 @@ let maintainers = with lib.maintainers; [ abbradar ]; platforms = with lib.platforms; linux ++ darwin; broken = - stdenv.isDarwin + stdenv.hostPlatform.isDarwin || !(xlaSupport -> cudaSupport) || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages) || !(cudaSupport -> cudaPackages ? cudatoolkit); } - // lib.optionalAttrs stdenv.isDarwin { + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix index 90a550f42a..7a550a5c4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { or (throw "unsupported system/python version combination"); }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dependencies = [ ml-dtypes diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix index 7403d9c2af..913226ddc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { rm testpath/cli-32.exe testpath/cli-64.exe ''; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around https://github.com/jupyter/testpath/issues/24 export TMPDIR="/tmp" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix index 725e6adae5..09e83fa1ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix @@ -2,45 +2,57 @@ lib, buildPythonPackage, fetchFromGitHub, - html5lib, + nh3, + pillow, + pytest-cov-stub, pytestCheckHook, pythonOlder, regex, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "textile"; - version = "4.0.2"; - format = "setuptools"; + version = "4.0.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; + owner = "textile"; repo = "python-textile"; - rev = version; - hash = "sha256-WwX7h07Bq8sNsViHwmfhrrqleXacmrIY4ZBBaP2kKnI="; + rev = "refs/tags/${version}"; + hash = "sha256-KVDppsvX48loV9OJ70yqmQ5ZSypzcxrjH1j31DcyfM8="; }; - propagatedBuildInputs = [ - html5lib + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + nh3 regex ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + imagesize = [ pillow ]; + }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --cov=textile --cov-report=html --cov-append --cov-report=term-missing" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "textile" ]; meta = with lib; { description = "MOdule for generating web text"; - mainProgram = "pytextile"; homepage = "https://github.com/textile/python-textile"; + changelog = "https://github.com/textile/python-textile/blob/${version}/CHANGELOG.textile"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "pytextile"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix index ea0f56717d..9244644395 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix @@ -3,17 +3,9 @@ buildPythonPackage, python, fetchFromGitHub, - mkdocs, - twine, arpeggio, click, - future, - setuptools, callPackage, - gprof2dot, - html5lib, - jinja2, - psutil, flit-core, }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index b0754a32de..99126084f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -19,7 +19,6 @@ preshed, pydantic, pytestCheckHook, - python, pythonOlder, setuptools, srsly, @@ -59,7 +58,7 @@ buildPythonPackage rec { setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreFoundation CoreGraphics diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index edde349d41..bb85250dae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -8,22 +8,25 @@ numpy, pytestCheckHook, pythonOlder, + setuptools, zarr, }: buildPythonPackage rec { pname = "tifffile"; - version = "2024.6.18"; - format = "setuptools"; + version = "2024.9.20"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-V+DSoDS8tih+oxVdhxZQjfrIZEOiV/ZQK1fuf4ozs7Y="; + hash = "sha256-P7874vmVpwUaiuBaS+cMlvwHifIu1vHEEEyXPPaKZAs="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ dask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix index ffcead4016..9ce945ebf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix @@ -54,7 +54,7 @@ buildPythonPackage { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix index 94482d7606..e869dc7ddc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.5.2"; + version = "6.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,16 +23,17 @@ buildPythonPackage rec { owner = "jannikmi"; repo = "timezonefinder"; rev = "refs/tags/${version}"; - hash = "sha256-2vQk7aSsyyh3mN1l4A5Y5yASJ2V7e4fegsOExGwyhGA="; + hash = "sha256-8fDKgM6LVe7aJgD4UfTpg0EjKGuudzYsmqniocozmAE="; }; - nativeBuildInputs = [ - cffi + build-system = [ poetry-core setuptools ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ cffi ]; + + dependencies = [ cffi h3 numpy @@ -53,9 +54,9 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/jannikmi/timezonefinder/blob/${version}/CHANGELOG.rst"; description = "Module for finding the timezone of any point on earth (coordinates) offline"; - mainProgram = "timezonefinder"; homepage = "https://github.com/MrMinimal64/timezonefinder"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "timezonefinder"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinygrad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinygrad/default.nix index 387ee63326..92aa341dd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinygrad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinygrad/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { [ numpy ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # pyobjc-framework-libdispatch # pyobjc-framework-metal ]; @@ -177,6 +177,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; # Requires unpackaged pyobjc-framework-libdispatch and pyobjc-framework-metal - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tkinter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tkinter/default.nix index beba9834e7..e051bbf86d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tkinter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tkinter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { mkdir -p $out/${py.sitePackages} mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/ '' - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Update the rpath to point to python without x11Support old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*) new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix index a2a9b7a04e..1af40f588f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Token Bucket Implementation for Python Web Apps"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock index a0324bff8a..aa12731f49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -13,57 +13,58 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" @@ -79,15 +80,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.94" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" [[package]] name = "cfg-if" @@ -97,9 +104,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "console" @@ -111,7 +118,7 @@ dependencies = [ "lazy_static", "libc", "unicode-width", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -135,15 +142,15 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -151,9 +158,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", @@ -165,9 +172,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -207,9 +214,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -219,9 +226,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -229,9 +236,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -242,12 +249,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -261,9 +268,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fnv" @@ -273,9 +280,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -321,13 +328,19 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.11.0" @@ -354,27 +367,27 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -382,9 +395,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "macro_rules_attribute" @@ -404,9 +417,9 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -414,9 +427,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -435,9 +448,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "monostate" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20fffcd8ca4c69d31e036a71abc400147b41f90895df4edcb36497a1f8af8bf" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" dependencies = [ "monostate-impl", "serde", @@ -445,9 +458,9 @@ dependencies = [ [[package]] name = "monostate-impl" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf307cbbbd777a9c10cec88ddafee572b3484caad5cce0c9236523c3803105a6" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", @@ -479,9 +492,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -497,9 +510,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -555,9 +568,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -565,22 +578,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pkg-config" @@ -590,21 +603,24 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -750,18 +766,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -771,9 +787,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -782,9 +798,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -794,22 +810,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -819,18 +835,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", @@ -839,11 +855,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -868,15 +885,15 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.60" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -885,36 +902,37 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -923,7 +941,7 @@ dependencies = [ [[package]] name = "tokenizers" -version = "0.19.1-rc0" +version = "0.20.0-rc1" dependencies = [ "aho-corasick", "derive_builder", @@ -953,14 +971,13 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.19.1-rc0" +version = "0.20.0-rc1" dependencies = [ "env_logger", "itertools 0.12.1", "libc", "ndarray", "numpy", - "onig", "pyo3", "rayon", "serde", @@ -992,9 +1009,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -1010,9 +1027,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "wasi" @@ -1026,126 +1043,99 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index aca17db0e7..edf0c6f378 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -2,24 +2,32 @@ lib, stdenv, linkFarm, - buildPythonPackage, - cargo, - datasets, - huggingface-hub, - fetchFromGitHub, fetchurl, - libiconv, - numpy, - openssl, - pkg-config, - pytestCheckHook, + buildPythonPackage, + fetchFromGitHub, python, - pythonOlder, - requests, - rustPlatform, - rustc, - Security, + + # nativeBuildInputs + pkg-config, setuptools-rust, + rustPlatform, + cargo, + rustc, + + # buildInputs + openssl, + libiconv, + Security, + + # dependencies + huggingface-hub, + numpy, + + # tests + datasets, + pytestCheckHook, + requests, + tiktoken, }: let @@ -28,23 +36,23 @@ let test-data = linkFarm "tokenizers-test-data" { "roberta-base-vocab.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json"; - sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy"; + hash = "sha256-nn9jwtFdZmtS4h0lDS5RO4fJtxPPpph6gu2J5eblBlU="; }; "roberta-base-merges.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt"; - sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w"; + hash = "sha256-HOFmR3PFDz4MyIQmGak+3EYkUltyixiKngvjO3cmrcU="; }; "albert-base-v1-tokenizer.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/albert-base-v1-tokenizer.json"; - sha256 = "1hra9pn8rczx7378z88zjclw2qsdrdwq20m56sy42s2crbas6akf"; + hash = "sha256-biqj1cpMaEG8NqUCgXnLTWPBKZMfoY/OOP2zjOxNKsM="; }; "bert-base-uncased-vocab.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt"; - sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07"; + hash = "sha256-B+ztN1zsFE0nyQAkHz4zlHjeyVj5L928VR8pXJkgOKM="; }; "big.txt" = fetchurl { url = "https://norvig.com/big.txt"; - sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps"; + sha256 = "sha256-+gZsfUDw8gGsQUTmUqpiQw5YprOAXscGUPZ42lgE6Hs="; }; "bert-wiki.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json"; @@ -56,26 +64,24 @@ let }; "openai-gpt-vocab.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json"; - sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x"; + hash = "sha256-/fSbGefeI2hSCR2gm4Sno81eew55kWN2z0X2uBJ7gHg="; }; "openai-gpt-merges.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt"; - sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f"; + hash = "sha256-Dqm1GuaVBzzYceA1j3AWMR1nGn/zlj42fVI2Ui8pRyU="; }; }; in buildPythonPackage rec { pname = "tokenizers"; - version = "0.19.1"; + version = "0.20.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; rev = "refs/tags/v${version}"; - hash = "sha256-sKEAt46cdme821tzz9WSKnQb3hPmFJ4zvHgBNRxjEuk="; + hash = "sha256-uuSHsdyx77YQjf1aiz7EJ/X+6RaOgfmjGqHSlMaCWDI="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -94,20 +100,21 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; dependencies = [ - numpy huggingface-hub + numpy ]; nativeCheckInputs = [ datasets pytestCheckHook requests + tiktoken ]; postUnpack = '' @@ -127,17 +134,23 @@ buildPythonPackage rec { "test_encode_special_tokens" "test_splitting" "TestTrainFromIterators" + # Those tests require more data "test_from_pretrained" "test_from_pretrained_revision" "test_continuing_prefix_trainer_mistmatch" ]; - meta = with lib; { + disabledTestPaths = [ + # fixture 'model' not found + "benches/test_tiktoken.py" + ]; + + meta = { description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; homepage = "https://github.com/huggingface/tokenizers"; - license = licenses.asl20; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix index 03bb2f2ea8..9548f2d776 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tololib" ]; # Network discovery doesn't work in the sandbox for darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix index 4ecaac16be..bcd5008984 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix @@ -1,34 +1,41 @@ { lib, stdenv, - buildPythonPackage, - autoAddDriverRunpath, - fetchurl, python, - pythonAtLeast, + buildPythonPackage, pythonOlder, + pythonAtLeast, + fetchurl, + + # nativeBuildInputs addDriverRunpath, - callPackage, - cudaPackages, - future, - numpy, + autoAddDriverRunpath, autoPatchelfHook, + + # buildInputs + cudaPackages, + + # dependencies + filelock, + future, + jinja2, + networkx, + numpy, pyyaml, requests, setuptools, - typing-extensions, sympy, - jinja2, - networkx, - filelock, + typing-extensions, triton, + + callPackage, }: let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.4.0"; + version = "2.4.1"; in buildPythonPackage { inherit version; @@ -42,13 +49,13 @@ buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ addDriverRunpath - autoPatchelfHook autoAddDriverRunpath + autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux ( + buildInputs = lib.optionals stdenv.hostPlatform.isLinux ( with cudaPackages; [ # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships @@ -68,7 +75,7 @@ buildPythonPackage { ] ); - autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [ + autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isLinux [ # This is the hardware-dependent userspace driver that comes from # nvidia_x11 package. It must be deployed at runtime in # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather @@ -77,24 +84,24 @@ buildPythonPackage { ]; dependencies = [ + filelock future + jinja2 + networkx numpy pyyaml requests setuptools - typing-extensions sympy - jinja2 - networkx - filelock - ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ triton ]; + typing-extensions + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ]; postInstall = '' # ONNX conversion rm -rf $out/bin ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib" ''; @@ -105,7 +112,7 @@ buildPythonPackage { extraRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ "${lib.getLib cudaPackages.cuda_nvrtc}/lib" ]; - postPhases = lib.optionals stdenv.isLinux [ "postPatchelfPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "postPatchelfPhase" ]; postPatchelfPhase = '' while IFS= read -r -d $'\0' elf ; do for extra in $extraRunpaths ; do diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix index 8a2cbc2ffa..1db23d136b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.4.0" = { + "2.4.1" = { x86_64-linux-38 = { - name = "torch-2.4.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-ikebcXQK+SpOG5kEW+qDHz2nMYfIw+PSErHm/jkxWyE="; + name = "torch-2.4.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-y09QL5ELR+HjZsz3sjHawpZ9LvtH1LjLM/xjtLxe7tg="; }; x86_64-linux-39 = { - name = "torch-2.4.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-iIObriuWfdOFeaqwu6lRDpKxHau8Th3V5jDF/WVfXac="; + name = "torch-2.4.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-mYatNVXd//Vekl2CmPiytJEGp9xg+BGiB2pEX+RFjis="; }; x86_64-linux-310 = { - name = "torch-2.4.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-KL+6CE3KUqBsRl160PPMNyw1/FA/PquIHMF6X9gpFOc="; + name = "torch-2.4.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-ml8LEDz+hAs1aEFqpQZ/bnuf7GfZxWWf1DsSB0UP6XU="; }; x86_64-linux-311 = { - name = "torch-2.4.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-qf/zLTZeDHS2kJSAVIsuKRMUogStsptrtvLG0z+L4mw="; + name = "torch-2.4.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-kU0Sjlq8u+ecobnrUxGxhURPGy1xF99VX+QYSH7PuJQ="; }; x86_64-linux-312 = { - name = "torch-2.4.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-SaxVpkl93W0M3VG16ifY6+IMknMHeFXpyW6w3CifB8M="; + name = "torch-2.4.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-q0kWELFVUeCNp0urKdCTPmvxC6tE+31LEyjx6EXAWlM="; }; aarch64-darwin-38 = { - name = "torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-OvTeKmGPsGXnhATEuieoGKe3lX6u/yjGxmzn+1BLaLg="; + name = "torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-X8HU1+0mXvhTV5yvJyaG0e2Hzr3NBPKkmPgA/8U9q3E="; }; aarch64-darwin-39 = { - name = "torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-iUD8i5ekxh/bXUajaPIfSjpWKheHnpMutRpexiMQyzE="; + name = "torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-o43igD7mBQMJqsAyZ2U2w9O2qYBCSFN+OOCY0OFIF+w="; }; aarch64-darwin-310 = { - name = "torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-aFQYq5NzDvvucVKIIf9UAFWWlw3Ul78DyJIE+34/cd4="; + name = "torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-02qO8QD1v/Ppw86pNLng1+onfLghDHFS00qabFgw6t0="; }; aarch64-darwin-311 = { - name = "torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-8Wm06m3JOzozMZYR/MR9wUBuTdU5hE3L0t7EwbluFm0="; + name = "torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-3d29iwZudDk0pCALPVQmekbbAhBodtIc8x99p6lvmOo="; }; aarch64-darwin-312 = { - name = "torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-karwC/4f+kTcW1KAnZqVEp/KECEuyjrCZCDrEXJ8Yog="; + name = "torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-crSE1bbOwac1vz+locSIPQF0hpjF6c/b60/6t8eYfg0="; }; aarch64-linux-38 = { - name = "torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-nrqD+Kj5hUL5F+OQAMkD8VRlWs9jdcBzz81DBqFU64A="; + name = "torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-Vq0qdgt6eIJyWh7r9WV6u7O1FE6ya8tHtSBZNXRjxUg="; }; aarch64-linux-39 = { - name = "torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-J4akfI2N7BdvxnnSqrmm9UnCVFJRC0llCrE0E1JmujM="; + name = "torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-FJUTLzD3Iq8aCRlQCIuuo4P+OZA9sGsg5pNv2ZQCgD4="; }; aarch64-linux-310 = { - name = "torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-fBWeidTs8IQD+dE3PVVEIiQLmxFGoKGRKQadw1enKys="; + name = "torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-+iewSNMhmM2m6c/wv3aOhoPZh0OQO35dKx9QmN7R00M="; }; aarch64-linux-311 = { - name = "torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-OBacsPHmcnw9rI2si5pI0HKkn2Q7kIqZFV7x2Bthves="; + name = "torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-ML4oRNDJORYaEQc7+69kXxx8tD9i9GzG5N8cEZ+yp5g="; }; aarch64-linux-312 = { - name = "torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-7IY1E1C716vqNDb6b0Iws7C793oibkS6RhhA4gT8zXE="; + name = "torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-NhCUMrEL1xY8mzDOiW88LMobhrl2X5VqFZTw/0MJHio="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index bd6b1b2628..7b5b8e9f67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -53,7 +53,7 @@ click, typing-extensions, # ROCm build and `torch.compile` requires `triton` - tritonSupport ? (!stdenv.isDarwin), + tritonSupport ? (!stdenv.hostPlatform.isDarwin), triton, # Unit tests @@ -62,7 +62,7 @@ # Disable MKLDNN on aarch64-darwin, it negatively impacts performance, # this is also what official pytorch build does - mklDnnSupport ? !(stdenv.isDarwin && stdenv.isAarch64), + mklDnnSupport ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64), # virtual pkg that consistently instantiates blas across nixpkgs # See https://github.com/NixOS/nixpkgs/pull/83888 @@ -193,7 +193,7 @@ let brokenConditions = attrsets.filterAttrs (_: cond: cond) { "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport; - "CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux; + "CUDA is not targeting Linux" = cudaSupport && !stdenv.hostPlatform.isLinux; "Unsupported CUDA version" = cudaSupport && !(builtins.elem cudaPackages.cudaMajorVersion [ @@ -214,7 +214,7 @@ in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.4.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -232,7 +232,7 @@ buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-s49rtarGNNFpnNG+kfJtZLE8ND53Ma201I0cOjeFSts="; + hash = "sha256-x/zM/57syr46CP1TfGaefSjzvNm4jJbWFZGVGyzPMg8="; }; patches = @@ -242,7 +242,7 @@ buildPythonPackage rec { ./passthrough-python-lib-rel-path.patch ] ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -250,7 +250,7 @@ buildPythonPackage rec { # pthread support. ./pthreadpool-disable-gcd.diff ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Propagate CUPTI to Kineto by overriding the search path with environment variables. # https://github.com/pytorch/pytorch/pull/108847 ./pytorch-pr-108847.patch @@ -296,7 +296,8 @@ buildPythonPackage rec { # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + - lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace-fail '#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) inline void *aligned_alloc(size_t align, size_t size)' '#if 0 @@ -492,8 +493,8 @@ buildPythonPackage rec { ) ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ] - ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreServices libobjc @@ -600,7 +601,7 @@ buildPythonPackage rec { mkdir -p "$cxxdev/nix-support" printWords "''${propagatedCxxBuildInputs[@]}" >> "$cxxdev/nix-support/propagated-build-inputs" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $(ls $lib/lib/*.dylib); do install_name_tool -id $lib/lib/$(basename $f) $f || true done @@ -620,7 +621,7 @@ buildPythonPackage rec { # This is a quick hack to add `libnvrtc` to the runpath so that torch can find # it when it is needed at runtime. extraRunpaths = lib.optionals cudaSupport [ "${lib.getLib cudaPackages.cuda_nvrtc}/lib" ]; - postPhases = lib.optionals stdenv.isLinux [ "postPatchelfPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "postPatchelfPhase" ]; postPatchelfPhase = '' while IFS= read -r -d $'\0' elf ; do for extra in $extraRunpaths ; do diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix index 31b119a264..d9aa2b6de3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix @@ -1,22 +1,28 @@ { lib, stdenv, - addDriverRunpath, - autoPatchelfHook, buildPythonPackage, - cudaPackages, + python, fetchurl, + pythonOlder, + pythonAtLeast, + + # buildInputs + cudaPackages, ffmpeg_6, sox, - pythonAtLeast, - pythonOlder, - python, + + # nativeBuildInputs + addDriverRunpath, + autoPatchelfHook, + + # dependencies torch-bin, }: buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.0"; + version = "2.4.1"; format = "wheel"; src = @@ -35,7 +41,7 @@ buildPythonPackage rec { ffmpeg_6.dev sox ] - ++ lib.optionals stdenv.isLinux ( + ++ lib.optionals stdenv.hostPlatform.isLinux ( with cudaPackages; [ # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships @@ -48,14 +54,14 @@ buildPythonPackage rec { ] ); - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook addDriverRunpath ]; dependencies = [ torch-bin ]; - preInstall = lib.optionals stdenv.isLinux '' + preInstall = lib.optionals stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 53004bc2c0..ea62ccc724 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.4.0" = { + "2.4.1" = { x86_64-linux-38 = { - name = "torchaudio-2.4.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-HbbFZ4nETaygQRxSMYg6d3Omqxbx6uSrXrUzRt71RTw="; + name = "torchaudio-2.4.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-/PvxFpkpX2WwRYHNBDcv4CojmAbrfSXaJ0bzXeD10tk="; }; x86_64-linux-39 = { - name = "torchaudio-2.4.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-5wG1xXOR9ApLTdWQtt8eGt+83GwT6zfEW+Kay4pz5vQ="; + name = "torchaudio-2.4.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-cbuwbBAYeZ2zoLzAlN0IuAvCi7e18nq4sOLziwFLEcY="; }; x86_64-linux-310 = { - name = "torchaudio-2.4.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-R+F2Pr3UEID6Otlv9OTyKHgxz6jd51IzrRMpxhOr2lA="; + name = "torchaudio-2.4.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-2oyHyAocE3akjcM+7zCwO73x3yWgW9KxxiC4gRx7Gb4="; }; x86_64-linux-311 = { - name = "torchaudio-2.4.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-KcjEOkm0MDZnvyDNhcP26borSg+0tqrsLgKzstbMbOo="; + name = "torchaudio-2.4.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-AbBO25E1p9YPoBAPwB/7QKCFgBD1ma5kGPQOCeiOaBs="; }; x86_64-linux-312 = { - name = "torchaudio-2.4.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-gTwbojelvYBZo0BOav9xtc09SXmtCV3PreFZJoCFUDE="; + name = "torchaudio-2.4.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-a3TXBquoHbX4OMpBTwPT9lmOqIC3IQYGXbycXTwGP+E="; }; aarch64-darwin-38 = { - name = "torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-/D+OzW8Lv8ZU07xSdWp8o1nx2ItPoCkOHNt2OjExt7k="; + name = "torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-TqD9ABQv55XHW8wgowOYG1byMnx/fTIbQqj+8deKr6k="; }; aarch64-darwin-39 = { - name = "torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-H9ZwyAjjIsEBlXoHZR4pk1+G7DiSQ8DEOiTt16GFSEE="; + name = "torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-OtzlUIUJArmqbNI3jM1yCsnsjPMeLrqXQ8zIT/y+dtY="; }; aarch64-darwin-310 = { - name = "torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-cz6dhZuI2r7+rwCOOrK4x4hbKUZgaLS3mkJ2a+RhnkY="; + name = "torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-ZhkJdRkJNAsk9jdBDf7AKoiIZ4FsPbGe1PQQKuEFJEo="; }; aarch64-darwin-311 = { - name = "torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-rLz5Ep/8/OgIJU4sv/EDNjxQXOBu1MQjGz9DahBnnU0="; + name = "torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-YK8VMYFdImWeVBLqQBvtVSoWw4mTjElmTkRuTP1d3AY="; }; aarch64-darwin-312 = { - name = "torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-rhOpXvb6vK2w7/NthfUEjXBHSi6XBPqchumQPLzsDUo="; + name = "torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-lTlGz2EP/Ve7P90ijv+iES+lHF3+NqlmEe/8kHSj074="; }; aarch64-linux-38 = { - name = "torchaudio-2.4.0-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-1/6efy/oJQ/eB7IDVsRNdw1fqjyid6vc2jr31IQEj7o="; + name = "torchaudio-2.4.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-dNGc+co9rTlK/Ku35vftmrn1nyVA1QKCbH7D4zmFJR0="; }; aarch64-linux-39 = { - name = "torchaudio-2.4.0-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-yECJTeEqbdPqV8uw0AhhI6qkgAG6Otme9xT+AJ6ujrk="; + name = "torchaudio-2.4.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-NsfnvGs1jL9Ct2nIAgZ4D6FJfRQamFxrPndo3kRSTpo="; }; aarch64-linux-310 = { - name = "torchaudio-2.4.0-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-F8tz1DNncdRVzY3ai0iRMHpTRriQpOax1Lc9VlJY/uE="; + name = "torchaudio-2.4.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-VEMRedmpzPP+6umKrOB9ifrp/XKOK8hlbvvXDn7cxvg="; }; aarch64-linux-311 = { - name = "torchaudio-2.4.0-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-vpacCUZts14Nebiwnf9myu27lWm0LJA6LV4Nsq92Djw="; + name = "torchaudio-2.4.1-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-dkCq/7IFbhLykGGHsDoiIooJCMh9ApX930sLkjNKKQs="; }; aarch64-linux-312 = { - name = "torchaudio-2.4.0-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-U00ZB7slLs0rqeHWHP9yIP1mCQ5j33s8EJzqd6GdTLg="; + name = "torchaudio-2.4.1-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-W2L8exbtcIsMB9Q5MTd5fpL2P8O9VwVgfZe6app88/A="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix index f736036b13..760ea740b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix @@ -1,12 +1,16 @@ { lib, + symlinkJoin, buildPythonPackage, fetchFromGitHub, + + # nativeBuildInputs cmake, - symlinkJoin, - ffmpeg-full, pkg-config, ninja, + + # buildInputs + ffmpeg-full, pybind11, sox, torch, @@ -72,14 +76,14 @@ let in buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.0"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-ltBPoFDA7GS9XRHyWeTRn1YTVqdaE/38KnkG4fp7Th8="; + hash = "sha256-zQqIIzOW9vboP5XQSOUWB0edz6XJvz06RqbcYPO9K24="; }; patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix index c0aae74f17..3fbfe404fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { # tries to download models: "test_load_all" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "test_queue_multiprocessing" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix index dc1e66156a..c28ce3f55e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { # https://github.com/pytorch/torchsnapshot/issues/175 pythonAtLeast "3.12" # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - || stdenv.isDarwin; + || stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index 27dd914d77..ea03954c14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -1,15 +1,21 @@ { lib, stdenv, + python, + buildPythonPackage, + fetchurl, + pythonOlder, + pythonAtLeast, + + # buildInputs + cudaPackages, + + # nativeBuildInputs addDriverRunpath, autoPatchelfHook, - buildPythonPackage, - cudaPackages, - fetchurl, - pythonAtLeast, - pythonOlder, + + # dependencies pillow, - python, torch-bin, }: @@ -17,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.19.0"; + version = "0.19.1"; in buildPythonPackage { inherit version; @@ -33,15 +39,15 @@ buildPythonPackage { # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. buildInputs = with cudaPackages; - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships # libcudart.$hash.so.11.0 cuda_cudart ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - autoPatchelfHook + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ addDriverRunpath + autoPatchelfHook ]; dependencies = [ @@ -54,7 +60,7 @@ buildPythonPackage { pythonImportsCheck = [ "torchvision" ]; - preInstall = lib.optionalString stdenv.isLinux '' + preInstall = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix index 177a3ae30a..43ab9f1790 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.19.0" = { + "0.19.1" = { x86_64-linux-38 = { - name = "torchvision-0.19.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-5GynSUL5Of12jXr29wqhfAciLKj6abBXtAi05u29bys="; + name = "torchvision-0.19.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-MFL5ci3Dn9fwJrRKb73vk6so95UgBwEs6E0xPWeWQBE="; }; x86_64-linux-39 = { - name = "torchvision-0.19.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-R2KGR72zWQyauWXvtwhTMA1eHGh1lRHumUpvH5fywSM="; + name = "torchvision-0.19.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-FFMN7gzEx8BgJPC9zJV/d94NK5DptyIZ3NYh+ilSXQA="; }; x86_64-linux-310 = { - name = "torchvision-0.19.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-XuEDx+tH+LCIN+DkixePfsyR12nSthJAuQy1qi0Gznc="; + name = "torchvision-0.19.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-uMxL84G3VSKZW2AeB6G0M7X9kl3D40p/ps0i9EnWU3k="; }; x86_64-linux-311 = { - name = "torchvision-0.19.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-NpTVJ7SPribGrEpDWWC4tXk9YcXxQgtr77lLM8mm/Ng="; + name = "torchvision-0.19.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-U2QXNAaUspzFTDCFB9CYsAy9zB/oaAcqNLVTvtc9nTA="; }; x86_64-linux-312 = { - name = "torchvision-0.19.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-9M7FuSc1N6VG5V6eCI++01kM+2kn+IFX1K/s7iPBJek="; + name = "torchvision-0.19.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-+wzQYi40nfhK1zutjrvqaxx08DPa3YTZqAz0opGSfq4="; }; aarch64-darwin-38 = { - name = "torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-hU6WehapQJ6UG1u+WqNXsj9xWLzLneNa4g/UlF8F7NE="; + name = "torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-TE5PWyTqawh7Au1JKrHiG7ozUsRXfi3vFCSM/GBzIzg="; }; aarch64-darwin-39 = { - name = "torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-3RJ5Vx1LaNWlPZt6Na7fkcTLHgsICZ9qHv+nsluMlec="; + name = "torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-cx9DTZFYZ2niVbXXDtGkRX4KE5SpX0qs8OHn4h+AwJg="; }; aarch64-darwin-310 = { - name = "torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-7IdO+F3LJMaeYA9uJ2r4ksgM3j/9rrcnXv2kYyQrwqg="; + name = "torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-VOhRMJnm9YY1bHD4CdNPORr3GtGC/gccwyiiivLEBgg="; }; aarch64-darwin-311 = { - name = "torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-2/OqcaOJkkT8iEMD7TxGBKFggk/vrHfoIxelRj78HZs="; + name = "torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-QFFCgrSJbWJ2W44m1wkcMuF8NYF9AOxL4jYuo7o9F4c="; }; aarch64-darwin-312 = { - name = "torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-wJ747RhPqHf2JRtiAibnT2grjx1rNBRWQo1JVbjZxnA="; + name = "torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-J+zid/8PbNx/7QYnJ5xjLcsuWBh9p3HsoksPvPP4WQ0="; }; aarch64-linux-38 = { - name = "torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-B5ppbgsstS5L4wr6jps9fSgPAqK1/+3X6CH6Hv0aWo0="; + name = "torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-TRC8kIPE1frdft17cpcAp75I2rT2InjfO8c/pI5IoVU="; }; aarch64-linux-39 = { - name = "torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-X5pZjc+CvfyORDbOdHY7OHfavsOzP5RhO5Tt4T4+Te4="; + name = "torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-4ygwm4ZwouiJsv52ocJ0SgmcEcmE2pqCI1e9nevWmaU="; }; aarch64-linux-310 = { - name = "torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-1GfUNABf0Foieiunr0xZG7Z+bUqXu9Bu2o2oP0Pp/Qc="; + name = "torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-ewYxFhZL5S/G3rR2Lef4yQv6OmX41crxf44tWq3HWgQ="; }; aarch64-linux-311 = { - name = "torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-Tmqk+j8Lw1mfoHHBSeZRo+a91nyRYXlEePn5FHHEBqI="; + name = "torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-1xpqb+OlKByjSH1MVq1KrSD/cPgvHXx5vLbnsMKvAMg="; }; aarch64-linux-312 = { - name = "torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-vg8noouOnyrpijGvNKS90qW/FU2SvXOleXyNIVb7OrY="; + name = "torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-wHv0PCoUXXkuzZ0FA9bHNXcUfs5QjUVgDYqsd+TN/Pk="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index b25fdc2c42..e00846c824 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -1,16 +1,24 @@ { + lib, + torch, buildPythonPackage, fetchFromGitHub, - lib, - libjpeg_turbo, + + # nativeBuildInputs libpng, ninja, + which, + + # buildInputs + libjpeg_turbo, + + # dependencies numpy, pillow, - pytest, scipy, - torch, - which, + + # tests + pytest, }: let @@ -18,7 +26,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.19.0"; + version = "0.19.1"; in buildPythonPackage { inherit pname version; @@ -27,7 +35,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-OVwdEqKEoZR1jtcg4ODyvIZvP9UQPodPv8qnTqbA/pc="; + hash = "sha256-UMBFR/Vw13A+bBfr0p3rRwpCRVMq+ihdlG3C/iuOC30="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix index a12ffea156..91945de8dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # specifically needed for darwin export HOME=$(mktemp -d) mkdir -p $HOME/.matplotlib @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 066732b8b9..67e822faca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.44.2"; + version = "4.45.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-2nMt1orhQCTkHG0HKwqVyB7mQeJh7O6I3Eftv2bnnIc="; + hash = "sha256-MVgDNSeoqad9v5TEVuUoLYvThyjGyCuOg8Z/F7+URng="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 74ce55dd4b..545e5667da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { "test_diagram" "test_ordered_with_graph" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Upstream issue https://github.com/pygraphviz/pygraphviz/issues/441 "test_binary_stream" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treescope/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treescope/default.nix new file mode 100644 index 0000000000..c27e95cdff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/treescope/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + flit-core, + + # dependencies + numpy, + + # optional-dependencies + ipython, + jax, + palettable, + + # tests + absl-py, + jaxlib, + pytestCheckHook, + torch, +}: + +buildPythonPackage rec { + pname = "treescope"; + version = "0.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "google-deepmind"; + repo = "treescope"; + rev = "refs/tags/v${version}"; + hash = "sha256-+Hm60O9tEXIiE0av1O0BsOdMln4e1s7ijb3WNiQ74jE="; + }; + + build-system = [ flit-core ]; + + dependencies = [ numpy ]; + + optional-dependencies = { + notebook = [ + ipython + jax + palettable + ]; + }; + + pythonImportsCheck = [ "treescope" ]; + + nativeCheckInputs = [ + absl-py + jax + jaxlib + pytestCheckHook + torch + ]; + + meta = { + description = "An interactive HTML pretty-printer for machine learning research in IPython notebooks"; + homepage = "https://github.com/google-deepmind/treescope"; + changelog = "https://github.com/google-deepmind/treescope/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 302c5d9756..62c94ce4bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { mnemonic requests typing-extensions - ] ++ lib.optionals stdenv.isLinux [ trezor-udev-rules ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix index 39a9ee4baa..2804bcaa76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "test_client_connect_networking_error" "test_finalization_dropped_exception" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Failed: DID NOT RAISE "test_finalization_dropped_exception" # Timing related diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix index b4e37ee448..968d67b27a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; # tests are failing on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ astor diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 8a2bdcfd5d..b12ef6e906 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { homepage = "http://www.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; license = licenses.gpl3Plus; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ udono johbo diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttfautohint-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttfautohint-py/default.nix index 60ded9cc82..98358555ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttfautohint-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttfautohint-py/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ttfautohint" ]; meta = { - description = "Command line utility and Python library that merges two UFO source format fonts into a single file"; + description = "Python wrapper for ttfautohint, a free auto-hinter for TrueType fonts"; homepage = "https://github.com/fonttools/ttfautohint-py"; changelog = "https://github.com/fonttools/ttfautohint-py/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix index ffeee44aa8..100a7d42d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -138,7 +138,7 @@ buildPythonPackage rec { substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' echo 'PTYProcessTestsBuilder_EPollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'PTYProcessTestsBuilder_PollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'UNIXTestsBuilder_EPollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py @@ -149,7 +149,7 @@ buildPythonPackage rec { substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded.skip = "exit code 120"' >> src/twisted/internet/test/test_process.py @@ -175,7 +175,9 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.http2 ++ passthru.optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls; + ++ lib.optionals ( + !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + ) passthru.optional-dependencies.tls; checkPhase = '' export SOURCE_DATE_EPOCH=315532800 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix index 6c6f7c86b3..66329d3b09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix @@ -4,42 +4,33 @@ automat, buildPythonPackage, cryptography, - fetchpatch2, fetchPypi, geoip, - incremental, lsof, mock, pytestCheckHook, pythonOlder, + setuptools, twisted, zope-interface, }: buildPythonPackage rec { pname = "txtorcon"; - version = "23.11.0"; - format = "setuptools"; + version = "24.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cfha6T121yZRAFnJ7XTmCLxaXJ99EDhTtJ5BQoBAai8="; + hash = "sha256-vv4ZE42cjFMHtu5tT+RG0MIB/9HMQErrJl7ZAwmXitA="; }; - patches = [ - # https://github.com/meejah/txtorcon/pull/400 - (fetchpatch2 { - name = "twisted-24.7.0-fixes.patch"; - url = "https://github.com/meejah/txtorcon/commit/88b5dc2971514babd36d837c93550715dea44b09.patch"; - hash = "sha256-O7kFZw+y1PHJRcMdxCczy8UZd3ruLhjLMxh2tcawWI4="; - }) - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography - incremental twisted automat zope-interface @@ -52,7 +43,9 @@ buildPythonPackage rec { geoip ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); + + pythonImportsCheck = [ "txtorcon" ]; meta = with lib; { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix index 9839f6d6c5..74bb969473 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { # fails also on Linux "test_show_completion" "test_install_completion" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "test_install_completion" ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "test_install_completion" ]; pythonImportsCheck = [ "typer" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index c9c354d5dd..230615d276 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -60,1414 +60,1414 @@ let in rec { types-aiobotocore-accessanalyzer = - buildTypesAiobotocorePackage "accessanalyzer" "2.15.0" - "sha256-aXiUguHjVb9uw4bM1jpJLEFDSJGPEwPVBXUOSylrJUU="; + buildTypesAiobotocorePackage "accessanalyzer" "2.15.1" + "sha256-DALSwzPriQHPReCA4DxiqDE4egt1d0kVadDLqXSEV6k="; types-aiobotocore-account = - buildTypesAiobotocorePackage "account" "2.15.0" - "sha256-frvRCAYh+zn8k1AXzGQuH84QnhXyIiUR7BZBZfH5Vao="; + buildTypesAiobotocorePackage "account" "2.15.1" + "sha256-7VNgcslaFFeprI+G9Owfj24o8CFmGxqct4QWSGgxwI8="; types-aiobotocore-acm = - buildTypesAiobotocorePackage "acm" "2.15.0" - "sha256-au29Nkw94QcHk1c+CCsaNBM+6bkOPPr17yj5naKlFJI="; + buildTypesAiobotocorePackage "acm" "2.15.1" + "sha256-ItdsLbXVs92zb9JDwuHHvYVKArUAAeDUdt6tPxNikV0="; types-aiobotocore-acm-pca = - buildTypesAiobotocorePackage "acm-pca" "2.15.0" - "sha256-xLhR9zReaQ4O2ka8SJh6KOEvcoWm/fs+gC7PtRNQtTw="; + buildTypesAiobotocorePackage "acm-pca" "2.15.1" + "sha256-JSvY8qqA91SUMXs7ajfVQ6wZFNHc2XisO2haiygJg8o="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0" "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; types-aiobotocore-amp = - buildTypesAiobotocorePackage "amp" "2.15.0" - "sha256-nMLt8ZITr0zwrnG6v12XgpKtuvggXbhCaozMzF6Ng9c="; + buildTypesAiobotocorePackage "amp" "2.15.1" + "sha256-RJKzIa6b/ov0xpayGBgDVW2DUjIo0xNfDDh2hAvK918="; types-aiobotocore-amplify = - buildTypesAiobotocorePackage "amplify" "2.15.0" - "sha256-L4P4YRaKsIJkhDT1aOjEs5NxnnXyZoRSPZbIVI0iCfE="; + buildTypesAiobotocorePackage "amplify" "2.15.1" + "sha256-TNhrmgAjuJLBLXU2dlp+Ri8pJ+swgjXu1lJFGUnLEfQ="; types-aiobotocore-amplifybackend = - buildTypesAiobotocorePackage "amplifybackend" "2.15.0" - "sha256-bgOAbDajiuw3GQ15XRK6QJoSc+RwjQY1sZt+lLhGONA="; + buildTypesAiobotocorePackage "amplifybackend" "2.15.1" + "sha256-T2mqIUobrEepz6vS/VLWq8OpUZTYRMme0SgWv+UtxmQ="; types-aiobotocore-amplifyuibuilder = - buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.0" - "sha256-N4OTBb2LW3JFJLzE6OeDPAzpjUcSlwPEVezaVelE++o="; + buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.1" + "sha256-oFgte9lbXb9IM3Ezn0Jmd5djrLwgJLqeDePdBb5OZrI="; types-aiobotocore-apigateway = - buildTypesAiobotocorePackage "apigateway" "2.15.0" - "sha256-B+QNyR9jyv1+SKTj0fq6qlq1vwQ5yxhf9yvkIjc+AWA="; + buildTypesAiobotocorePackage "apigateway" "2.15.1" + "sha256-3gDSD6Z28yicogEeDv2i/rcmh7X9nRWrwxRL0YFZIpc="; types-aiobotocore-apigatewaymanagementapi = - buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.0" - "sha256-cNIPbJvmZltZ089CfkfxenyTtJUC/+ETCyEDDlzwLOg="; + buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.1" + "sha256-3NC66/pp4F8GsH40z0mBoaLqIKyPHGpgEAGgOnOOAGI="; types-aiobotocore-apigatewayv2 = - buildTypesAiobotocorePackage "apigatewayv2" "2.15.0" - "sha256-PfwYm2wklpMZdH/DXKOMlOmozwl8PWY/dnGKZ+vDHVM="; + buildTypesAiobotocorePackage "apigatewayv2" "2.15.1" + "sha256-qsiFXNECUVFDrreYOi2MLa655WAECXuPqi11z8liVN4="; types-aiobotocore-appconfig = - buildTypesAiobotocorePackage "appconfig" "2.15.0" - "sha256-jhXyfuEWN+hc9R3K2zU5DeiIPuz7Gl9GxQBs1VecCZo="; + buildTypesAiobotocorePackage "appconfig" "2.15.1" + "sha256-QPhmF5urmZBb+e7KAIJihDujuDAopgQqrBspAxD6YJ4="; types-aiobotocore-appconfigdata = - buildTypesAiobotocorePackage "appconfigdata" "2.15.0" - "sha256-rLhZ4JpFtHlBfWgaRl1Y1BkGdy3L0pIK52zni/Jd1UU="; + buildTypesAiobotocorePackage "appconfigdata" "2.15.1" + "sha256-1rQCSuTShglGMwqcxiVULSbmgzpUZmubTgqlum5EeqE="; types-aiobotocore-appfabric = - buildTypesAiobotocorePackage "appfabric" "2.15.0" - "sha256-PtAaUmLoCVRs2UFarVzJSdMjftYrRz4pjb7nraMIAys="; + buildTypesAiobotocorePackage "appfabric" "2.15.1" + "sha256-l/dJepTAEpsV3eJWzMbw43SrqgWuL1I3IVlVQQzZPSM="; types-aiobotocore-appflow = - buildTypesAiobotocorePackage "appflow" "2.15.0" - "sha256-Yz7cnhD8peXaYwC4sLbAcjsQFDWWnq4VZKTAOJ3M5YA="; + buildTypesAiobotocorePackage "appflow" "2.15.1" + "sha256-v30RZvCTHOMxsypX+Id5W7VEPC4QFYvRklPu9zaJ9x4="; types-aiobotocore-appintegrations = - buildTypesAiobotocorePackage "appintegrations" "2.15.0" - "sha256-azLPzqojFnj11d8Hw45c+VuZgG/J3KGUhOYD+R7ZwK8="; + buildTypesAiobotocorePackage "appintegrations" "2.15.1" + "sha256-ceiFklxI0RK06gj2ZQcvpGyW903SOxXA654MzRy3A7U="; types-aiobotocore-application-autoscaling = - buildTypesAiobotocorePackage "application-autoscaling" "2.15.0" - "sha256-NvY9zOt9xDFh0XgUSyAQ1obzttIj8BXOa8qBWjJ/VLs="; + buildTypesAiobotocorePackage "application-autoscaling" "2.15.1" + "sha256-P9XULdNPREbu2xksZXIIxZUEggYlU3j0Jo7RzFKMawk="; types-aiobotocore-application-insights = - buildTypesAiobotocorePackage "application-insights" "2.15.0" - "sha256-g4NHKgSExk9Xb6xmNm8kTdrWP473KN+AHs1vw9l6yL0="; + buildTypesAiobotocorePackage "application-insights" "2.15.1" + "sha256-nvNJsUkMwJd41vlj7pKEn37f1Ab4l4WAJbYGqfxCmZw="; types-aiobotocore-applicationcostprofiler = - buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.0" - "sha256-AZG2e70N6u+tYQF9rsxG/kCO/fCJiBtvmdaSQvEwLLo="; + buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.1" + "sha256-/rMS/1K9dGzW89Rzd6sg9o/L56kNAO0bkDUTNKsKxxI="; types-aiobotocore-appmesh = - buildTypesAiobotocorePackage "appmesh" "2.15.0" - "sha256-Qn/Nw8OnHixSWzjJPxN2T7B8mzscpDdBNgjNrefOgmM="; + buildTypesAiobotocorePackage "appmesh" "2.15.1" + "sha256-yPEPmU3CVzddnsFd2CQp+eAji1+/bH/Vvhv6D2JbjvM="; types-aiobotocore-apprunner = - buildTypesAiobotocorePackage "apprunner" "2.15.0" - "sha256-rjBxiphEQxs5/OZVEPDM45YIivDCrjVkkK4bLbUgvDM="; + buildTypesAiobotocorePackage "apprunner" "2.15.1" + "sha256-gzzXHrMC0MF9RykwGmZiUtgufuRPrmGekVicXzdlFw8="; types-aiobotocore-appstream = - buildTypesAiobotocorePackage "appstream" "2.15.0" - "sha256-tlmIQ+6d7lNhZiDtSiF6SodUtwLTJJkJSofMb5YUW1Q="; + buildTypesAiobotocorePackage "appstream" "2.15.1" + "sha256-qbiOK2G95NdBTt1AmrQsDJbz885ugrdRBXMb9ZQcssE="; types-aiobotocore-appsync = - buildTypesAiobotocorePackage "appsync" "2.15.0" - "sha256-kR3BQccO7l3TixcVmDOVu41t5gJPBpFedgk5uPLuDxU="; + buildTypesAiobotocorePackage "appsync" "2.15.1" + "sha256-WYgJ2GLOxy/Va+ZY7DwwX7pBFF4zv1iQ8rptFoOlFsA="; types-aiobotocore-arc-zonal-shift = - buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.0" - "sha256-o9pDedTVsRr98GZwtFbfFwKZwOA0e4zseGSFtlBEsLQ="; + buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.1" + "sha256-9lToTikNN5kH9TCGSeQDnm6g2iM+1OGbtSpN4f6M7FM="; types-aiobotocore-athena = - buildTypesAiobotocorePackage "athena" "2.15.0" - "sha256-AgWHakNCla5JY6zz0rWLwkorVESJCvQG6jhT1OFRNUY="; + buildTypesAiobotocorePackage "athena" "2.15.1" + "sha256-8NEZDefM/mP11YPnOCn11QfbWAMaCB5Yh2R9zQRtPpw="; types-aiobotocore-auditmanager = - buildTypesAiobotocorePackage "auditmanager" "2.15.0" - "sha256-U5ir/tSKwIAIF2TVJ66L1utVyh9cscc7z2VyrcsrGoI="; + buildTypesAiobotocorePackage "auditmanager" "2.15.1" + "sha256-JU7s8pqfJQptll0Kh3KPDeFULM2cga0nYZSvhLk2ul4="; types-aiobotocore-autoscaling = - buildTypesAiobotocorePackage "autoscaling" "2.15.0" - "sha256-7ZKRN/IlUrNvFgeuGbo242Di4eyIDr9/5tJsHrgcspg="; + buildTypesAiobotocorePackage "autoscaling" "2.15.1" + "sha256-PddQSNJ9KNGL8LQDD82+IeD4cVCR7huBkSWTqbYQfUk="; types-aiobotocore-autoscaling-plans = - buildTypesAiobotocorePackage "autoscaling-plans" "2.15.0" - "sha256-Va74FcUxerO1nEtm6AiWbaw8zVHDkrdsfq3fBlznM7k="; + buildTypesAiobotocorePackage "autoscaling-plans" "2.15.1" + "sha256-hUEFUNC1WdPpdu+9AQFWLvFhvBrmy3Xg7Xl4LlB4z6k="; types-aiobotocore-backup = - buildTypesAiobotocorePackage "backup" "2.15.0" - "sha256-9k/3D58OtYwyGl/B9wepaNbj6vgxzqc9E96Tp5+qSVU="; + buildTypesAiobotocorePackage "backup" "2.15.1" + "sha256-E8LmUYpLqVF0WooWUXtqv4nhst1o050tx3/sRDBhd+w="; types-aiobotocore-backup-gateway = - buildTypesAiobotocorePackage "backup-gateway" "2.15.0" - "sha256-pp75wX3UeV4U7UChs3EyanPom1UD6RCYdYfVmN21MjM="; + buildTypesAiobotocorePackage "backup-gateway" "2.15.1" + "sha256-Yx/e2UIEzn47L4mQ61S0PkHBuDbz7uqc5yIw/6XrBkI="; types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.13.0" "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; types-aiobotocore-batch = - buildTypesAiobotocorePackage "batch" "2.15.0" - "sha256-vbZk1mR45gdhLVtdZTi0ZG6I72ttUwHqFAuXc4TW8o8="; + buildTypesAiobotocorePackage "batch" "2.15.1" + "sha256-vZJddKOLsljDKP4WrUDZrc4hkk01FtN3wL8MXKpfuII="; types-aiobotocore-billingconductor = - buildTypesAiobotocorePackage "billingconductor" "2.15.0" - "sha256-mtbJipKOB82AHWrRAfNFUgHTwNtqiU/NSn9F6eLcqok="; + buildTypesAiobotocorePackage "billingconductor" "2.15.1" + "sha256-sbgwQEs21yd+xl2AuEiYEzc0Lgx7Uo/Ctibd2SEHY0c="; types-aiobotocore-braket = - buildTypesAiobotocorePackage "braket" "2.15.0" - "sha256-Hu8DNQCusy3HR5NNptB4Rwuhu3m9lcqTgR7HnZMjtwA="; + buildTypesAiobotocorePackage "braket" "2.15.1" + "sha256-CThsP2a03VbAIFr4x2x0L2fLgIxvqFV1MuMLp1eoo6A="; types-aiobotocore-budgets = - buildTypesAiobotocorePackage "budgets" "2.15.0" - "sha256-E8f8+ONZep2G/BoOSinere9SIMetZHNK+FpmfJZtXxY="; + buildTypesAiobotocorePackage "budgets" "2.15.1" + "sha256-b1M6ZdlrG/AM3h5iM/mMAW7SrwrjApF/K0kgbFpAM14="; types-aiobotocore-ce = - buildTypesAiobotocorePackage "ce" "2.15.0" - "sha256-8FK+wf201DspWWW338aad19mh84tEqI84GqKE9zclyA="; + buildTypesAiobotocorePackage "ce" "2.15.1" + "sha256-MV6dma7+hf1ITv3HJ4cJZyfpimMT5MBuspTCEjMix7I="; types-aiobotocore-chime = - buildTypesAiobotocorePackage "chime" "2.15.0" - "sha256-mAgx2hqP0zIvMIdAlyqD6A9HVZ0l/CKDj1lAvsDP/60="; + buildTypesAiobotocorePackage "chime" "2.15.1" + "sha256-24ukZo0shYVOz0HlrIj0g/xsfKz48fZHlUqcuTFvSoE="; types-aiobotocore-chime-sdk-identity = - buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.0" - "sha256-aY7LS0tEdBVxPwUIrR10ukCybglu1iQIyohNkMHrD4I="; + buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.1" + "sha256-/R22nTYf7XQBH9u8R10jHqHA4+s2iliX5+pFUyWdaG0="; types-aiobotocore-chime-sdk-media-pipelines = - buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.0" - "sha256-34bU9wxdytAbTYBGM4/sfAn1tYtYLEc2dpUN+t4RtP4="; + buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.1" + "sha256-UGogN6rRabJuNokJPeQUol9DOMBbc/pkPL+lRg5GYk0="; types-aiobotocore-chime-sdk-meetings = - buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.0" - "sha256-X6YpdEVXPHsvDjptcowPEs71b6iVHO5s80VmO8yEG0o="; + buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.1" + "sha256-EDQ5H7R5U9AQnLy2rkRzSSAkFVzfZiWCqlLqP24wv2g="; types-aiobotocore-chime-sdk-messaging = - buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.0" - "sha256-6CI5unJa7Ba1agD41zvcg7hi76D5j34NF5WlPAzkZiY="; + buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.1" + "sha256-7iJ+npfPI64WtlKYPLQUkJsJvhjSKCDbYBWWrv5dHwo="; types-aiobotocore-chime-sdk-voice = - buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.0" - "sha256-Qz3MHsRX3k9pxSZAltP3CrwFB3jcdNQkVok3jAUbXa8="; + buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.1" + "sha256-BCj6/x6lnNdUx/FjP8mLzv7zLukjwDQw2/tWrFSuU0A="; types-aiobotocore-cleanrooms = - buildTypesAiobotocorePackage "cleanrooms" "2.15.0" - "sha256-d+cISH+Wz1tnTh3hl1V0VLmHAirfi5puzLE1llIb6SY="; + buildTypesAiobotocorePackage "cleanrooms" "2.15.1" + "sha256-GbRu1vn7S1bILtKKf75+bR4y7OYQ6WnlUVt0HQqr/8s="; types-aiobotocore-cloud9 = - buildTypesAiobotocorePackage "cloud9" "2.15.0" - "sha256-4+/5CcjgXH4O2LXpOUbDNXC2xMnVzU9e4eY0n6tA39I="; + buildTypesAiobotocorePackage "cloud9" "2.15.1" + "sha256-7r/W5Hbv4J58aqpedt3ehe3E99U74sFiMHo5YnIPvh8="; types-aiobotocore-cloudcontrol = - buildTypesAiobotocorePackage "cloudcontrol" "2.15.0" - "sha256-5yjSbImILBpPJrwJUabP/z37yocdAtASsS0sSfJq69Q="; + buildTypesAiobotocorePackage "cloudcontrol" "2.15.1" + "sha256-TwBEzvuYmKyL5Bx2VCZwK0przb4MWhDVqOfl1RF3uog="; types-aiobotocore-clouddirectory = - buildTypesAiobotocorePackage "clouddirectory" "2.15.0" - "sha256-0+bbLpb+IIfgPFd2mltYjgDhV94hmD9nBHu+kOFPRbs="; + buildTypesAiobotocorePackage "clouddirectory" "2.15.1" + "sha256-ApxmZb2xwj0Leynjqi5YC4stEt0qcWQoSq3HffbvL3k="; types-aiobotocore-cloudformation = - buildTypesAiobotocorePackage "cloudformation" "2.15.0" - "sha256-KV6YLm057AqItUSfZmlMro41bvzyWitf64KXh/S78BM="; + buildTypesAiobotocorePackage "cloudformation" "2.15.1" + "sha256-ngI/9VlHFOpAjcXi04JX+MVEdjs1cxC2UT+9MQTblGo="; types-aiobotocore-cloudfront = - buildTypesAiobotocorePackage "cloudfront" "2.15.0" - "sha256-G1vjQh+/51KC5GLbqu8id0vIMcllM6e249ibRWIc+50="; + buildTypesAiobotocorePackage "cloudfront" "2.15.1" + "sha256-+y931CL0UdxZd5dnkSkNBAOmyuXqSb9XdIwQUKoXDTQ="; types-aiobotocore-cloudhsm = - buildTypesAiobotocorePackage "cloudhsm" "2.15.0" - "sha256-zFlLFb3Kg+n4aK0laLFxbyqBh5ljI9q38Hh+tK/9o3Q="; + buildTypesAiobotocorePackage "cloudhsm" "2.15.1" + "sha256-Mv6fm2JLK4QVL1dTlVCIM1TaehUSlXTBATHvXHO26uM="; types-aiobotocore-cloudhsmv2 = - buildTypesAiobotocorePackage "cloudhsmv2" "2.15.0" - "sha256-VkQmIJDWE+9VksOnEyLtktWOfNgRRw76zqr8xM7TM40="; + buildTypesAiobotocorePackage "cloudhsmv2" "2.15.1" + "sha256-9koftVpoxrFkg/WWYoLZPEf1nnWxqwEeAzeMIJB+n8A="; types-aiobotocore-cloudsearch = - buildTypesAiobotocorePackage "cloudsearch" "2.15.0" - "sha256-56M9O04QpzTvwBM6kTBlq/xlKulSye55n2yTqjibAhM="; + buildTypesAiobotocorePackage "cloudsearch" "2.15.1" + "sha256-1s+EM9O5Hfsa0qKK+HFrif2dH+C7+V51MkqvuKeYwyw="; types-aiobotocore-cloudsearchdomain = - buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.0" - "sha256-c2MkpaPyF+fpbQMMC2UvP8HvWOxXz1zoKlmy8mWihKg="; + buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.1" + "sha256-lDC8Za+QGc622FVrsNKPCuitYzU521BC20g7ZGUZMAI="; types-aiobotocore-cloudtrail = - buildTypesAiobotocorePackage "cloudtrail" "2.15.0" - "sha256-3oPEyW12otLcBEs3PM4ySpx8REN1XbOveu/H3/tMlyk="; + buildTypesAiobotocorePackage "cloudtrail" "2.15.1" + "sha256-911ynsQTCCv9kd4TgeWR5Hv8ulz/kCnYxnw9PWk41IY="; types-aiobotocore-cloudtrail-data = - buildTypesAiobotocorePackage "cloudtrail-data" "2.15.0" - "sha256-jwYk+AdycgvN5G26/e4E6xTvXqhSau5uXHOdn8QOz4A="; + buildTypesAiobotocorePackage "cloudtrail-data" "2.15.1" + "sha256-dh/wbIJ6VTU8++QGXa/IDUCcGpdzBB4jfaizyn9jfyo="; types-aiobotocore-cloudwatch = - buildTypesAiobotocorePackage "cloudwatch" "2.15.0" - "sha256-tSEIoJJZ3Qkta6R7urcY6o0Zmh/inayk9TFmWDtBxrI="; + buildTypesAiobotocorePackage "cloudwatch" "2.15.1" + "sha256-nnyLWvv9esKWKlyZs9j+hUHTCBs55qC8PX5st0OHBxg="; types-aiobotocore-codeartifact = - buildTypesAiobotocorePackage "codeartifact" "2.15.0" - "sha256-Uh628mId25sRK5C1RiFFUhnm3gwoAOn1qBiYFEZawiQ="; + buildTypesAiobotocorePackage "codeartifact" "2.15.1" + "sha256-f8xrPRkEOrw1fFI/q0U//LjzDCymhPOBpqrGPas5te4="; types-aiobotocore-codebuild = - buildTypesAiobotocorePackage "codebuild" "2.15.0" - "sha256-Vpmwx9NLkvW8//lwYbuNn4oCuTGlOzW6ALQvkNw3zjk="; + buildTypesAiobotocorePackage "codebuild" "2.15.1" + "sha256-9lTVbw1mtKgIiDsI7pc2Lmd7W/1OjMBZtvWTL1mNqxM="; types-aiobotocore-codecatalyst = - buildTypesAiobotocorePackage "codecatalyst" "2.15.0" - "sha256-hLZYCwF1SvMp2Pmhg14E/I0QmkFHdBivYL4zwbeozAc="; + buildTypesAiobotocorePackage "codecatalyst" "2.15.1" + "sha256-hEASqSTOFl8Pc+qBZ0Xqf36JivPVgHbZ2yZszo5Z9Uo="; types-aiobotocore-codecommit = - buildTypesAiobotocorePackage "codecommit" "2.15.0" - "sha256-ChHQF79gsoOzTA8Gzg3e7U4DRW24PsP2joi7haolI5U="; + buildTypesAiobotocorePackage "codecommit" "2.15.1" + "sha256-1L7UGZNkl89ULZV5LiajDZxQmLpelTsjNSvUzUzwk+I="; types-aiobotocore-codedeploy = - buildTypesAiobotocorePackage "codedeploy" "2.15.0" - "sha256-CldfAcuTTh8Xf1alyNDfEaJb+7wOLhQKg+S4GrnhPT4="; + buildTypesAiobotocorePackage "codedeploy" "2.15.1" + "sha256-HaO/GSX14cKdKlwYmowzgWPfTDrUXyiyNlhz23lPyT8="; types-aiobotocore-codeguru-reviewer = - buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.0" - "sha256-I2WeTiUX7skEx1Ow8VQjsyBFk0ibYVqjM0SQwd+Djok="; + buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.1" + "sha256-0vNZTr6RNUv2TjQJ9GZIwe6jTFJH1KgJW82fVERSFIw="; types-aiobotocore-codeguru-security = - buildTypesAiobotocorePackage "codeguru-security" "2.15.0" - "sha256-yF6I+I+KPEVXogQ4kON3OUq+G+DmxaIwykJm521Lw1I="; + buildTypesAiobotocorePackage "codeguru-security" "2.15.1" + "sha256-Mk5xbw1OhHcBDhohKu7emIz7c4BkxFA+LRtHrLL/LoQ="; types-aiobotocore-codeguruprofiler = - buildTypesAiobotocorePackage "codeguruprofiler" "2.15.0" - "sha256-/eRwr2fqu4i17bt9mG7Ffwh/QKBt8cx4T1IehPZNbc4="; + buildTypesAiobotocorePackage "codeguruprofiler" "2.15.1" + "sha256-i/a6O3B69uPMsJsjW2hxMdLm/q2nvRwTlcpvqg0zcnQ="; types-aiobotocore-codepipeline = - buildTypesAiobotocorePackage "codepipeline" "2.15.0" - "sha256-i1HlE4mnLkBcbH9BlEUiMswVoDvdFqkA2db/ONYTs9o="; + buildTypesAiobotocorePackage "codepipeline" "2.15.1" + "sha256-2i5cZ7cCy0zt71bTmAZHPCKR8GVutVR2TXeGJIlTQ54="; types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.13.3" "sha256-Z1ewx2RjmxbOQZ7wXaN54PVOuRs6LP3rMpsrVTacwjo="; types-aiobotocore-codestar-connections = - buildTypesAiobotocorePackage "codestar-connections" "2.15.0" - "sha256-ksiIt34O0vVOmlaSZjfPugnYUQDzUj9go5hIOknyvHM="; + buildTypesAiobotocorePackage "codestar-connections" "2.15.1" + "sha256-Qcz4JHpT34WKY0+/CRDavwiI99GCwxA/SBftb6Wi9J0="; types-aiobotocore-codestar-notifications = - buildTypesAiobotocorePackage "codestar-notifications" "2.15.0" - "sha256-vbNr4u4HAHEUaXyUruJtNRk1urlJ6W7yUJrS6ULE+2s="; + buildTypesAiobotocorePackage "codestar-notifications" "2.15.1" + "sha256-qdVJ+6ELs5YKqIV/26Ar2FW4KC3DGofHJ/+xo5xzT3M="; types-aiobotocore-cognito-identity = - buildTypesAiobotocorePackage "cognito-identity" "2.15.0" - "sha256-uFRD5fzIN11WLtR6KQ10IKxWpzf/Lr2q5VHHdC++h5U="; + buildTypesAiobotocorePackage "cognito-identity" "2.15.1" + "sha256-wlpdAHtWZd1l8jYduPT0Dc0LIWxOiiA05uXTpL8fQWo="; types-aiobotocore-cognito-idp = - buildTypesAiobotocorePackage "cognito-idp" "2.15.0" - "sha256-Yz1fDkWhQCsDN0I/KE8mkmKsVG+pzRMbyOighcdE+68="; + buildTypesAiobotocorePackage "cognito-idp" "2.15.1" + "sha256-zpuLoNTgcbYQJ0DF52qoPVm7nspMiITQczoREaCtlCI="; types-aiobotocore-cognito-sync = - buildTypesAiobotocorePackage "cognito-sync" "2.15.0" - "sha256-IAbAdXXV/qBLu4g4sxbk8PAlJ61fL1788sKrOCAPoyA="; + buildTypesAiobotocorePackage "cognito-sync" "2.15.1" + "sha256-XYPt1jgk+BEjDpNH2XHNf0hoOwzewoxqxy+2qjv2dMw="; types-aiobotocore-comprehend = - buildTypesAiobotocorePackage "comprehend" "2.15.0" - "sha256-o78Qq1eZTT/+3oSdpDMFGT3VcRr3BUgTHIEv9U6zsaw="; + buildTypesAiobotocorePackage "comprehend" "2.15.1" + "sha256-XbQ3BYHXGNb4aKFo+WegaZ8613FiVRdthZ0zU7borjQ="; types-aiobotocore-comprehendmedical = - buildTypesAiobotocorePackage "comprehendmedical" "2.15.0" - "sha256-cdmbnC12r0nzgqHt9MZsB8z34Gh1wLr7pressaGNdok="; + buildTypesAiobotocorePackage "comprehendmedical" "2.15.1" + "sha256-3cifXhAhIxxZVRdE0Pt3SmaWwoj75iIpp6ThnLeL+BM="; types-aiobotocore-compute-optimizer = - buildTypesAiobotocorePackage "compute-optimizer" "2.15.0" - "sha256-OiZkYLcHvGfgrAAG/g2DI7OfTXuowz9U9vgYnUnQ5LY="; + buildTypesAiobotocorePackage "compute-optimizer" "2.15.1" + "sha256-8awRuy2iD9mYSuLaMrbpu0bZ1HlY9kIrF4/ZY7kECbQ="; types-aiobotocore-config = - buildTypesAiobotocorePackage "config" "2.15.0" - "sha256-t4TXmT50janvS0/t4x7a1Kugx+spLVtdhYXk0tbW7IA="; + buildTypesAiobotocorePackage "config" "2.15.1" + "sha256-n8RP98EO8AB0a3zqKlc7TZBttT7bHRV2EFYBy999q4g="; types-aiobotocore-connect = - buildTypesAiobotocorePackage "connect" "2.15.0" - "sha256-sqLlspZPLtilYBBOQtHV5YT3IZ2BJCenD2r8D8JUva0="; + buildTypesAiobotocorePackage "connect" "2.15.1" + "sha256-9AfqyTav6mIPiBrMGP6Rh+ytAS92LdLg/4VdTaSKB6I="; types-aiobotocore-connect-contact-lens = - buildTypesAiobotocorePackage "connect-contact-lens" "2.15.0" - "sha256-B2MqOOHJs3cHIuPKPJPdGsw/htwbTdqhF3vX2ErhSUs="; + buildTypesAiobotocorePackage "connect-contact-lens" "2.15.1" + "sha256-qTq+tsvlPDq9LDTNgZuwa1zva17PDm1zBMnDX5nLR1g="; types-aiobotocore-connectcampaigns = - buildTypesAiobotocorePackage "connectcampaigns" "2.15.0" - "sha256-ILLDJbAD7jQdyUop5NzZA5YOzCvDLS5DwjRaPqiHFZc="; + buildTypesAiobotocorePackage "connectcampaigns" "2.15.1" + "sha256-kIF+sS4RpsmhiuttzwFViHaOLZ5B69O//hwEYGrMfr8="; types-aiobotocore-connectcases = - buildTypesAiobotocorePackage "connectcases" "2.15.0" - "sha256-XM58yx4FP5mfVcdXpGOCXk3HrYbhiPbKhFLYMjKJfjE="; + buildTypesAiobotocorePackage "connectcases" "2.15.1" + "sha256-hTUDhtsv5KWOiM9jYrT4/IW+GmnCmWnhMZpoQIClQ3k="; types-aiobotocore-connectparticipant = - buildTypesAiobotocorePackage "connectparticipant" "2.15.0" - "sha256-nEouxJuZHsnNuIXSFpW1r5eWp7wiM525jaqkrHKy27o="; + buildTypesAiobotocorePackage "connectparticipant" "2.15.1" + "sha256-ffSs8Z/TQatJDUKmjdclI5DYMf5/EI/uEi8r4EnKFds="; types-aiobotocore-controltower = - buildTypesAiobotocorePackage "controltower" "2.15.0" - "sha256-pI3tNm75uKX9qYGq0wdINP/ikm1Q11Y2Y+buuSUhMqU="; + buildTypesAiobotocorePackage "controltower" "2.15.1" + "sha256-5Sa+K+DTpM2YwTfhlufD9MxTk4pv+K1wE9PYKM1zAxw="; types-aiobotocore-cur = - buildTypesAiobotocorePackage "cur" "2.15.0" - "sha256-YE6vdELZULQU8zYRFd97IEWw+guKLJM24VhxRjbCHNk="; + buildTypesAiobotocorePackage "cur" "2.15.1" + "sha256-NfY/cGT+ft8bWitgYHbySblXNdYj/c/4p5jr2yOs5+c="; types-aiobotocore-customer-profiles = - buildTypesAiobotocorePackage "customer-profiles" "2.15.0" - "sha256-Gq+W7nn4AaMd51nYd0uzDfDNWqMsqwYTBR8JA63NCtI="; + buildTypesAiobotocorePackage "customer-profiles" "2.15.1" + "sha256-fQONh48vGKkr+ICjI3EqKW+jNXH/DSm0a96pTf4JQmk="; types-aiobotocore-databrew = - buildTypesAiobotocorePackage "databrew" "2.15.0" - "sha256-cKk8cRR2XcMCIbBeg9g2Zgwun5/RRNQaiAKoIv8WvEk="; + buildTypesAiobotocorePackage "databrew" "2.15.1" + "sha256-DNayl61Eorza7nIjjbxbFzs+lIN3oUwpDIImJEMHX7Y="; types-aiobotocore-dataexchange = - buildTypesAiobotocorePackage "dataexchange" "2.15.0" - "sha256-0ZZcNnUh2X/K7t65yy0CJS7JDNqn//a/CEn/ujyBpjU="; + buildTypesAiobotocorePackage "dataexchange" "2.15.1" + "sha256-v9bq7ub+8q2NrZtaqWqQh2MSKoGfDBdTVW1qKTSooug="; types-aiobotocore-datapipeline = - buildTypesAiobotocorePackage "datapipeline" "2.15.0" - "sha256-DeudpMd35JzfAn2Oi9J8IQdLzoL82YqUAP1sfJV2Mes="; + buildTypesAiobotocorePackage "datapipeline" "2.15.1" + "sha256-9hBxeCltGrxtMGuTKTwVp/aHHccnfDKuI0QXv50uKNA="; types-aiobotocore-datasync = - buildTypesAiobotocorePackage "datasync" "2.15.0" - "sha256-E3SzICSZSRfKzcyUs1pXzg+jrAC6YX6S4FVUp6bqjqI="; + buildTypesAiobotocorePackage "datasync" "2.15.1" + "sha256-z7t65Ioz0NtiToPkTIbYcBjWlJg1rcTIj0u/qmPkhMA="; types-aiobotocore-dax = - buildTypesAiobotocorePackage "dax" "2.15.0" - "sha256-CShLLvZXv9Wl2ipx7Yo/9EZgFd8xC51rTn+3s5IQtJs="; + buildTypesAiobotocorePackage "dax" "2.15.1" + "sha256-/NyvlFx8/nOWClB3ZPqTt67yGN2ssYojWukw0S3v274="; types-aiobotocore-detective = - buildTypesAiobotocorePackage "detective" "2.15.0" - "sha256-1JpQFNtq/ER6zmTYo1glMgxKVz4ctYwQa3cm69otc14="; + buildTypesAiobotocorePackage "detective" "2.15.1" + "sha256-DWf6HTvFyMYRiOLQrawp5GwhXniNS9mhwPNyprCYrt0="; types-aiobotocore-devicefarm = - buildTypesAiobotocorePackage "devicefarm" "2.15.0" - "sha256-tRLyH18/lVx4skaoAk73cd2lE6sBJ+d8DMUaHxXIVkg="; + buildTypesAiobotocorePackage "devicefarm" "2.15.1" + "sha256-05IkwZCPZvQGkRya7TdN1huFpMxuR1zxB+b8JSFI/oM="; types-aiobotocore-devops-guru = - buildTypesAiobotocorePackage "devops-guru" "2.15.0" - "sha256-2Bv8N9q/i0WFB+F8Xu8BQZ7ws+7yJa7qgjaE7X1dQB0="; + buildTypesAiobotocorePackage "devops-guru" "2.15.1" + "sha256-n62US1ENdO1MFljx5zeLx+LblbiJyxefhN2+nlxu2GA="; types-aiobotocore-directconnect = - buildTypesAiobotocorePackage "directconnect" "2.15.0" - "sha256-hY2hLmFtlsggdE6gyQ9lwjTjfkgfaGvWudSPcTy18NU="; + buildTypesAiobotocorePackage "directconnect" "2.15.1" + "sha256-knhkLyC1uPX4KjiFcgFf9ys2hCz38++q55nbnUM3n/Q="; types-aiobotocore-discovery = - buildTypesAiobotocorePackage "discovery" "2.15.0" - "sha256-RnQoddR4qXiAItydDAFBTOkEsBg+DHolqqdHyfCTqXM="; + buildTypesAiobotocorePackage "discovery" "2.15.1" + "sha256-JG/1ZQ9cSCMzqF6CVTIu7EIm0ORbLn3gM8gcCCSRhsQ="; types-aiobotocore-dlm = - buildTypesAiobotocorePackage "dlm" "2.15.0" - "sha256-/lzVDT2qoK+6PrUozdrSyN7QTcygA7IyUGl7E1K0t4Y="; + buildTypesAiobotocorePackage "dlm" "2.15.1" + "sha256-Pyi45ZWBuEsb3GoumJkX+c8QnX3J6HobLFqwkm7I0ng="; types-aiobotocore-dms = - buildTypesAiobotocorePackage "dms" "2.15.0" - "sha256-9JKz+NHAudWbLGVL5L8fZwoTcom3o7JNFioRNYoVQ0Q="; + buildTypesAiobotocorePackage "dms" "2.15.1" + "sha256-wius84bAUyldt84o8qUeBSzajkY8mLco85rI4NAIQcc="; types-aiobotocore-docdb = - buildTypesAiobotocorePackage "docdb" "2.15.0" - "sha256-ZEdJM8Z7ngpa7LIMyL9+jRi0EL2IRcoG12O+cr2roYU="; + buildTypesAiobotocorePackage "docdb" "2.15.1" + "sha256-MF8CGeObwgB5LW1o1ynwahm9GZHTvxjlgNXDyFRjpWM="; types-aiobotocore-docdb-elastic = - buildTypesAiobotocorePackage "docdb-elastic" "2.15.0" - "sha256-kKf2pjIGoGuO/V/LjIDBPF+Kv0rhEO0kSCLsJe1npc8="; + buildTypesAiobotocorePackage "docdb-elastic" "2.15.1" + "sha256-+gyO2dno529rxF5Uj1pyQ0+fH1CJK7LJs/U4WIpRIX4="; types-aiobotocore-drs = - buildTypesAiobotocorePackage "drs" "2.15.0" - "sha256-HxY54FJDM6VQuSAB7Qy1PNT9EhPF5z8NXn+m1ICe+aI="; + buildTypesAiobotocorePackage "drs" "2.15.1" + "sha256-qtMwQ17MpJ0K7zbKr4dyAGWEfHqfM+wXQe22raG/i1E="; types-aiobotocore-ds = - buildTypesAiobotocorePackage "ds" "2.15.0" - "sha256-iAq4ovzPUAjfH6DE94F5IJoOXMtLr3MF6b+ITByTE2c="; + buildTypesAiobotocorePackage "ds" "2.15.1" + "sha256-qU+5PMZqxbskuB/ubXeigzS5t+A5m0WW0e4NVQjFLO4="; types-aiobotocore-dynamodb = - buildTypesAiobotocorePackage "dynamodb" "2.15.0" - "sha256-TBiXxLLpyYHslMBCGjPVEOke+7/kj2YcBSMMNpe/d3s="; + buildTypesAiobotocorePackage "dynamodb" "2.15.1" + "sha256-hQt2Htye+VubSHw+2Iz5E8IgzHGwAwmyYEkNI0br7eU="; types-aiobotocore-dynamodbstreams = - buildTypesAiobotocorePackage "dynamodbstreams" "2.15.0" - "sha256-RRg/aabmM+Vl4b3HwafJVrIc/khRLhgVN9uflG8IGi4="; + buildTypesAiobotocorePackage "dynamodbstreams" "2.15.1" + "sha256-n2NZxFSH9ymucBLagUAaWDgAN4kDsfKqB2W2ir6aEC8="; types-aiobotocore-ebs = - buildTypesAiobotocorePackage "ebs" "2.15.0" - "sha256-FGLzilsbA3iCnJLkdeBSYNUPsyzz4N6aNX26MUwGKLE="; + buildTypesAiobotocorePackage "ebs" "2.15.1" + "sha256-nzm7mnREUd6MEHan4cTc0MaorGo/X+eKbGH1/giG16w="; types-aiobotocore-ec2 = - buildTypesAiobotocorePackage "ec2" "2.15.0" - "sha256-FnDRizmCPp39EhGU+c9UKJIFz2ZAMlTOaebcLhLBmlY="; + buildTypesAiobotocorePackage "ec2" "2.15.1" + "sha256-QzPGQirl2zA5m2yqqXjUC8MIsUDbOg1yl252KJU+Ipc="; types-aiobotocore-ec2-instance-connect = - buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.0" - "sha256-3KxMgKPAqCHVxv6a/70ykkJPAc/wFUIe+MxlOURCaHY="; + buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.1" + "sha256-A5OdqOTax+3/v6GG3IzU771A4l3OXQhqlowknE0DnNU="; types-aiobotocore-ecr = - buildTypesAiobotocorePackage "ecr" "2.15.0" - "sha256-+bAe56VT/aSJERPDE7/PuBelT5vJubs2j7mJB0pb5rA="; + buildTypesAiobotocorePackage "ecr" "2.15.1" + "sha256-3b5SI5qHhvVIa8hqLp/YZu9b3DDpZm5ogRv0I0NuI0Y="; types-aiobotocore-ecr-public = - buildTypesAiobotocorePackage "ecr-public" "2.15.0" - "sha256-5WJz1uIp+dbP3qqTCieXJBM9TCOWHPOfVQck1G8BkpY="; + buildTypesAiobotocorePackage "ecr-public" "2.15.1" + "sha256-enLMc0Vg+RwO3SBzvDd/nKQvNbCllMJMS4BBKGUNWuQ="; types-aiobotocore-ecs = - buildTypesAiobotocorePackage "ecs" "2.15.0" - "sha256-KEE+rLoBBqNtP6AtFT33Xx4TzQydrvyUxKpamHe50jE="; + buildTypesAiobotocorePackage "ecs" "2.15.1" + "sha256-GOUkXglekGMNDlWdz9dyGvZpgSTfnZAh3e80CMvzumA="; types-aiobotocore-efs = - buildTypesAiobotocorePackage "efs" "2.15.0" - "sha256-3DZJT/rjzuxNi1oAc51AJguCXN9zI57cYp7Y3wTvtZs="; + buildTypesAiobotocorePackage "efs" "2.15.1" + "sha256-+KZQnRFKF+0nmOqec1jHa0ewAcfLBoW9mrMVNZn6q78="; types-aiobotocore-eks = - buildTypesAiobotocorePackage "eks" "2.15.0" - "sha256-KEl1qvE3QAnhScIbH9/WkwRDyIHDGNsCnNBom1nkdRg="; + buildTypesAiobotocorePackage "eks" "2.15.1" + "sha256-4d/rL6L/W2zfZ1naceSfH/E1y2DUNMcQ2tJaaKsRjLw="; types-aiobotocore-elastic-inference = - buildTypesAiobotocorePackage "elastic-inference" "2.15.0" - "sha256-65/pni/wL4lR1hzu0C7xfVeiT4kzl980hGr/pWJAwvU="; + buildTypesAiobotocorePackage "elastic-inference" "2.15.1" + "sha256-AOhrrWLtKq5Wr79TcFNa+A3/MhHMnAPMIPEgcum2/ZA="; types-aiobotocore-elasticache = - buildTypesAiobotocorePackage "elasticache" "2.15.0" - "sha256-GlAHYrfqx+VSBuXdwiRY4lUDqcfsmaxVXLwph6d6HCc="; + buildTypesAiobotocorePackage "elasticache" "2.15.1" + "sha256-Psxy6JILUzvwmUj9QP2wTeIgt/nbtpbG3LUozN9ltek="; types-aiobotocore-elasticbeanstalk = - buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.0" - "sha256-Cd16ST0rbvq+NOYAOQgwU2UZWDiKfUTQ4vdxQlP3+Bs="; + buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.1" + "sha256-3Jt67THyNfn92g6L/GZwPi0HLb6bpLuoDAkuXKPZu1Y="; types-aiobotocore-elastictranscoder = - buildTypesAiobotocorePackage "elastictranscoder" "2.15.0" - "sha256-3dGv1gPdU/0o0LBYMjzH+uoSMVzhd2dHwZNxt4jdE6U="; + buildTypesAiobotocorePackage "elastictranscoder" "2.15.1" + "sha256-mGNHO2T129nPrODffC8Y9+R+XKjVVUnFrw1yDkJ0g/A="; types-aiobotocore-elb = - buildTypesAiobotocorePackage "elb" "2.15.0" - "sha256-Y6J2/ChKP8JnrZEW8StlYONrAfRecKWJbf07I7zxIGI="; + buildTypesAiobotocorePackage "elb" "2.15.1" + "sha256-wceBAH30EypOqb4GqTP6aL6Ribm4l6b082+vB4sRDMs="; types-aiobotocore-elbv2 = - buildTypesAiobotocorePackage "elbv2" "2.15.0" - "sha256-7m97yZfyrNFCI3zQYdHJ4SJ5oTACcJ+cfzMzX0MSdN8="; + buildTypesAiobotocorePackage "elbv2" "2.15.1" + "sha256-4si+dqz/nPdXAF+eUkTICZQ8JaT+DcxEbmrxKZcF5G0="; types-aiobotocore-emr = - buildTypesAiobotocorePackage "emr" "2.15.0" - "sha256-4GNDh92LYUWxXjvgiYrOsY2joFbHalolgAWtnd79AJQ="; + buildTypesAiobotocorePackage "emr" "2.15.1" + "sha256-4Ak5F+RnUlOnMvEhVTXrHXkQQzWSo7iRIojrwYifMnA="; types-aiobotocore-emr-containers = - buildTypesAiobotocorePackage "emr-containers" "2.15.0" - "sha256-TnEfypfapADarPuVOfl0SzNnJSFJUQmxmeoDZ869fIk="; + buildTypesAiobotocorePackage "emr-containers" "2.15.1" + "sha256-Q1ZGZfpub4fceqFyBTLxj5G27ByHYPRH8KvEMyFZWyQ="; types-aiobotocore-emr-serverless = - buildTypesAiobotocorePackage "emr-serverless" "2.15.0" - "sha256-bjW88670lzwRWbIp5dHEJIf4EfJSOkQl7CIG2G/wpsQ="; + buildTypesAiobotocorePackage "emr-serverless" "2.15.1" + "sha256-lHSPS5/HAW2NFg6zCKXARznJ1UjTWIn/YDR9XlMa1ag="; types-aiobotocore-entityresolution = - buildTypesAiobotocorePackage "entityresolution" "2.15.0" - "sha256-9x6SSolu1CVMjQitu4/8QBxxhdk6G65onKE0EW4oGi0="; + buildTypesAiobotocorePackage "entityresolution" "2.15.1" + "sha256-QXAAHqiq1ThUvS5Y59SXA0OKQza0IrxPUyGwpZ1Ft1U="; types-aiobotocore-es = - buildTypesAiobotocorePackage "es" "2.15.0" - "sha256-s8lgcAKVZH3rxzogSj74xJ98thChBIvePIvJmHKrApc="; + buildTypesAiobotocorePackage "es" "2.15.1" + "sha256-lHKKWM984zvnbcO2ord+XkbFm91y2OAJlddm3dongo8="; types-aiobotocore-events = - buildTypesAiobotocorePackage "events" "2.15.0" - "sha256-bgdyFuggcdUfDxEtDjgbmCIc88z4wGbdKQrYmIiZKjs="; + buildTypesAiobotocorePackage "events" "2.15.1" + "sha256-3XQ9EjRu2qfpvHAWbM7XHodvMCR5PXOzM5ttes7ggEM="; types-aiobotocore-evidently = - buildTypesAiobotocorePackage "evidently" "2.15.0" - "sha256-ZNKyeP1THt85PeKqrof84e3glJ4x1TwT0ziqaCXKedk="; + buildTypesAiobotocorePackage "evidently" "2.15.1" + "sha256-DR+GYAUdE7Nfn0X0sp3IshbfKjcrtFVCk3KObFlQbdM="; types-aiobotocore-finspace = - buildTypesAiobotocorePackage "finspace" "2.15.0" - "sha256-gvwDgITwyGZFVndTMKIkD0svxPF3Ur09De7rtP1N57A="; + buildTypesAiobotocorePackage "finspace" "2.15.1" + "sha256-kIg535sFaySMannjaMHmVEZqx7Lh1OnGpBc/CxMqWzY="; types-aiobotocore-finspace-data = - buildTypesAiobotocorePackage "finspace-data" "2.15.0" - "sha256-+NpGar24GvTd3+3umx0axL2vNJQ0RtDKZzuKvNJu2RY="; + buildTypesAiobotocorePackage "finspace-data" "2.15.1" + "sha256-rGvEfMJt7mmrned4uLGaN58ZGgFJzNPwxFCRu3SghWg="; types-aiobotocore-firehose = - buildTypesAiobotocorePackage "firehose" "2.15.0" - "sha256-BD2gBxbEGlAolHT7xHBj58i4zVHXy3o0xGpIprcCA1I="; + buildTypesAiobotocorePackage "firehose" "2.15.1" + "sha256-gkBhNs6Cpy7dL4o/SyOxwF7eCwlnHaGxbSjO0FvPxpM="; types-aiobotocore-fis = - buildTypesAiobotocorePackage "fis" "2.15.0" - "sha256-qRkkIDm1n3z41pVntjSLypDnM3UVQlXuh5A+sWipFGY="; + buildTypesAiobotocorePackage "fis" "2.15.1" + "sha256-BKyTNVhRzYjQDXwhTpo9rblgEonzPubmJIOrCnwaEus="; types-aiobotocore-fms = - buildTypesAiobotocorePackage "fms" "2.15.0" - "sha256-i2wfly+9R4KyK1rsRIwKbK3P6OnXpfCxWC8ZV1Fx1M4="; + buildTypesAiobotocorePackage "fms" "2.15.1" + "sha256-9v2x/BYM6tiPWPC/c7ZNJufl5EStBRq7dSW9S3jaWTc="; types-aiobotocore-forecast = - buildTypesAiobotocorePackage "forecast" "2.15.0" - "sha256-SC0rCCOVa47auM4pasWds3nOzO19anbT5jL1UVIUKXo="; + buildTypesAiobotocorePackage "forecast" "2.15.1" + "sha256-7B24s2z0hwaXZzj/ryhfIqbiFPaiFuC8GOn5MaYsB0U="; types-aiobotocore-forecastquery = - buildTypesAiobotocorePackage "forecastquery" "2.15.0" - "sha256-3+z4Ef85r9aOPdkLXV8L/+9MBvQpLNkFIElRBlQLsRo="; + buildTypesAiobotocorePackage "forecastquery" "2.15.1" + "sha256-Z/Ul3IhUDhYjijXU9fFCOsG2r927wvl3pOWP+SxZ7rE="; types-aiobotocore-frauddetector = - buildTypesAiobotocorePackage "frauddetector" "2.15.0" - "sha256-UroaCR4B1cgLe4l2+RKdUa9/Q6LLpglmohhYDROSdnU="; + buildTypesAiobotocorePackage "frauddetector" "2.15.1" + "sha256-ZNnWPccp4nnNAUk6tsAfV6xYS0U98rh17bTXG9+NjBY="; types-aiobotocore-fsx = - buildTypesAiobotocorePackage "fsx" "2.15.0" - "sha256-9iYbsEG4J4HeXBuCiQQtzOLVBzlkkcg404TbQGg+E7E="; + buildTypesAiobotocorePackage "fsx" "2.15.1" + "sha256-72IyOCvtGPR2JNpIIy0rgiACfmDfxKlV/wo5AvzTdf4="; types-aiobotocore-gamelift = - buildTypesAiobotocorePackage "gamelift" "2.15.0" - "sha256-x9KREjqQw/DMOD3cbdw19mH4zOxvqKcMIRe/doGGn0s="; + buildTypesAiobotocorePackage "gamelift" "2.15.1" + "sha256-jFgO3ks0u/1YMjeQXHvMYoa4O35+VrvpeXWIAeJRj2I="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; types-aiobotocore-glacier = - buildTypesAiobotocorePackage "glacier" "2.15.0" - "sha256-k/oPZr4TznL4ygQND0EuXCsSZNgVouBTm8Pih3m3j6k="; + buildTypesAiobotocorePackage "glacier" "2.15.1" + "sha256-5BewcGF6cDdPnTqyKLHlJIYuiv5N4GSuIlouRCEMeAQ="; types-aiobotocore-globalaccelerator = - buildTypesAiobotocorePackage "globalaccelerator" "2.15.0" - "sha256-e6bP28zUjuyGn9Y+IWJyYkcRNTQ8odpK6vlZUuxSIHg="; + buildTypesAiobotocorePackage "globalaccelerator" "2.15.1" + "sha256-fh2RP530haUdEOM7noDiBmiHf5Cv+YvF8S4Xoh84K20="; types-aiobotocore-glue = - buildTypesAiobotocorePackage "glue" "2.15.0" - "sha256-iEi6pPUnJ1VRFXpdFhNVDf8fQ94kByVZEUzLC4SPYIQ="; + buildTypesAiobotocorePackage "glue" "2.15.1" + "sha256-z4fe7DbzI2AIkCa4qBS4kGyPcgti1d/CPJCqe82OuR4="; types-aiobotocore-grafana = - buildTypesAiobotocorePackage "grafana" "2.15.0" - "sha256-vQJJB10LNbGNvQTj+xHVneRChhxaFZkHXel5DRg7RSs="; + buildTypesAiobotocorePackage "grafana" "2.15.1" + "sha256-V6uqUzVntsISmOUH9Mjy5DjLxiYkPN9k6BtQFwer4wM="; types-aiobotocore-greengrass = - buildTypesAiobotocorePackage "greengrass" "2.15.0" - "sha256-RDhbq/ucOitxsOeElmNV5kXGlVTHv/g2d5sxAaBzLlI="; + buildTypesAiobotocorePackage "greengrass" "2.15.1" + "sha256-C/W6eBJauG9QI8MMc7hFzkN4A21RRMH6kSU5Wq/qXus="; types-aiobotocore-greengrassv2 = - buildTypesAiobotocorePackage "greengrassv2" "2.15.0" - "sha256-47eFTzMPom+q4Ha6HRjPOQCMbn9X5OtEbpScbH+JrpA="; + buildTypesAiobotocorePackage "greengrassv2" "2.15.1" + "sha256-00hMhRWJ4W91I6cG5IXyyNqjyxPFrwmbHp69EWIIkMg="; types-aiobotocore-groundstation = - buildTypesAiobotocorePackage "groundstation" "2.15.0" - "sha256-6+KjFU7B46BL2wsXpMawQT/3DTjdVfcir/XVq1mYS0c="; + buildTypesAiobotocorePackage "groundstation" "2.15.1" + "sha256-++YYod+5UlCzknDJ/0l3hwPNukO9o2M0CoZR0lyOTnA="; types-aiobotocore-guardduty = - buildTypesAiobotocorePackage "guardduty" "2.15.0" - "sha256-IBiDqyfJYhKyqt3v3hd8y72UXawwUed3BILsswrWkmg="; + buildTypesAiobotocorePackage "guardduty" "2.15.1" + "sha256-+fJrH77TQKCBoio2R3LEJLmUOtSXd9oaf+PaN0YyEdA="; types-aiobotocore-health = - buildTypesAiobotocorePackage "health" "2.15.0" - "sha256-WMgJb50/QiojGKgh6s81aKjFrewlh3bx6YWroTIZabA="; + buildTypesAiobotocorePackage "health" "2.15.1" + "sha256-KNaHkgFc1W6cK7nwt7ZibmeL3zMmO2/6O1OlRkrUERY="; types-aiobotocore-healthlake = - buildTypesAiobotocorePackage "healthlake" "2.15.0" - "sha256-qy++uEn9Ph2Ek6Rzpth6j3x1NMK1AqoF50HFcVZBbIU="; + buildTypesAiobotocorePackage "healthlake" "2.15.1" + "sha256-JtP47qVkcTMtafPT/YbEu/CFOh4yp1VLICTVzB2LeV4="; types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.13.0" "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; types-aiobotocore-iam = - buildTypesAiobotocorePackage "iam" "2.15.0" - "sha256-HcCuedSOhN7B4xwCH2zQz7RxrVdz6y+L7ZfNoCWG8RE="; + buildTypesAiobotocorePackage "iam" "2.15.1" + "sha256-CKNmGY362fvOEdm9+UvElI9U3dZhjY4sTDnuzBaPJyw="; types-aiobotocore-identitystore = - buildTypesAiobotocorePackage "identitystore" "2.15.0" - "sha256-etmeEUkNyB/I760pSt3VEqbzqKnk44Evi1zqUc1SxFI="; + buildTypesAiobotocorePackage "identitystore" "2.15.1" + "sha256-LIEyxMseTo/G44R9gUeWFOoR/k1aZ1a6nLA8uuoti70="; types-aiobotocore-imagebuilder = - buildTypesAiobotocorePackage "imagebuilder" "2.15.0" - "sha256-0jIUpv7Njy5h6vzRxnKqr0kIIiHBUkOZh+NEW1s6tLw="; + buildTypesAiobotocorePackage "imagebuilder" "2.15.1" + "sha256-YromFw8hMXBV3v9rAfmAFg/1MWMSsBR8jCjgnN3Qjdc="; types-aiobotocore-importexport = - buildTypesAiobotocorePackage "importexport" "2.15.0" - "sha256-v0gErsdr3Ljiyil8Ct7iNGqf61VenoExZOUhH760SPA="; + buildTypesAiobotocorePackage "importexport" "2.15.1" + "sha256-UvwCZclRwoDaAMhY6CdhCADFs0m258Z34FVTH95CrZ8="; types-aiobotocore-inspector = - buildTypesAiobotocorePackage "inspector" "2.15.0" - "sha256-HInhkpxGJ886jRhspnQDWJkRF3jmo5J1PetVNrzuS7Q="; + buildTypesAiobotocorePackage "inspector" "2.15.1" + "sha256-5vgqzDYe/y3vHvKFuYfhArZfmLHRPDuhGaSBRHWUiis="; types-aiobotocore-inspector2 = - buildTypesAiobotocorePackage "inspector2" "2.15.0" - "sha256-hvFzgJO69n+Jr5trZLv85PuActzWRXrLfRW0Iqdn9jk="; + buildTypesAiobotocorePackage "inspector2" "2.15.1" + "sha256-2CPWpQt1jylh05MtxFIoig4DVoSBkHYVKEl0j/2s1v0="; types-aiobotocore-internetmonitor = - buildTypesAiobotocorePackage "internetmonitor" "2.15.0" - "sha256-qgg/j2d763Q4e4axjkhXC3I+BnlJ24j4sZ4hxbvpgYA="; + buildTypesAiobotocorePackage "internetmonitor" "2.15.1" + "sha256-aXAhRpaoJC0BR/KqG/0FF139mLFBTaqQdr0m5B8vz/k="; types-aiobotocore-iot = - buildTypesAiobotocorePackage "iot" "2.15.0" - "sha256-/KgXN3dWVw/ITZ51SOtJRvlUqc1kPxalRa7l7Rb6gSk="; + buildTypesAiobotocorePackage "iot" "2.15.1" + "sha256-iVdmdRpw4/gj6Lsy6gP8C6HwvIKhKmKHpvR5HoB4jE8="; types-aiobotocore-iot-data = - buildTypesAiobotocorePackage "iot-data" "2.15.0" - "sha256-7q+IBCltYgU5i8QuLlHm0ZFdZcDVDPLmw+tkrBSHeQQ="; + buildTypesAiobotocorePackage "iot-data" "2.15.1" + "sha256-WVcWtkcrV0jTqCuygnDi6CZFVt/xuReFy6ji+BAjylQ="; types-aiobotocore-iot-jobs-data = - buildTypesAiobotocorePackage "iot-jobs-data" "2.15.0" - "sha256-aKQepzdWJBZQ+f633DVLErPldqrjyrkkAYMZt4Bi3gY="; + buildTypesAiobotocorePackage "iot-jobs-data" "2.15.1" + "sha256-Ym5Pxg3N++/QRdLNzHAOZQmObdroyhgO6tPHLmGfCPY="; types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.2" "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; types-aiobotocore-iot1click-devices = - buildTypesAiobotocorePackage "iot1click-devices" "2.15.0" - "sha256-c81lJVCAx4haFwRtRfzab8A6YKVspaUSwI9i/nd7jw8="; + buildTypesAiobotocorePackage "iot1click-devices" "2.15.1" + "sha256-OJmSfZaKAfiq7UImpgF/wKTzYaqxlhqrkOAbk7OchrM="; types-aiobotocore-iot1click-projects = - buildTypesAiobotocorePackage "iot1click-projects" "2.15.0" - "sha256-Bb9ze8VK6lRT0Ts1PhQ6jrOrjcMzYYrThqVCN4COdRw="; + buildTypesAiobotocorePackage "iot1click-projects" "2.15.1" + "sha256-8Q6P8K87YIs+UsR5Vyyx9IMBW0fLAMqCu/LkqkUQYEU="; types-aiobotocore-iotanalytics = - buildTypesAiobotocorePackage "iotanalytics" "2.15.0" - "sha256-eOuQ4Bead3AQ4zD7Ibc/J7BO1bT3FxY0hlUB8qLz390="; + buildTypesAiobotocorePackage "iotanalytics" "2.15.1" + "sha256-HkzZSHFbEWv67uQRIH6W/CsAFI1HpsFeNLvbqjQEJsQ="; types-aiobotocore-iotdeviceadvisor = - buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.0" - "sha256-vrCjbqXz1DGStxCJXwQgrQHzI7BIxGee5zolY/pU6JI="; + buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.1" + "sha256-SMNXQLSk9rFAXgEKXk23cjWRRvhnUcskkQyeSetngcE="; types-aiobotocore-iotevents = - buildTypesAiobotocorePackage "iotevents" "2.15.0" - "sha256-3YScaOGMmSYRY+ObPUMWMsCJuUy6dhOYP9LNzluZnhk="; + buildTypesAiobotocorePackage "iotevents" "2.15.1" + "sha256-vRnjkeGogwcdtRFybEuqB4FjR89N0KR8pdDWs4caa8I="; types-aiobotocore-iotevents-data = - buildTypesAiobotocorePackage "iotevents-data" "2.15.0" - "sha256-Q/i0S+Y/tbnM5buFT838rLwBKJenYcPmfwBq7pJ6pyQ="; + buildTypesAiobotocorePackage "iotevents-data" "2.15.1" + "sha256-j9yAFJUVBUtViPCO3DBCo1tC9AcLO2Uy4I2lfThBV+I="; types-aiobotocore-iotfleethub = - buildTypesAiobotocorePackage "iotfleethub" "2.15.0" - "sha256-EvUSF8PXk7Vb3+ic6ZtSdHJ63w2SmS0pp7QytP/tQss="; + buildTypesAiobotocorePackage "iotfleethub" "2.15.1" + "sha256-k7D8o7sxTlyjmlCBmt2uY/FKC6KUWmx9LL9k2zedszU="; types-aiobotocore-iotfleetwise = - buildTypesAiobotocorePackage "iotfleetwise" "2.15.0" - "sha256-ZEWme0qNdJpQqTKit2wqMbsCa+1E+8+TaqVz/NwolSQ="; + buildTypesAiobotocorePackage "iotfleetwise" "2.15.1" + "sha256-lozZuY4r9CkPi+SD9p/T35HyjiHVMmJ33GKNEZ/htPc="; types-aiobotocore-iotsecuretunneling = - buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.0" - "sha256-O48C/03s2bPB8DhN00BuwoW4gIqUnQG6Dm2I+Vs3waU="; + buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.1" + "sha256-3Bw3N2aIUzKNLyMGnHsxQB8bofonIcqJANariAKqXsI="; types-aiobotocore-iotsitewise = - buildTypesAiobotocorePackage "iotsitewise" "2.15.0" - "sha256-smId9Cxm0QJ7YiORYp3FdzRNt96kFIlpnWBMbSldtYE="; + buildTypesAiobotocorePackage "iotsitewise" "2.15.1" + "sha256-WZqYRDV21kkgBMb5z+6KKTlGxDJKXmMl1u3RlTPavl4="; types-aiobotocore-iotthingsgraph = - buildTypesAiobotocorePackage "iotthingsgraph" "2.15.0" - "sha256-cyjMATxGhhu4oYoa3l076VdgKJ2HHcrqrkGOYvAYMnE="; + buildTypesAiobotocorePackage "iotthingsgraph" "2.15.1" + "sha256-/ArOj+prhHoDPRymOW4NN8IXNkWuE/wZJuRAXMVmzpg="; types-aiobotocore-iottwinmaker = - buildTypesAiobotocorePackage "iottwinmaker" "2.15.0" - "sha256-xOmpDzfMY28x5eebi6P9pzPeM0bOdaj5yYeIaMnaI9E="; + buildTypesAiobotocorePackage "iottwinmaker" "2.15.1" + "sha256-gE3/juMs0BFJZEq291UGWAh41NCRHWHmZY+KcZ9IFJE="; types-aiobotocore-iotwireless = - buildTypesAiobotocorePackage "iotwireless" "2.15.0" - "sha256-d4Vxj2CQVXYTIPkPMF7hAi6TK3RTebuelZ+LfVCyIb8="; + buildTypesAiobotocorePackage "iotwireless" "2.15.1" + "sha256-PRORLAzdQ0QmYSPYWrQaPSwW8JaeTyzg8Z+N8/Hqjz8="; types-aiobotocore-ivs = - buildTypesAiobotocorePackage "ivs" "2.15.0" - "sha256-EefoDS/gNX1VkN5/5lRf4lOTHTmU0h1uZWFPiQERzvE="; + buildTypesAiobotocorePackage "ivs" "2.15.1" + "sha256-OIvBSFt9S+SmZIjdw/zcC/FC/3d9Huce5jQXgj5D+ik="; types-aiobotocore-ivs-realtime = - buildTypesAiobotocorePackage "ivs-realtime" "2.15.0" - "sha256-GBan8Ln1n/ESWDNfbRlapLI5hgyamHTKQZdroasPpxo="; + buildTypesAiobotocorePackage "ivs-realtime" "2.15.1" + "sha256-Eh5fuYJawPwAFuQl0/wLq+gTJ02C5wFZsETDsOSi3LU="; types-aiobotocore-ivschat = - buildTypesAiobotocorePackage "ivschat" "2.15.0" - "sha256-SE0wPCcmri42ZHBqw1zA07JHA29Zq40QAfeuGKb5cis="; + buildTypesAiobotocorePackage "ivschat" "2.15.1" + "sha256-jk6zZ3zX94kIfld9oXd6zW7ILhaa01XOt7c+/5pn8kk="; types-aiobotocore-kafka = - buildTypesAiobotocorePackage "kafka" "2.15.0" - "sha256-eCQIXF+idvdZZa29cdQQbNWqDCl7YRBiL6oYooS82Xw="; + buildTypesAiobotocorePackage "kafka" "2.15.1" + "sha256-NJv1QF3qBn5LJ7yhKcSmy6W3OJ8kenfzQ4RkSRx8iTo="; types-aiobotocore-kafkaconnect = - buildTypesAiobotocorePackage "kafkaconnect" "2.15.0" - "sha256-a9/2yUk/rq0npsCyrgK/2dNWVE5qP8tqF7qpSsyT40I="; + buildTypesAiobotocorePackage "kafkaconnect" "2.15.1" + "sha256-7EDrF3TxDgLeAnbUeLQj7SpFPLB+uMjqc/sQxWaXYlU="; types-aiobotocore-kendra = - buildTypesAiobotocorePackage "kendra" "2.15.0" - "sha256-4xHwrD35jq9gbPR7X0TJx60GxystcHdMCuTxSZKckhw="; + buildTypesAiobotocorePackage "kendra" "2.15.1" + "sha256-8k/FEmIfl2dKDt4JrCWdrLskYuj+A2VEHm0jqHWfUp8="; types-aiobotocore-kendra-ranking = - buildTypesAiobotocorePackage "kendra-ranking" "2.15.0" - "sha256-6MoK7C3eEhaty4jn6/Jc4o/WsZRTxDQ0FATrpSodTME="; + buildTypesAiobotocorePackage "kendra-ranking" "2.15.1" + "sha256-ZaDBuYlm35DRaiKv+xV2L+e/E5x1rGN59UTL2U5bRp8="; types-aiobotocore-keyspaces = - buildTypesAiobotocorePackage "keyspaces" "2.15.0" - "sha256-aIjdGRxpS6bbiarTM425jE8B2xbVYKaTaiJhVSQ/4JM="; + buildTypesAiobotocorePackage "keyspaces" "2.15.1" + "sha256-UgzrxIq3vh8dfw80VCue7gf8l19TqRUmRuAS/cW/G1M="; types-aiobotocore-kinesis = - buildTypesAiobotocorePackage "kinesis" "2.15.0" - "sha256-hzKV9+gFBwkIbNhlUdDrRyVFU3/VasZfyTjaZNGA0MI="; + buildTypesAiobotocorePackage "kinesis" "2.15.1" + "sha256-MF7n5Z70BFUAXaFuTDWIzFuiZ3u1fpYoZrBfRQR97Qw="; types-aiobotocore-kinesis-video-archived-media = - buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.0" - "sha256-w2b8fP8AEH3bh3iWPym7zAmX0eyXy4hobqYXwAOs3zg="; + buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.1" + "sha256-bEZV3TDr3l6Ogn49kFW/3IcFi/4NjQQnaC1LrDChlcI="; types-aiobotocore-kinesis-video-media = - buildTypesAiobotocorePackage "kinesis-video-media" "2.15.0" - "sha256-OkF8NwJTK9doelF0LCoKivpX8IQL0gJT+WgDEi1ZhkY="; + buildTypesAiobotocorePackage "kinesis-video-media" "2.15.1" + "sha256-PPT89cO2FukHtnXQHgcNZie3vPCDBmbrfRDiZCZaJ1E="; types-aiobotocore-kinesis-video-signaling = - buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.0" - "sha256-/1eZFJLoCnBbvQlSSBgwbEZRCfFdZIUbNIimTVfnxAE="; + buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.1" + "sha256-Fez2At/MFggTu7ZtfKLWCm7iELH6gumBhn3t7KdJzVA="; types-aiobotocore-kinesis-video-webrtc-storage = - buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.0" - "sha256-++LfFLQ6NkCs6NwMkJzZYUFvEw1iJA24NV0nq+9eMnY="; + buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.1" + "sha256-5h9x9Rgb1Sb8wIQwRcjkonc2070QahwPkKXfQ/lFFI8="; types-aiobotocore-kinesisanalytics = - buildTypesAiobotocorePackage "kinesisanalytics" "2.15.0" - "sha256-QaWFDq5DZiaqHZDOt9uat0d+YFsJymd+J+dJ8FBnsJ0="; + buildTypesAiobotocorePackage "kinesisanalytics" "2.15.1" + "sha256-JEye+bOxLrRJDToMs5jQZ2wcHy1K/2C5oPFUIRrtO5g="; types-aiobotocore-kinesisanalyticsv2 = - buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.0" - "sha256-qoGXnmE2xrttERNdlD0vcgGvusymNo43Qmke53Cu9O0="; + buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.1" + "sha256-j2gcnHFfWTVD3NatfJXsp3hRVEsy4930OclgR5IPbDM="; types-aiobotocore-kinesisvideo = - buildTypesAiobotocorePackage "kinesisvideo" "2.15.0" - "sha256-i5itjd7OC0MIzdV4cXYk/jKnL/fi7PqfcjBqEBxOGpU="; + buildTypesAiobotocorePackage "kinesisvideo" "2.15.1" + "sha256-mnKzF2lgYtHTNEwecoqs4qt9hQ5m2xLo79/kZHFyF5I="; types-aiobotocore-kms = - buildTypesAiobotocorePackage "kms" "2.15.0" - "sha256-tNrJ8m8e1yvBxcnAFbwDPr6mLQSEYCuip/6cnIfnkYw="; + buildTypesAiobotocorePackage "kms" "2.15.1" + "sha256-CCyhwWkjtI7wp5CN1MCK0M//bOu4ZGttbHJSUcidjUA="; types-aiobotocore-lakeformation = - buildTypesAiobotocorePackage "lakeformation" "2.15.0" - "sha256-db+t78Wdjp9Q0Yelq00j4uGO3COAq9wAQMiS04OHCDM="; + buildTypesAiobotocorePackage "lakeformation" "2.15.1" + "sha256-+BlDjTPv+fmKmUInm6FpOQFt5H5atz7BWKhrt56A3Co="; types-aiobotocore-lambda = - buildTypesAiobotocorePackage "lambda" "2.15.0" - "sha256-+zVb3jcfhxcwdZInmNgI5XD8kYg+cOztM5+vKw0NQig="; + buildTypesAiobotocorePackage "lambda" "2.15.1" + "sha256-hCTL2KBMt5p51YwnOYNcpGvzG2wvZjt23kK3FX4Qp5U="; types-aiobotocore-lex-models = - buildTypesAiobotocorePackage "lex-models" "2.15.0" - "sha256-CTBYSHSjk140r5/ntNrbhCW9qHyJkHKnuzDGy/VnvkA="; + buildTypesAiobotocorePackage "lex-models" "2.15.1" + "sha256-A8BAADavGEB7sa+fh9SRahoqN3mne7ABZjcnZI9YfBk="; types-aiobotocore-lex-runtime = - buildTypesAiobotocorePackage "lex-runtime" "2.15.0" - "sha256-HTMVi8/mDsMfLYxbOa1JoOqfFGyG87k5PDy6QBCWmFo="; + buildTypesAiobotocorePackage "lex-runtime" "2.15.1" + "sha256-QVYHr4fbnZPozVghHOZVsyChTuP2S0Ys+876slONaEc="; types-aiobotocore-lexv2-models = - buildTypesAiobotocorePackage "lexv2-models" "2.15.0" - "sha256-n+YKYwgx6LK4biiy7R0jroAniQH5eyJAZNCwt3bmd5U="; + buildTypesAiobotocorePackage "lexv2-models" "2.15.1" + "sha256-uqZrNG/mOCnfYjNF5FQofjSUeXhnidunT1754yame7E="; types-aiobotocore-lexv2-runtime = - buildTypesAiobotocorePackage "lexv2-runtime" "2.15.0" - "sha256-dsNybSvDpCf8WcCyLmsoNmvGyAYjOPMpaZEuT1Uon6w="; + buildTypesAiobotocorePackage "lexv2-runtime" "2.15.1" + "sha256-hQGTDbhJNiJc5dORzg7XJ4p+ZatNcI0qoT70qtMHzHc="; types-aiobotocore-license-manager = - buildTypesAiobotocorePackage "license-manager" "2.15.0" - "sha256-A/uBBx6+WR/QfyVSRoQ5QvxgJBoKYKomaV4Fy9bpdXs="; + buildTypesAiobotocorePackage "license-manager" "2.15.1" + "sha256-4whyQ2X/R2eMdQ7DOygNQFqMgLA+w+6ydyN8s7yxgB4="; types-aiobotocore-license-manager-linux-subscriptions = - buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.0" - "sha256-Fsr3RTvMDVSagXHnZj2NMoqLjcVIYBGWKT5WsnIWebg="; + buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.1" + "sha256-uD/N/ueijWNwibOrivY0r2HiQjYOuHQUONcW3iRCVUY="; types-aiobotocore-license-manager-user-subscriptions = - buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.0" - "sha256-UDxwOQm+n6wABPchWLmTFE0K1CjPiQwISmLl+7Za9w4="; + buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.1" + "sha256-wWghsiPCvWY7VX5XV0ad65nnG9bI5F+E5xEUzOGDdnY="; types-aiobotocore-lightsail = - buildTypesAiobotocorePackage "lightsail" "2.15.0" - "sha256-iIDdWLBhFNNxtMSardWyzHL8JcvgHJIaudJ+05PXL7Q="; + buildTypesAiobotocorePackage "lightsail" "2.15.1" + "sha256-dcGUPUxGvD/ZEyoo193VVOhSJhoFkgwSjpOV1kX/vMM="; types-aiobotocore-location = - buildTypesAiobotocorePackage "location" "2.15.0" - "sha256-fodpQvoIPV1oTNgnSfW+3zM4AMLwe3pHVtYwZYB2kaA="; + buildTypesAiobotocorePackage "location" "2.15.1" + "sha256-4rTqmcRB3HjskWJZLbQaPDyNQGHXmVVJqb5LK+EPH6Y="; types-aiobotocore-logs = - buildTypesAiobotocorePackage "logs" "2.15.0" - "sha256-ZhbzssEml+X1laF9Cs2MegVLZ4EJCV3E4ZxLW12vEKU="; + buildTypesAiobotocorePackage "logs" "2.15.1" + "sha256-CRluCc0/byuRlGr3uQyWg/MfCpPnoiS5inNLiYkhwCY="; types-aiobotocore-lookoutequipment = - buildTypesAiobotocorePackage "lookoutequipment" "2.15.0" - "sha256-H2iedaGVN7uM7BLlzcnhdSbDQI96paStbohcijsRBUk="; + buildTypesAiobotocorePackage "lookoutequipment" "2.15.1" + "sha256-q5ExCn4HAdAGISDIRckrnlmQ+J1RDNgBa5hmYSJHtVc="; types-aiobotocore-lookoutmetrics = - buildTypesAiobotocorePackage "lookoutmetrics" "2.15.0" - "sha256-VqVU6ziEvRtSQ60jPw2/XZo7dZTyAaLNUZ+6W9V8x+g="; + buildTypesAiobotocorePackage "lookoutmetrics" "2.15.1" + "sha256-SvJor9naL/MzyTtHjOn2QMNnLYXnmHYH11DuWg0+y/U="; types-aiobotocore-lookoutvision = - buildTypesAiobotocorePackage "lookoutvision" "2.15.0" - "sha256-7NoKEpbYPGMaaE2l8fzvE7wymcHOGy7La7sPzTWZzn8="; + buildTypesAiobotocorePackage "lookoutvision" "2.15.1" + "sha256-68PGFV+fSjjwAq4SoiOAaJXw1jKdQegFgz2UeHV9iL8="; types-aiobotocore-m2 = - buildTypesAiobotocorePackage "m2" "2.15.0" - "sha256-oR4biBouqRzHpLi8t62eicIBAC6uDxKhHCFJXcw98VA="; + buildTypesAiobotocorePackage "m2" "2.15.1" + "sha256-TrP432QWYmAmnka3CiWklZh3g/xrLhGJVw8iWLR5f8E="; types-aiobotocore-machinelearning = - buildTypesAiobotocorePackage "machinelearning" "2.15.0" - "sha256-/7OUplbaSrqFCX6FM5It2M0einbHeKdPuhlPuW1oAf0="; + buildTypesAiobotocorePackage "machinelearning" "2.15.1" + "sha256-0+nIbuZeuKIhQiC2+kSaDztMLOUe9rZ+guDROGM+YI4="; types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; types-aiobotocore-macie2 = - buildTypesAiobotocorePackage "macie2" "2.15.0" - "sha256-sZbckbmw1LfBLDiRjtfk2ogZe45H35vViBvr/z/syY8="; + buildTypesAiobotocorePackage "macie2" "2.15.1" + "sha256-lJq53Sxg+RpZSeQKG+nu0EhRQEEUSPoWqiORJUcoqEI="; types-aiobotocore-managedblockchain = - buildTypesAiobotocorePackage "managedblockchain" "2.15.0" - "sha256-rCmVEy/oDykR2eiEZ8K1rP+M9hvie8Fr/aVXGX/mnng="; + buildTypesAiobotocorePackage "managedblockchain" "2.15.1" + "sha256-RZUktF80I0PXhIPEZJav1i1a4FyFSyHODTeUsIcDHGE="; types-aiobotocore-managedblockchain-query = - buildTypesAiobotocorePackage "managedblockchain-query" "2.15.0" - "sha256-234BPfns0M64IQL6zLw2YXrEm6Gv9dr8jFZ6W9kiIFc="; + buildTypesAiobotocorePackage "managedblockchain-query" "2.15.1" + "sha256-xmPCGjlO0EThkhUWy+VlHLplAx7f7+zXKzr5hb/1e6A="; types-aiobotocore-marketplace-catalog = - buildTypesAiobotocorePackage "marketplace-catalog" "2.15.0" - "sha256-xt9u8d4mUUzkieGKwsh/682O1EFplNOCvf/5RuEL9iA="; + buildTypesAiobotocorePackage "marketplace-catalog" "2.15.1" + "sha256-OJeNrERgHfCYfgpn+DMmo7ZgUujg5G3bQpedipAxbX4="; types-aiobotocore-marketplace-entitlement = - buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.0" - "sha256-ZQOMPaczJfEeHHPv4GWKKrQUOBDZLBIqol4fhriAhzA="; + buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.1" + "sha256-0tSQ1wnz7R7KaRVsoNGeUcbmf4cRBrUMArCEEDJRrtc="; types-aiobotocore-marketplacecommerceanalytics = - buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.0" - "sha256-ykZADFdCQ78IlBanzIQuWiHV5p7DuI4QPYwle1H63Bw="; + buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.1" + "sha256-gq//bvGswyJgLHypO0vC0rUruMvr5DH0TQPgxb6Xkrc="; types-aiobotocore-mediaconnect = - buildTypesAiobotocorePackage "mediaconnect" "2.15.0" - "sha256-Glz572WmmAhDL7s2sBNACPwSZhB3c0JzvycEZGLIMoc="; + buildTypesAiobotocorePackage "mediaconnect" "2.15.1" + "sha256-E0hjBGm+mIW0wG8kdLAhXc4BzMzJK4gESiyS2xVIEpU="; types-aiobotocore-mediaconvert = - buildTypesAiobotocorePackage "mediaconvert" "2.15.0" - "sha256-T2S8GaUePcH/bnCOFbt1Tu9Fudhv+xoBEhJX6giF2a0="; + buildTypesAiobotocorePackage "mediaconvert" "2.15.1" + "sha256-bHWlDRHqZ6vYcsM01peSdcQ5oqvSGiG/UHWlOinT1QQ="; types-aiobotocore-medialive = - buildTypesAiobotocorePackage "medialive" "2.15.0" - "sha256-1pBMtaFdCzCWv2OXdP36NaeoLInFqlLTG46cSbWHihg="; + buildTypesAiobotocorePackage "medialive" "2.15.1" + "sha256-PrQPNUQI065kb8+ihArJOroydrAbOhFdS2yzq55nTKw="; types-aiobotocore-mediapackage = - buildTypesAiobotocorePackage "mediapackage" "2.15.0" - "sha256-3AQtWf67flmSz6pJ4HMzClD4qyuQUFafpGB74D8KJTA="; + buildTypesAiobotocorePackage "mediapackage" "2.15.1" + "sha256-2/pUMsZsuW44TpNCdtciCJ9z+Z7aREyBMBIFdV80lgU="; types-aiobotocore-mediapackage-vod = - buildTypesAiobotocorePackage "mediapackage-vod" "2.15.0" - "sha256-BPQwsGw/xXEP5SeDhIQRu376UQ9AiP7M7hy+B5j56tw="; + buildTypesAiobotocorePackage "mediapackage-vod" "2.15.1" + "sha256-QIaQ06qrpPa4nb7PgOyhbYH1Oz1KL1dwwy6/D60tgKk="; types-aiobotocore-mediapackagev2 = - buildTypesAiobotocorePackage "mediapackagev2" "2.15.0" - "sha256-Yjr+/QxMF6E7c5jsYzjptKMzMSezcSE/u5rVqBu2nGw="; + buildTypesAiobotocorePackage "mediapackagev2" "2.15.1" + "sha256-+YxeyUt3GqsliHI/T8ZMxfweAhnAXWHLxBZSNbmPVDg="; types-aiobotocore-mediastore = - buildTypesAiobotocorePackage "mediastore" "2.15.0" - "sha256-YsgTZ0j3i3nlEERkF4fLqVn5M9pkzguFqthx5XSVn1E="; + buildTypesAiobotocorePackage "mediastore" "2.15.1" + "sha256-09o+YQysUdNGoNT+IXaPIOCSHUxYFXezjxTvqPPWBNo="; types-aiobotocore-mediastore-data = - buildTypesAiobotocorePackage "mediastore-data" "2.15.0" - "sha256-ZnYZPMBhRC7e8kot/7RXCbXYGS5cU0NRfXiAdWgXVAA="; + buildTypesAiobotocorePackage "mediastore-data" "2.15.1" + "sha256-yDovPCnikCe4qHPCyZPZEu7UlIHLW59EySO3xValmgw="; types-aiobotocore-mediatailor = - buildTypesAiobotocorePackage "mediatailor" "2.15.0" - "sha256-FjHfv8tfQVFk0iBD8np1KCQFX+BuprkIiEAUJCEDPn0="; + buildTypesAiobotocorePackage "mediatailor" "2.15.1" + "sha256-BnrpdnphOkjk9D3MuhMEEBFL08NZE140o4+VR1Rp4O4="; types-aiobotocore-medical-imaging = - buildTypesAiobotocorePackage "medical-imaging" "2.15.0" - "sha256-sxbmmX7Y7NoyZzOPq3+vQFU57JrBStsWHMZig3E2ZUc="; + buildTypesAiobotocorePackage "medical-imaging" "2.15.1" + "sha256-6ona+KE489SPJSlokzwpiqERuBgWjqIYofh1rUmeKwo="; types-aiobotocore-memorydb = - buildTypesAiobotocorePackage "memorydb" "2.15.0" - "sha256-C6dAMsCasQw2+bPFnBJVUZHdKUodT1zLKYVGizI0UiA="; + buildTypesAiobotocorePackage "memorydb" "2.15.1" + "sha256-lYBb737JcKQa5cKm94O1C/psjuRNFFNftn3dctUeOnQ="; types-aiobotocore-meteringmarketplace = - buildTypesAiobotocorePackage "meteringmarketplace" "2.15.0" - "sha256-UG5Wy/1Fb3JwSL9cbzegHIj/UmVDyBIW0PhovEMMtZs="; + buildTypesAiobotocorePackage "meteringmarketplace" "2.15.1" + "sha256-9Z5s03sTVEzzXO43CTuf+YICuXisAZ/OGFyH44KOuF8="; types-aiobotocore-mgh = - buildTypesAiobotocorePackage "mgh" "2.15.0" - "sha256-YGh12HkugOCGThtFOM/YGTGSsAqhkdyLXwe/DUo06JE="; + buildTypesAiobotocorePackage "mgh" "2.15.1" + "sha256-Oqi4SM+L1FQLs0jfyWXILG/XHs5X5K+5jvGcIr76OeY="; types-aiobotocore-mgn = - buildTypesAiobotocorePackage "mgn" "2.15.0" - "sha256-pt+o3fHfEZ+i0nTtA3aL9N5835Z2fJPDTI27ct1Q6ts="; + buildTypesAiobotocorePackage "mgn" "2.15.1" + "sha256-RqvU6K50yGzVQBSzS90htrFOScpondnyceN3ISshYlI="; types-aiobotocore-migration-hub-refactor-spaces = - buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.0" - "sha256-UVbGGevpTSsk/5u4ZM4ssbupT4NNJOXRS1j6Ar6NTvg="; + buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.1" + "sha256-j4LVmlaI8tuJxjkweiZRWgnYlR5p/M2u8JSkMg3Yufs="; types-aiobotocore-migrationhub-config = - buildTypesAiobotocorePackage "migrationhub-config" "2.15.0" - "sha256-isZ/J3BH52c3kADs3QV6NCaN4U1W0SLH+2vx5FBUfYM="; + buildTypesAiobotocorePackage "migrationhub-config" "2.15.1" + "sha256-yQDw0I8jlsVpL8MSerOV66yRdCE5ik7R/v+rkBAzKrk="; types-aiobotocore-migrationhuborchestrator = - buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.0" - "sha256-21q8uRwtbfsX03ayhHNFecq8ZC/VTYZENmpWauk1oL0="; + buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.1" + "sha256-2XxADXGruMbzM50bElDkwlKQZ/r+6HPhMOjj8InGOlM="; types-aiobotocore-migrationhubstrategy = - buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.0" - "sha256-xXmi5qhzx4ZNTwXxAwOkPHHuMVevdjgm6ER0V/zaDf4="; + buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.1" + "sha256-+VYnuMVf16mrgMJ5DMqdy6CPLGavuA0gUW1kv9Uu9rs="; types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.13.2" "sha256-OxB91BCAmYnY72JBWZaBlEkpAxN2Q5aY4i1Pt3eD9hc="; types-aiobotocore-mq = - buildTypesAiobotocorePackage "mq" "2.15.0" - "sha256-c/m/RAQabQHFWArEYuvEWjekBSyh+gPTHYlwNnpQ7r0="; + buildTypesAiobotocorePackage "mq" "2.15.1" + "sha256-2WEJoWXSfDmFl9liWtIaviLnAHgRA5dAamQx1YfXgzE="; types-aiobotocore-mturk = - buildTypesAiobotocorePackage "mturk" "2.15.0" - "sha256-vtZK0eYARSRbn9RpRK4yrKz0erx75YoFCPjuGBV2ztM="; + buildTypesAiobotocorePackage "mturk" "2.15.1" + "sha256-TK9wWp3GEHhn4jypBdQEeJZp31IvKFFTuSLKxqxZoNU="; types-aiobotocore-mwaa = - buildTypesAiobotocorePackage "mwaa" "2.15.0" - "sha256-uI+uv/D25J/bkTAS3koq7rOgGimhDhHTW2ChCk9mTP0="; + buildTypesAiobotocorePackage "mwaa" "2.15.1" + "sha256-E1sWcLfHIlFelP3vb0yfhRpcyboyIutPrF3ByCNJITQ="; types-aiobotocore-neptune = - buildTypesAiobotocorePackage "neptune" "2.15.0" - "sha256-MiH4jhgesSLxaeFzzEJfuorkAC60ncXGRfg1EFvT/Qg="; + buildTypesAiobotocorePackage "neptune" "2.15.1" + "sha256-EtmxI6j5SlZZcv+YYsDki6VcMdRhZWEoJVT5VDFV/0g="; types-aiobotocore-network-firewall = - buildTypesAiobotocorePackage "network-firewall" "2.15.0" - "sha256-NLBghjcr8XbHnSaZVGxUj3jCinFZkmxagLlDMjQFCbM="; + buildTypesAiobotocorePackage "network-firewall" "2.15.1" + "sha256-xiDYqvt2e7MiAe8nCQR51q5Ov8B94eYJhQgN+lvFDuA="; types-aiobotocore-networkmanager = - buildTypesAiobotocorePackage "networkmanager" "2.15.0" - "sha256-fA1CFdV5G+3BeJFqGb/61Mh4fDgUCIHZEHb3+Po1d70="; + buildTypesAiobotocorePackage "networkmanager" "2.15.1" + "sha256-0SFOWAIckxRoWupRztC50CkOKqtUuxdNnM44SnPLYwQ="; types-aiobotocore-nimble = - buildTypesAiobotocorePackage "nimble" "2.15.0" - "sha256-0Fp0TZK21QeaKPUQ9prOE7IaDirSGBVEgH8yv8KKy20="; + buildTypesAiobotocorePackage "nimble" "2.15.1" + "sha256-Hz6tsIdCcx5vzwD0PDmPKSpjqYEYENAiZz7WuZC9Ago="; types-aiobotocore-oam = - buildTypesAiobotocorePackage "oam" "2.15.0" - "sha256-1EU1ZCtMoCQaCWnSXlrayKKaC9l82y4Edc2kc2Rm/EQ="; + buildTypesAiobotocorePackage "oam" "2.15.1" + "sha256-abqiY/pGLnV7UzoojcX5aaUtKC//y5UFYG8XoS9hJgM="; types-aiobotocore-omics = - buildTypesAiobotocorePackage "omics" "2.15.0" - "sha256-cHrKEgGV79ea9FBdDV4fltKzEDPRsiavuSszM1z7Utw="; + buildTypesAiobotocorePackage "omics" "2.15.1" + "sha256-5k0LPHH0qUlEEAV6ASredhR65Phs0133c37N+YB+tcY="; types-aiobotocore-opensearch = - buildTypesAiobotocorePackage "opensearch" "2.15.0" - "sha256-6S42q0i4SULwjyUEx1YCg5i1kgwz0oXC4tTFdMiG+Po="; + buildTypesAiobotocorePackage "opensearch" "2.15.1" + "sha256-4VqaoYwKkNckmb4BZDbWPLeEVa7tCxBD8g6pGQrr0Ng="; types-aiobotocore-opensearchserverless = - buildTypesAiobotocorePackage "opensearchserverless" "2.15.0" - "sha256-o6QHCkyNfjil/O28CCYgflU6E3pUkLZ/flGYcRoIWWE="; + buildTypesAiobotocorePackage "opensearchserverless" "2.15.1" + "sha256-80E81Kv3FzkgGQvpVHxmYqnNIRtureOvIDmKdnUo7z4="; types-aiobotocore-opsworks = - buildTypesAiobotocorePackage "opsworks" "2.15.0" - "sha256-Jg9u7P2vapI3Pwx4DFeWMTy7HriNlro0UctPhSt9TgA="; + buildTypesAiobotocorePackage "opsworks" "2.15.1" + "sha256-bAAgU0b33CNXVK0Q9ynyPGbL5KBiQq6sT/mL1pWJpD0="; types-aiobotocore-opsworkscm = - buildTypesAiobotocorePackage "opsworkscm" "2.15.0" - "sha256-34frDYBm3pH4/YYpKey/uG0Rv6DbNCXytSV3PnR3QHw="; + buildTypesAiobotocorePackage "opsworkscm" "2.15.1" + "sha256-nVywDMlzkITUEW7K6FWoYz953wAqCiUemT0tu48yO6M="; types-aiobotocore-organizations = - buildTypesAiobotocorePackage "organizations" "2.15.0" - "sha256-ZnjLqwh2+1N9Zb4nIkcysr+TGnUHBNxqy0vJABIQjuA="; + buildTypesAiobotocorePackage "organizations" "2.15.1" + "sha256-N7VzNLh+LCFrfdgmO982cau3B/d5uGoGO43vMMpTNBs="; types-aiobotocore-osis = - buildTypesAiobotocorePackage "osis" "2.15.0" - "sha256-HH7HaxV6bMywkwTsMXP3QZWc+lyWDzxtHmrZMIY/JOk="; + buildTypesAiobotocorePackage "osis" "2.15.1" + "sha256-NpjX3LpbF1CajlqY9ow4GqCVjlrTBVT1U/Gn3wHSQTE="; types-aiobotocore-outposts = - buildTypesAiobotocorePackage "outposts" "2.15.0" - "sha256-kGs9VO15CkvHdSZNA0d7OGUx5Mb/nzJK0kCna9qtRIA="; + buildTypesAiobotocorePackage "outposts" "2.15.1" + "sha256-lFRMsg9LhjizD8NsSyK209h+xtvYgTmJf5lc3OQyqdY="; types-aiobotocore-panorama = - buildTypesAiobotocorePackage "panorama" "2.15.0" - "sha256-JtO0nR0IhaCN8HNFt7YObk0ytdeirfGyXG6EFDguOxk="; + buildTypesAiobotocorePackage "panorama" "2.15.1" + "sha256-mdhrS+4Cg2VgH5AWroB2i5Pe6LEFfn9J9rEe+UQovxQ="; types-aiobotocore-payment-cryptography = - buildTypesAiobotocorePackage "payment-cryptography" "2.15.0" - "sha256-bqRMxwiGGbMqRFZqkQnsmNq4JWuXZOvLbX51IGeUz/Q="; + buildTypesAiobotocorePackage "payment-cryptography" "2.15.1" + "sha256-Lddnm936PSivXBygA44rgyd5wyPoPDns5XIYbQfQ91g="; types-aiobotocore-payment-cryptography-data = - buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.0" - "sha256-+o4Q5VmzkR9+eGUow5dlS+IyD0ukR//EQ+pbEL1v5QQ="; + buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.1" + "sha256-jTgsyYOLrTYNEfyhotGbbTrlQkTKqmd/0uKOMvmm06U="; types-aiobotocore-personalize = - buildTypesAiobotocorePackage "personalize" "2.15.0" - "sha256-jH5M7kLBNUQAsct741zqKB5OsZyIOMLbzKi96Wem4OY="; + buildTypesAiobotocorePackage "personalize" "2.15.1" + "sha256-RULc20Hv5VUT+MO1/hj+LlsdL88c1KuChWjzYY150Xs="; types-aiobotocore-personalize-events = - buildTypesAiobotocorePackage "personalize-events" "2.15.0" - "sha256-KBsvNpf8J53cucgF/auehCMsMCnVxixaGMIiW9YeSvM="; + buildTypesAiobotocorePackage "personalize-events" "2.15.1" + "sha256-3gl7NVGwfh1jy8VewE76+Pe/cPKQitdnC3JAau1S9dE="; types-aiobotocore-personalize-runtime = - buildTypesAiobotocorePackage "personalize-runtime" "2.15.0" - "sha256-Yf6yWHC2UqVHsxXc8ei6o6GPx8aAuhfMCkf7H/MoHzI="; + buildTypesAiobotocorePackage "personalize-runtime" "2.15.1" + "sha256-XnuLw62YOZN+EwJ6b1ZQCOwhIqzE8ntkrgmuqTY62vw="; types-aiobotocore-pi = - buildTypesAiobotocorePackage "pi" "2.15.0" - "sha256-Bc0f8YGFQmCybeec+SnhpWYTbGQFyt7P4WtUMc4hIuY="; + buildTypesAiobotocorePackage "pi" "2.15.1" + "sha256-g8pzgnV5puJSLogXJrQn1zhYiOB7446R4xkxOQCwqSY="; types-aiobotocore-pinpoint = - buildTypesAiobotocorePackage "pinpoint" "2.15.0" - "sha256-dHJY2ErvI8iJOdoGV+7f8hlHFtcr756fNiX8MTsXhUE="; + buildTypesAiobotocorePackage "pinpoint" "2.15.1" + "sha256-gZJM4c3tSilImlxeKWU3szTmpnXxpS6kAvF/zKXglFQ="; types-aiobotocore-pinpoint-email = - buildTypesAiobotocorePackage "pinpoint-email" "2.15.0" - "sha256-Dpdpfga05sbxoEiwmMwa9bYaclrrOK4HpOmqERoAYJw="; + buildTypesAiobotocorePackage "pinpoint-email" "2.15.1" + "sha256-eXcDiAQjLAObgX3gfGtlVL6BNK8fq81f70tPNNcKJJ8="; types-aiobotocore-pinpoint-sms-voice = - buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.0" - "sha256-HAZyyUB+jpMcTwlUEJwmOxv6pTiyhWYdpbWnShVux2k="; + buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.1" + "sha256-OPJiALIiUDioRjXkeLtksPBMlmsUpIRsZtuoTESnKpU="; types-aiobotocore-pinpoint-sms-voice-v2 = - buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.0" - "sha256-pI+ICkq+DyuutwMHngQYxprvQqdExaL0Fx8pDHDQ4MU="; + buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.1" + "sha256-SN3dXMpqcuJcWnpeUi4Jwtat9erU0KdSjfEbyf8pHXc="; types-aiobotocore-pipes = - buildTypesAiobotocorePackage "pipes" "2.15.0" - "sha256-MIBeZQBCCfmi6iehHD29uWX2ArGlyWA3wlTgVhBie2s="; + buildTypesAiobotocorePackage "pipes" "2.15.1" + "sha256-Ru3j6tm6I+wtpKzkxBSFCfAleI52WnOSqgvlCIla9fE="; types-aiobotocore-polly = - buildTypesAiobotocorePackage "polly" "2.15.0" - "sha256-g/MJiOG6PulfS5KpWxZqRS7eGNr83O6Q1wyoZvidXrA="; + buildTypesAiobotocorePackage "polly" "2.15.1" + "sha256-U9FwTzLVdE0UbAMTjMjrIMlRVlkuQRzKiIEd7ZepOWA="; types-aiobotocore-pricing = - buildTypesAiobotocorePackage "pricing" "2.15.0" - "sha256-egYnlcrzy8pZcIALNJSsW5AFfQ5O/2vQYTupGDBvNKE="; + buildTypesAiobotocorePackage "pricing" "2.15.1" + "sha256-FEzR+YjEGFKWbihsat2gaDp87fdIPDCmeRv79U08fFo="; types-aiobotocore-privatenetworks = - buildTypesAiobotocorePackage "privatenetworks" "2.15.0" - "sha256-fPrRL1QyMOvF2sg5axx6Czoa1Ad5kNs/j8MLqEh6dDE="; + buildTypesAiobotocorePackage "privatenetworks" "2.15.1" + "sha256-7OB4PIbZDsnXqLp+9cXd5ER5QIkUpjtJk+A+jT0286Y="; types-aiobotocore-proton = - buildTypesAiobotocorePackage "proton" "2.15.0" - "sha256-iJTcz8fTcBy3aw97Rn7J4m7Ha5kURK1EZvgiipqz64M="; + buildTypesAiobotocorePackage "proton" "2.15.1" + "sha256-MBUaIQIThP+JZHbVAU5r0yCHQs13wLAU87y1gRECFHU="; types-aiobotocore-qldb = - buildTypesAiobotocorePackage "qldb" "2.15.0" - "sha256-TZkL/IKBAUWR0meMUTkXqCa49ea8N32Ml67y4xjUA94="; + buildTypesAiobotocorePackage "qldb" "2.15.1" + "sha256-yES1WELzrI3Xz0F4S7y3NajtNTQO10S3hi+pQsZ4KVE="; types-aiobotocore-qldb-session = - buildTypesAiobotocorePackage "qldb-session" "2.15.0" - "sha256-uLNMZgaWk9tUwYkG3vZogqyPiTbDmLcJm8GQqT3vqI4="; + buildTypesAiobotocorePackage "qldb-session" "2.15.1" + "sha256-ISAoyu08TEXIr2VONRLIvRDaAOazDPEtPp66/CnmHv8="; types-aiobotocore-quicksight = - buildTypesAiobotocorePackage "quicksight" "2.15.0" - "sha256-QWXeYC6ZVd6tBDfOWtA1zUU7z2L0GOTeSuJiOvF2nZw="; + buildTypesAiobotocorePackage "quicksight" "2.15.1" + "sha256-eruqWUL7Yje7OJlV1arhKInqnXChEmI49nq75j4ZOrg="; types-aiobotocore-ram = - buildTypesAiobotocorePackage "ram" "2.15.0" - "sha256-BwuU/43NqfuZt99u0BtLjOye61pyLyFm55SbGR+mcEM="; + buildTypesAiobotocorePackage "ram" "2.15.1" + "sha256-/7+C/b51gkVW8QXyXg/5b1vzvTtZXS5ts9K6PWXAZU4="; types-aiobotocore-rbin = - buildTypesAiobotocorePackage "rbin" "2.15.0" - "sha256-0TrXf6db1xP42f9eJTBnzWr7w2su8Y0ExFTWmqV73fw="; + buildTypesAiobotocorePackage "rbin" "2.15.1" + "sha256-/joJicKfFNQhy24zZp6vM/EmGZGBTwPTQ8w8KHv6CF0="; types-aiobotocore-rds = - buildTypesAiobotocorePackage "rds" "2.15.0" - "sha256-X2fN3CYSDbqk6ImaaE4oVxOZbpN/UQzp1wMAFuOq7uY="; + buildTypesAiobotocorePackage "rds" "2.15.1" + "sha256-btYigxx5bnWll5u0IHDVpciY4ZV9dOxPDKReEv1i0AM="; types-aiobotocore-rds-data = - buildTypesAiobotocorePackage "rds-data" "2.15.0" - "sha256-vyi+0YaxujcmWQfm/vQaWY/iozoFTNHRkJsCqBDSby4="; + buildTypesAiobotocorePackage "rds-data" "2.15.1" + "sha256-Kn4uM9F1UkiWGshjX62WD5qROnnTw6TgG4bPv9EWz4A="; types-aiobotocore-redshift = - buildTypesAiobotocorePackage "redshift" "2.15.0" - "sha256-wavvzMsczE/TJJEqcCLVm7t2QHscZuv8TS6Qsuuu990="; + buildTypesAiobotocorePackage "redshift" "2.15.1" + "sha256-cOu5LEVvs1VdXyfgtM7PYzIUsNN1l//gHTiY0ArmFf0="; types-aiobotocore-redshift-data = - buildTypesAiobotocorePackage "redshift-data" "2.15.0" - "sha256-JK3ZCluyF9pReeLHZy4AjgRIJTzmabb4vYakuHIracs="; + buildTypesAiobotocorePackage "redshift-data" "2.15.1" + "sha256-9A4p2lohJEhOcL868mMJcmmjYSS8Gd/5ShbkvTunDQs="; types-aiobotocore-redshift-serverless = - buildTypesAiobotocorePackage "redshift-serverless" "2.15.0" - "sha256-aw/ubbtRU1rGRnYr1j2a/WQTohYjJhBmNJ8nP9Kxk4Y="; + buildTypesAiobotocorePackage "redshift-serverless" "2.15.1" + "sha256-s+maghPzS18nSG+ozOp/hKQJRHZHwPhsASqUXaOs6Pk="; types-aiobotocore-rekognition = - buildTypesAiobotocorePackage "rekognition" "2.15.0" - "sha256-Ptv7sgRHVfbtRIEQM/M0Di0UPIVZC79Td15H2SHyTsE="; + buildTypesAiobotocorePackage "rekognition" "2.15.1" + "sha256-aLCYGd8+LIgHxsR8Qr+rrruL5JERkn1etCL3o/A8sZw="; types-aiobotocore-resiliencehub = - buildTypesAiobotocorePackage "resiliencehub" "2.15.0" - "sha256-/tJDFZQCnSvww/Mp8xL0AGhJxTmCCeI68fkvC4TSbjU="; + buildTypesAiobotocorePackage "resiliencehub" "2.15.1" + "sha256-e8WN5g/vbWaYSNMZS43GOkdx6AFL15cPUvZn0Ufsvqk="; types-aiobotocore-resource-explorer-2 = - buildTypesAiobotocorePackage "resource-explorer-2" "2.15.0" - "sha256-yF8QaebGjKkuqZKU0kkgSjXBmVpVnGdhuGG8jYi8UP0="; + buildTypesAiobotocorePackage "resource-explorer-2" "2.15.1" + "sha256-/WiO9zp/YK8+2p97cbY5GwQcb1XB5i86QBlXERTDxk8="; types-aiobotocore-resource-groups = - buildTypesAiobotocorePackage "resource-groups" "2.15.0" - "sha256-mxFaUb2cLNLaq9+pdUbfumO096kr2Ic2qGdKirR41LE="; + buildTypesAiobotocorePackage "resource-groups" "2.15.1" + "sha256-hGUdTC5ksWqneEqIROSc3XqYANVrtL2caM+OqTVnlcw="; types-aiobotocore-resourcegroupstaggingapi = - buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.0" - "sha256-4ISZza2xs+0qJ61oLDRI+a8PIS2Dw5ybWjmWpMzW4UQ="; + buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.1" + "sha256-zJvPU3lXoxxw1LF0HkPTfO7d62Q0mTCuqGKQT/8LbPQ="; types-aiobotocore-robomaker = - buildTypesAiobotocorePackage "robomaker" "2.15.0" - "sha256-8R7Sy54+dC+PlgBmZ60vI0ZC31IqPbqv6x0kM4oomlE="; + buildTypesAiobotocorePackage "robomaker" "2.15.1" + "sha256-X1hQ7pzhlsD9AcD2JdM/1u9W8PGRFnJaWhArHhZLPrk="; types-aiobotocore-rolesanywhere = - buildTypesAiobotocorePackage "rolesanywhere" "2.15.0" - "sha256-8iyTLdJAWs9ptCUoeh9BkPQ50uCMRoT/NnKrQ8OajDc="; + buildTypesAiobotocorePackage "rolesanywhere" "2.15.1" + "sha256-VjjHrGv8GuQ+4Fd8meBih98YxFpVChvusBZDKJ7jvAA="; types-aiobotocore-route53 = - buildTypesAiobotocorePackage "route53" "2.15.0" - "sha256-UgH+fKQ+qsstCcPyvFUsG3ToMtJJCY4qlCkhMsfQfIM="; + buildTypesAiobotocorePackage "route53" "2.15.1" + "sha256-p1N0+9s+QDRoSkgiRtsmyGrxmse405CDwuPW10r2TFY="; types-aiobotocore-route53-recovery-cluster = - buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.0" - "sha256-4Zt9w4r3OxoXOQH0o8nmamEWWwA36yBaAFNeX0trDk0="; + buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.1" + "sha256-L27J6hqxLMwxm8r2DK3xc7LrtNOgt5HSBE/YsjqH9c8="; types-aiobotocore-route53-recovery-control-config = - buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.0" - "sha256-z5WITGBPD7P+k33UL9rD5VLavtyXV3LAZcv0FpgC6/w="; + buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.1" + "sha256-njXhqJ+7xnxabYnNqknXA67I2J88jxHk9oErziic1FU="; types-aiobotocore-route53-recovery-readiness = - buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.0" - "sha256-Wc1AnMZa92WjRuc+rVePRadTSdcZfEAYOnmOyEpMaHs="; + buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.1" + "sha256-U0jzrXqfz/X/Dg1S03/is/xkQwIO9ICwg5s/YYImBf4="; types-aiobotocore-route53domains = - buildTypesAiobotocorePackage "route53domains" "2.15.0" - "sha256-jUSEzlaMkj8Wj7VGXpIRwYHFl6n9Ei8dSgMIROtXsPo="; + buildTypesAiobotocorePackage "route53domains" "2.15.1" + "sha256-PL1oQYboRsEDlCACZ/f+WORfaj/3pv05XyyZf118cl0="; types-aiobotocore-route53resolver = - buildTypesAiobotocorePackage "route53resolver" "2.15.0" - "sha256-CUJK2fsYrzHtm/XOXIFY2XYflI7XS7V9p2LyLxb6Cus="; + buildTypesAiobotocorePackage "route53resolver" "2.15.1" + "sha256-P4Iq5h9zo7y0UIcwLml8cCjjP5wKgtxP2EX3KTVPobw="; types-aiobotocore-rum = - buildTypesAiobotocorePackage "rum" "2.15.0" - "sha256-qke+xaXPd7UjBq0C1eEjw8zwjd2hpuQ/XP3FJNULKgY="; + buildTypesAiobotocorePackage "rum" "2.15.1" + "sha256-3WO3zTqIDqRR+bkAdsEg8KxruV43uUKGV86c+7jAKgw="; types-aiobotocore-s3 = - buildTypesAiobotocorePackage "s3" "2.15.0" - "sha256-S3ZBfYlpZqBkUNgWNirNYkwlshwEDdEJVlJ+61Gdz/c="; + buildTypesAiobotocorePackage "s3" "2.15.1" + "sha256-nm1iUImUWba9BNV0JUKC1uYWxiFTKLCw3vUBsuqd188="; types-aiobotocore-s3control = - buildTypesAiobotocorePackage "s3control" "2.15.0" - "sha256-L9YP3AIR4wn4m+eG8mHrK8M+IzrVlSC1j/NMeWTLXDU="; + buildTypesAiobotocorePackage "s3control" "2.15.1" + "sha256-VDIAA8d4/zv5pI1frk6tFZJ9qWtC29b9rZdIYN0YYLA="; types-aiobotocore-s3outposts = - buildTypesAiobotocorePackage "s3outposts" "2.15.0" - "sha256-CFXrxd2HOtz0Z8sz9aIXLRKRYd9louiLBfixa68l5AU="; + buildTypesAiobotocorePackage "s3outposts" "2.15.1" + "sha256-3IyAJHmya+ycc0do6H4NZnhn3Duhj/ITiW+b90x7d8o="; types-aiobotocore-sagemaker = - buildTypesAiobotocorePackage "sagemaker" "2.15.0" - "sha256-hVy9kRYhnec8Q1wJDqZiSek5Ww5QmahwJRJX0V+PjmU="; + buildTypesAiobotocorePackage "sagemaker" "2.15.1" + "sha256-kwB5VOix83ehKTJ6cXvR5aHO5ogYQvg3+CAnWEFll1k="; types-aiobotocore-sagemaker-a2i-runtime = - buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.0" - "sha256-3jd5E8DSxushqXkIfkS9zm2s2p+iLlJfFBqCJz9STz0="; + buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.1" + "sha256-qGMnLC7fZA+OEwZNbfCQMJFiwO0mf/1chvMFi0CpIco="; types-aiobotocore-sagemaker-edge = - buildTypesAiobotocorePackage "sagemaker-edge" "2.15.0" - "sha256-uydOAL5VEfRTL0QLl0aKIdCEjw2RYRp/RRSVMOKKsHs="; + buildTypesAiobotocorePackage "sagemaker-edge" "2.15.1" + "sha256-oDvjSp0rQFBDclkyLifawL/hobIcT3RuNXS3IuJmG+4="; types-aiobotocore-sagemaker-featurestore-runtime = - buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.0" - "sha256-QiOGTUpL0R68Ns+Y3losMUVskv5YHf8/MnrmqeJqgmo="; + buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.1" + "sha256-ynKSN7dB42JJw6DQOpLjwZXSrNvIgqfYrlEaXKE+agw="; types-aiobotocore-sagemaker-geospatial = - buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.0" - "sha256-oQRTnA2lbRkd1Tv7g44GdKuVuq9BZ2PXLTNWUyABKfg="; + buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.1" + "sha256-GW0b2GWrahRsWM9p/sS896CLotC4NlHC+Tyya4AbANs="; types-aiobotocore-sagemaker-metrics = - buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.0" - "sha256-jzwn2HDRNL9QmSEy6V2tNTL6gcHyBXPEQnuBVISy8xY="; + buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.1" + "sha256-xT0K4NB2r9ajVEDgTr8tAPtUQLVwZj4/q/9lFxNoRy4="; types-aiobotocore-sagemaker-runtime = - buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.0" - "sha256-RtVl6fH1znkuNWPZ4Ndhb+qplLfDq1n1YzQ9p9Wk6G0="; + buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.1" + "sha256-EKfd1G+A7T5A/7h+ZfWm+feD7VCEUU+RohAM8804Th8="; types-aiobotocore-savingsplans = - buildTypesAiobotocorePackage "savingsplans" "2.15.0" - "sha256-uLmimcAk1vZO+2QlWlpV5LxTSxooYdQNsYET8CJ+tg0="; + buildTypesAiobotocorePackage "savingsplans" "2.15.1" + "sha256-fpMpgVdydbNYhse3LemZWeu6pvLuXWYy7Nt3+CSedl0="; types-aiobotocore-scheduler = - buildTypesAiobotocorePackage "scheduler" "2.15.0" - "sha256-0/WvqWSd8VGISlqrTx8ef6B839PkYzDte2JYRTXwUeM="; + buildTypesAiobotocorePackage "scheduler" "2.15.1" + "sha256-786gr8xrz39LVOuU0EYtyBhUxDbo3YEH5UXzmY4+xSo="; types-aiobotocore-schemas = - buildTypesAiobotocorePackage "schemas" "2.15.0" - "sha256-+RA7DzmObfY/lbo1CCQUDMFacw/mwQGzXG8L44/y5z8="; + buildTypesAiobotocorePackage "schemas" "2.15.1" + "sha256-JUC3Sa94XRotK9rTelvMVG4TUQyrnVQ9Mdd+byd4A3w="; types-aiobotocore-sdb = - buildTypesAiobotocorePackage "sdb" "2.15.0" - "sha256-ImfIS00D5p0FYZW43C6ZMz8dvSowWDavlauuTYRIBZg="; + buildTypesAiobotocorePackage "sdb" "2.15.1" + "sha256-EV0eNjxdjT/JNuTip75SuCVDZfvQz71UbIgUHWfbakc="; types-aiobotocore-secretsmanager = - buildTypesAiobotocorePackage "secretsmanager" "2.15.0" - "sha256-w/ngCgJP9V1i11LDIVB1mqaDc3mKhALCpHHpMjoWnL4="; + buildTypesAiobotocorePackage "secretsmanager" "2.15.1" + "sha256-GW4y+JyGelERL39KPMOcF/7+pwGBuPwKhNwecBi5BBg="; types-aiobotocore-securityhub = - buildTypesAiobotocorePackage "securityhub" "2.15.0" - "sha256-EM+0L25N202Y3jLmcDz9EzfCr913N+ttbO36s0B2Cjg="; + buildTypesAiobotocorePackage "securityhub" "2.15.1" + "sha256-ONJsSG+d2fSaoPyrchl+oosIeVSjwoN5d0BPolDhhbk="; types-aiobotocore-securitylake = - buildTypesAiobotocorePackage "securitylake" "2.15.0" - "sha256-grQYAC3rSiuW8JoqJr9ESuRx0OrwukhAHZuLBdTYMoc="; + buildTypesAiobotocorePackage "securitylake" "2.15.1" + "sha256-ggAfufDDaW+LdNindZoAR1xeWr+hQKr1ImTl+nGE0B8="; types-aiobotocore-serverlessrepo = - buildTypesAiobotocorePackage "serverlessrepo" "2.15.0" - "sha256-Vvt7f6trMwQWDIC8jOs0HrkG5UB7OyDZB8QKztYPusM="; + buildTypesAiobotocorePackage "serverlessrepo" "2.15.1" + "sha256-zUBoLdhvpvI/tTza9abj//Hkc59gMe70kqEF1SEW+FE="; types-aiobotocore-service-quotas = - buildTypesAiobotocorePackage "service-quotas" "2.15.0" - "sha256-NVUuGzwoRUyJu5rZVkJod0BIzIt6flp7egiuM9SzXIo="; + buildTypesAiobotocorePackage "service-quotas" "2.15.1" + "sha256-M1elV0BE1RyFOo2XlKVIt5gH1M4bIU7rld77+cGCptg="; types-aiobotocore-servicecatalog = - buildTypesAiobotocorePackage "servicecatalog" "2.15.0" - "sha256-pEUUNvG0GF73VL5o3djXl6bz5UsdUV6Jlz7itavgdqc="; + buildTypesAiobotocorePackage "servicecatalog" "2.15.1" + "sha256-fgFgmDsx68FgZHOXTrJEB6OqVOlaVWgSer29dKwiBJo="; types-aiobotocore-servicecatalog-appregistry = - buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.0" - "sha256-/8dE7iiNcJ5ExvzorCG1rpbvOp6HNhw3hibymr+Y+z0="; + buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.1" + "sha256-NG2E4XxicGVtpLqi8n/j2C+BsxdMyWb554XX/HlnExI="; types-aiobotocore-servicediscovery = - buildTypesAiobotocorePackage "servicediscovery" "2.15.0" - "sha256-0GNZgK445MrP84a8ZlOyfhbx24EOVWcwJMlK8G0Rjqo="; + buildTypesAiobotocorePackage "servicediscovery" "2.15.1" + "sha256-/6OTsZUTgwYXFzTf1G8hkngaN32L8dPJzgdNMSXisfo="; types-aiobotocore-ses = - buildTypesAiobotocorePackage "ses" "2.15.0" - "sha256-df/+KPwhP26hZIHj+kB8TT0SEmzvA1sSXEAyXOOu/oQ="; + buildTypesAiobotocorePackage "ses" "2.15.1" + "sha256-H3mZA65etYo+frlSNEMs/lT8G86oWbNjlkPefoIc6AA="; types-aiobotocore-sesv2 = - buildTypesAiobotocorePackage "sesv2" "2.15.0" - "sha256-17EmuWlNJZA+zIZChhHFkPRC+doE/n+ebPqVk73VtNs="; + buildTypesAiobotocorePackage "sesv2" "2.15.1" + "sha256-diE7lw1LMxiy4gRam1zymw98VJGKaEWwQ5FudCma9ZU="; types-aiobotocore-shield = - buildTypesAiobotocorePackage "shield" "2.15.0" - "sha256-LVdaqwMmqHeBlU++Npje5zo/y9lHkyeNFNNGaETypNk="; + buildTypesAiobotocorePackage "shield" "2.15.1" + "sha256-jeklWyR6ArvO9/i/2Iji+YbAsv2rnNLqKoSTBL5VDSQ="; types-aiobotocore-signer = - buildTypesAiobotocorePackage "signer" "2.15.0" - "sha256-K0R9aAS2jacez/U5l9QIiPsBUwMDlW/bb8blBVkoolY="; + buildTypesAiobotocorePackage "signer" "2.15.1" + "sha256-I+Cfmn14B9W1O/LBNWZZ9384H0DexJav2bkc4+2zV58="; types-aiobotocore-simspaceweaver = - buildTypesAiobotocorePackage "simspaceweaver" "2.15.0" - "sha256-Ilus9YxPmEpqLwuwh1GPZeDl/C7wVOUAaVi9xXRLT9E="; + buildTypesAiobotocorePackage "simspaceweaver" "2.15.1" + "sha256-1B4R4cjzz3fnevwRsT4o3mzlzw4tXbO1kENgWOWbU7w="; types-aiobotocore-sms = - buildTypesAiobotocorePackage "sms" "2.15.0" - "sha256-BniFLeuZataAM/NYyOK6iB4b2a/sWtgNRpVfgHsqYiY="; + buildTypesAiobotocorePackage "sms" "2.15.1" + "sha256-w2iD7ZpVIIDRuTWikJAp3j7j7jBfcpPnKXfTm6KWq10="; types-aiobotocore-sms-voice = - buildTypesAiobotocorePackage "sms-voice" "2.15.0" - "sha256-9MCKNyOtMOcEl/JpDNd4d9UmdJQFuxOSYVQFoRg3CL4="; + buildTypesAiobotocorePackage "sms-voice" "2.15.1" + "sha256-+SZAFFyf+UTytFecjCv/MH9VykOCxFxXJEen1DZdljs="; types-aiobotocore-snow-device-management = - buildTypesAiobotocorePackage "snow-device-management" "2.15.0" - "sha256-ZEz4+4y7ebhBOyeYxGUrwSDeqiU2/JDMJM/3i1jqJYU="; + buildTypesAiobotocorePackage "snow-device-management" "2.15.1" + "sha256-kaiXmu24wDGIzDtXJ2pT87Wdr3zzRioLVU5TjaNVsRo="; types-aiobotocore-snowball = - buildTypesAiobotocorePackage "snowball" "2.15.0" - "sha256-WL3OEnSX9SnfAZeNzknAwCiFTxnS49M8vg4Do+qa7Es="; + buildTypesAiobotocorePackage "snowball" "2.15.1" + "sha256-YvZxBJGNtRVSsJAtv46Nq9xliVvXShiI2exeir+bp8U="; types-aiobotocore-sns = - buildTypesAiobotocorePackage "sns" "2.15.0" - "sha256-zoLt5UlcGqxQZY3LYzL3urQeryT/KQqmlMlMOx5UD9k="; + buildTypesAiobotocorePackage "sns" "2.15.1" + "sha256-U/VvZwz7qMrnPjgQUL0NMnNS6e5X4PgW/rjwBi65iAU="; types-aiobotocore-sqs = - buildTypesAiobotocorePackage "sqs" "2.15.0" - "sha256-pYlp0b+AowToQQsrIcOS/dA/1a49WwNbojMsWXXroxs="; + buildTypesAiobotocorePackage "sqs" "2.15.1" + "sha256-CI9nNt+zfztYT6DwgjAe9RNtebegPAAsSl692FBF7hA="; types-aiobotocore-ssm = - buildTypesAiobotocorePackage "ssm" "2.15.0" - "sha256-LGuL7mGhe7XVBetPFKrwqswpyMwLO3aXuWRwuWV1n4g="; + buildTypesAiobotocorePackage "ssm" "2.15.1" + "sha256-x/b1hpCTHqZcTJTzwQc+pYjdOYCiyQdsLw1vBpuPQyc="; types-aiobotocore-ssm-contacts = - buildTypesAiobotocorePackage "ssm-contacts" "2.15.0" - "sha256-lycHVp5nrD6z0dXwqN5KTs7OGQwAZaAZCM5Gezqj+rQ="; + buildTypesAiobotocorePackage "ssm-contacts" "2.15.1" + "sha256-3N8kaI67M6xKuTsESi/x4FVXy2Lsdoc9RRGIo7bKAok="; types-aiobotocore-ssm-incidents = - buildTypesAiobotocorePackage "ssm-incidents" "2.15.0" - "sha256-CeSG0L3z5T+tlgrAa/dKU6knE6qKsA6B6+nJXDcgXqg="; + buildTypesAiobotocorePackage "ssm-incidents" "2.15.1" + "sha256-Fkl8ZgS3DD3hRYWQHl1cM2RCNHi8tWk9a1fyCQa+/KM="; types-aiobotocore-ssm-sap = - buildTypesAiobotocorePackage "ssm-sap" "2.15.0" - "sha256-0Dmwb0nOp3g3HY4gjxXKVRDFl/tjC1ppyzzrftgBkZU="; + buildTypesAiobotocorePackage "ssm-sap" "2.15.1" + "sha256-23gDeTpYf9sNK2ARSPwZTkNSlGIze8ybLymQ+X0cf74="; types-aiobotocore-sso = - buildTypesAiobotocorePackage "sso" "2.15.0" - "sha256-a9sxXz66olmSe2+PP27DFTcE9FK+ZFi7mNl3pdcOh8Q="; + buildTypesAiobotocorePackage "sso" "2.15.1" + "sha256-7uJXGduh2yrj0nLWgTyELxdB6ZaU7TX35GywXTECU64="; types-aiobotocore-sso-admin = - buildTypesAiobotocorePackage "sso-admin" "2.15.0" - "sha256-v+Co+P2VVLLF4HPES1x4gXFfq+m3EnreuD4iequsGis="; + buildTypesAiobotocorePackage "sso-admin" "2.15.1" + "sha256-qTAoxjZnze1ffC/QdVnCRy37H4Tzc1AkAERvvtVxkik="; types-aiobotocore-sso-oidc = - buildTypesAiobotocorePackage "sso-oidc" "2.15.0" - "sha256-qZ0w9T/NYTvLfOQ4CwZUoNtwVFmrAH6Ow6r5Lru1Vsk="; + buildTypesAiobotocorePackage "sso-oidc" "2.15.1" + "sha256-+MsbvjZLLdY/JOr/yWBvrfHQ3SEWvUtzvaImsYNX0YI="; types-aiobotocore-stepfunctions = - buildTypesAiobotocorePackage "stepfunctions" "2.15.0" - "sha256-bZPSrZ+hzxPrBYeE7PT8OGaM3V8T6950gxacsifLr0Y="; + buildTypesAiobotocorePackage "stepfunctions" "2.15.1" + "sha256-4YKcuhem2grrKP2I0y+fayyQ4beVhKQJ7KAC70TgN14="; types-aiobotocore-storagegateway = - buildTypesAiobotocorePackage "storagegateway" "2.15.0" - "sha256-THc96oaV0Bh7x9H+xSsV7LD1QwJKMT8t3z2H0Qzq3lw="; + buildTypesAiobotocorePackage "storagegateway" "2.15.1" + "sha256-DDxzE4KcnC4sjVgBMt2cldFgm2JIeA7pRR7lqocvXN8="; types-aiobotocore-sts = - buildTypesAiobotocorePackage "sts" "2.15.0" - "sha256-ElXjKUWdOuR3xOBF59/FjWol+4v16Z5KzaGsuNL//Ng="; + buildTypesAiobotocorePackage "sts" "2.15.1" + "sha256-LMs2iAbogup0JrXFBIJhpgn8oFuhH3jGnb/Xh60xsMg="; types-aiobotocore-support = - buildTypesAiobotocorePackage "support" "2.15.0" - "sha256-263KZcvknzGUEJYl1FX2iwqz/3OWDnE3twBwZepzFaY="; + buildTypesAiobotocorePackage "support" "2.15.1" + "sha256-fpQ5fan2CkWJrnir65tBHyXAqSa1CVQXt/Q1h7NiyjU="; types-aiobotocore-support-app = - buildTypesAiobotocorePackage "support-app" "2.15.0" - "sha256-5YPHOgKZJADFOcefgIBg5NwolDQxDqruE3rtv3SaqJo="; + buildTypesAiobotocorePackage "support-app" "2.15.1" + "sha256-W/uBm0i+eNsPdSpZ+WvxSRJpZTzRdnt4snregNIeghQ="; types-aiobotocore-swf = - buildTypesAiobotocorePackage "swf" "2.15.0" - "sha256-7HH2Pe87MmL1huAN2G9zNf7LfdWMWMgX6zIBAxap7NU="; + buildTypesAiobotocorePackage "swf" "2.15.1" + "sha256-ijmqVcESbAfQLCgWhIEqq1+V8fChp1Pq0IfeBjmPtPM="; types-aiobotocore-synthetics = - buildTypesAiobotocorePackage "synthetics" "2.15.0" - "sha256-98S15J1C+jOv6eTO/EPEYN4qj8eWKLotMMjgpPUA5k0="; + buildTypesAiobotocorePackage "synthetics" "2.15.1" + "sha256-mDvgYxDjVc2Z+IGCiaNR3xOYuht1LHJPW1lViQsfsfQ="; types-aiobotocore-textract = - buildTypesAiobotocorePackage "textract" "2.15.0" - "sha256-YwmAG8BMUrluE1oLDRVQ5CwfThaDnQahl2ENauOlhxw="; + buildTypesAiobotocorePackage "textract" "2.15.1" + "sha256-HLjYbm4OK2gvKMKBkNZytKlChMW43y8g2k0CMVVvcGY="; types-aiobotocore-timestream-query = - buildTypesAiobotocorePackage "timestream-query" "2.15.0" - "sha256-1RG3Y9yOkZh6/rySlvRzH32F5jDsw+o4UrCyiaRJZt0="; + buildTypesAiobotocorePackage "timestream-query" "2.15.1" + "sha256-Jx3U+EzIZzTntyq5YxlSJkHQaGX3JkKqCOlHtGqO7vY="; types-aiobotocore-timestream-write = - buildTypesAiobotocorePackage "timestream-write" "2.15.0" - "sha256-94yxaeKblMoFpN9UgZqR3+x65my8UHg8002tVNnWB18="; + buildTypesAiobotocorePackage "timestream-write" "2.15.1" + "sha256-h1eonOUwVXsybJ25UfQwZtZWuhDh1v8M10ZT9JM1NVo="; types-aiobotocore-tnb = - buildTypesAiobotocorePackage "tnb" "2.15.0" - "sha256-+5m/DzJB5y1eucLfqj3j7FyVRW4vgGxIJOfqLCs24qM="; + buildTypesAiobotocorePackage "tnb" "2.15.1" + "sha256-6b9c2UdaNHM3/GAiGWFnZVR7sUP+cUy9Z5W3Ig+7fSM="; types-aiobotocore-transcribe = - buildTypesAiobotocorePackage "transcribe" "2.15.0" - "sha256-HIFmwpEuWcvQVKHvQ9pbqrLk76J7IpH7Hd8qbm/Aopc="; + buildTypesAiobotocorePackage "transcribe" "2.15.1" + "sha256-bLQrTDUhbYOTYY+KvUxMwiHgPFHrAJxB8Yjy3TUAMCc="; types-aiobotocore-transfer = - buildTypesAiobotocorePackage "transfer" "2.15.0" - "sha256-7Hz2zgr87h5xVhkf1+UzJN+O13rPqohVN4qZ2/E8ir4="; + buildTypesAiobotocorePackage "transfer" "2.15.1" + "sha256-+cSgukEugB7RSrkWsEgbiMS6tvjAJDPwVP+rVEsAMJE="; types-aiobotocore-translate = - buildTypesAiobotocorePackage "translate" "2.15.0" - "sha256-eauTD0hzFk83sn41EnlJxrz3V1teKYQsD7ci9AhiFYc="; + buildTypesAiobotocorePackage "translate" "2.15.1" + "sha256-Hf46I5GHQyLAN6IXL0X0VN6Mr3CsMhhPFKqx/fDrHv8="; types-aiobotocore-verifiedpermissions = - buildTypesAiobotocorePackage "verifiedpermissions" "2.15.0" - "sha256-0MmY0RefjXcu/2cZjhR+DoLSBETiqTHO4p+O7/CsQSY="; + buildTypesAiobotocorePackage "verifiedpermissions" "2.15.1" + "sha256-yxamVPkF/RexBvdBpjUi8rYzEy5jOf15otKqi64gnOc="; types-aiobotocore-voice-id = - buildTypesAiobotocorePackage "voice-id" "2.15.0" - "sha256-5tsvPjGjtoXQZdYQ+NjoXcCU2F8IY/EQgEOUow+EIME="; + buildTypesAiobotocorePackage "voice-id" "2.15.1" + "sha256-B7Q0TAT7rMWVZf4wSE6qGxMalHwvV7hPrcnCw3vcQkw="; types-aiobotocore-vpc-lattice = - buildTypesAiobotocorePackage "vpc-lattice" "2.15.0" - "sha256-Lw4kqT/JIrzK4cVsm6c1hUTTE1t6etVHfuzskO6kMyY="; + buildTypesAiobotocorePackage "vpc-lattice" "2.15.1" + "sha256-ybBzzhKX3NClXHnYR7GBpQZGsF+xPprHrbHgOjeR+9U="; types-aiobotocore-waf = - buildTypesAiobotocorePackage "waf" "2.15.0" - "sha256-syx0otSKJ896wcitfxqsJafFxf/4nokZ7pUQGiEEYTg="; + buildTypesAiobotocorePackage "waf" "2.15.1" + "sha256-YPYrL6RRL0UhABcDZXpJQ8RQWDvPkD+y/qDQ1PbLCuU="; types-aiobotocore-waf-regional = - buildTypesAiobotocorePackage "waf-regional" "2.15.0" - "sha256-9qIuIhKCDE6W09Ue2RFTrmKzFjK+73l6MA5X2zhoo3U="; + buildTypesAiobotocorePackage "waf-regional" "2.15.1" + "sha256-fkKB2Cmg0i/OOJKkHmLzU0UWkUDXVAjXYmBWpal6pg4="; types-aiobotocore-wafv2 = - buildTypesAiobotocorePackage "wafv2" "2.15.0" - "sha256-yeQPntqK7MRxLVqW54sihvcQ4t1MU3+sEz76N+wE0DI="; + buildTypesAiobotocorePackage "wafv2" "2.15.1" + "sha256-f5xAh/57zMcvjJHeqDDSrlSx3u/J3e78oQmGVSyD4Vc="; types-aiobotocore-wellarchitected = - buildTypesAiobotocorePackage "wellarchitected" "2.15.0" - "sha256-ac5AzHfMlUq9x511Dfv4abQAjMc9LFvnmfSN7neAgdM="; + buildTypesAiobotocorePackage "wellarchitected" "2.15.1" + "sha256-j1yGNqM32RKzz5xmL52+cwS9JIj1DUIJQatHz7ZjZrg="; types-aiobotocore-wisdom = - buildTypesAiobotocorePackage "wisdom" "2.15.0" - "sha256-HYeQ/YnZYWyIs12disXzm9LM2ZA8K1KSCGyI2oPwfjA="; + buildTypesAiobotocorePackage "wisdom" "2.15.1" + "sha256-0rngVEUa9yBIeoMC2dKVVDty4DAiesQZJRm73C4PAhg="; types-aiobotocore-workdocs = - buildTypesAiobotocorePackage "workdocs" "2.15.0" - "sha256-hue/UsRvpngLHlgFFmTIPbCXzbtFB1vCkhEkiB7TNrA="; + buildTypesAiobotocorePackage "workdocs" "2.15.1" + "sha256-Jypse/lhsvGWfu8551dngM+Jp8BdIp2T1WRfqdV02ug="; types-aiobotocore-worklink = - buildTypesAiobotocorePackage "worklink" "2.15.0" - "sha256-m4lbQZhG7UjtgSnsPyH37K51YxohcdfRwe0jPZGqQUs="; + buildTypesAiobotocorePackage "worklink" "2.15.1" + "sha256-VvuxiybvGaehPqyVUYGO1bbVSQ0OYgk6LbzgoKLHF2c="; types-aiobotocore-workmail = - buildTypesAiobotocorePackage "workmail" "2.15.0" - "sha256-vQRAXpFV6RG4HWKRHLgLOQHr++Mqly20MsTlIn2M/yA="; + buildTypesAiobotocorePackage "workmail" "2.15.1" + "sha256-o2n4u7wgJPSS02LLZe+PLsxdwm5r+0j3VzDFVnR7bGc="; types-aiobotocore-workmailmessageflow = - buildTypesAiobotocorePackage "workmailmessageflow" "2.15.0" - "sha256-7iMPW/8tdqfAmcCNCcTppvzaa4zo/8NCQMIuByJVB44="; + buildTypesAiobotocorePackage "workmailmessageflow" "2.15.1" + "sha256-PQQLKPZYaCqIVTXS8PWAjrYjp4ZTMl1XDuvz27s10sY="; types-aiobotocore-workspaces = - buildTypesAiobotocorePackage "workspaces" "2.15.0" - "sha256-wN9Jx2vAtKsDJ9YJBJOVguEJY0OLu8OUxY/K9bRqymM="; + buildTypesAiobotocorePackage "workspaces" "2.15.1" + "sha256-eU+8eBZ52BEAqpvHWJ4aVr2kuz6/6fMu7yu4bA9f/TQ="; types-aiobotocore-workspaces-web = - buildTypesAiobotocorePackage "workspaces-web" "2.15.0" - "sha256-ikKQGGpRu04WF1cix4RysjNSSl0sbA6QdPP2b2amz0E="; + buildTypesAiobotocorePackage "workspaces-web" "2.15.1" + "sha256-+lUuiVz/wqkuH59QzB8ZIv+bvNGeNZvBDzUctYd6LAg="; types-aiobotocore-xray = - buildTypesAiobotocorePackage "xray" "2.15.0" - "sha256-6axavJjQY10qnYlFnxXQvj44Dg9hmqYbpAHmTeOHoUU="; + buildTypesAiobotocorePackage "xray" "2.15.1" + "sha256-+MKFgYPnSmSLjE9YP8fDjAo91o+mYkN2T4FbOMVSmnw="; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix index 17f41b1164..a91d608c77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.15.0"; + version = "2.15.1"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-65wheAyrOIe6rwrjygLF/gq3uYj0qaXEPnr/L4lNfKc="; + hash = "sha256-DW7QyEVvvlnew0WqFCgA2wg3uYvKHtX2jPbvbVITd0U="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh index f98f653a72..ea5b05fdaa 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -5,14 +5,14 @@ set -eu -o pipefail source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix -#nix-update python312Packages.types-aiobotocore --commit --build +nix-update python312Packages.types-aiobotocore --commit --build packages=( types-aiobotocore-accessanalyzer types-aiobotocore-account types-aiobotocore-acm types-aiobotocore-acm-pca - types-aiobotocore-alexaforbusiness + # types-aiobotocore-alexaforbusiness Obsolete, will be removed soon types-aiobotocore-amp types-aiobotocore-amplify types-aiobotocore-amplifybackend @@ -39,7 +39,7 @@ packages=( types-aiobotocore-autoscaling-plans types-aiobotocore-backup types-aiobotocore-backup-gateway - types-aiobotocore-backupstorage + # types-aiobotocore-backupstorage Obsolete, will be removed soon types-aiobotocore-batch types-aiobotocore-billingconductor types-aiobotocore-braket @@ -73,7 +73,7 @@ packages=( types-aiobotocore-codeguru-security types-aiobotocore-codeguruprofiler types-aiobotocore-codepipeline - types-aiobotocore-codestar + # types-aiobotocore-codestar Obsolete, will be removed soon types-aiobotocore-codestar-connections types-aiobotocore-codestar-notifications types-aiobotocore-cognito-identity @@ -151,7 +151,7 @@ packages=( types-aiobotocore-guardduty types-aiobotocore-health types-aiobotocore-healthlake - types-aiobotocore-honeycode + # types-aiobotocore-honeycode Obsolete, will be removed soon types-aiobotocore-iam types-aiobotocore-identitystore types-aiobotocore-imagebuilder @@ -235,7 +235,7 @@ packages=( types-aiobotocore-migrationhub-config types-aiobotocore-migrationhuborchestrator types-aiobotocore-migrationhubstrategy - types-aiobotocore-mobile + # types-aiobotocore-mobile Obsolete, will be removed soon types-aiobotocore-mq types-aiobotocore-mturk types-aiobotocore-mwaa diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix index 81f1ed1d2b..a4e6ba1206 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { "test_conflicting" "test_noconflict" "test_symlink_localtime" - ] ++ lib.optional stdenv.isDarwin "test_assert_tz_offset"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "test_assert_tz_offset"; pythonImportsCheck = [ "tzlocal" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 0bde984b93..89063357a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }; patches = - lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch ] ++ [ @@ -53,7 +53,7 @@ buildPythonPackage rec { ./clang-fix-incompatible-function-pointer-conversion.patch ]; - postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) '' # force darwin aarch64 to use openssl instead of applessl, removing # some quirks upstream thinks they need to use openssl on macos sed -i \ @@ -76,7 +76,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CFNetwork Security diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ubelt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ubelt/default.nix index 85764d0598..ae9c6b2a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ubelt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ubelt/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # fail due to sandbox environment "CacheStamp.expired" "userhome" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix index 232508310c..a510f0f468 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.19"; + version = "0.9.20"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-PPxslqY8v6WbRiRXnR9jVSGAo8k89lHomXpqgSK0meo="; + hash = "sha256-X8lGpfVjIZIpNneOM/mE+9RvglW9FlYoGz7pFs7ellk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufmt/default.nix index 9ee19bff8e..d8e3492614 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufmt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "ufmt"; - version = "2.7.2"; + version = "2.7.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = "ufmt"; rev = "refs/tags/v${version}"; - hash = "sha256-nWdGaW/RlU6kV2ORKpVuJ634QoemhZR2zdcOOO1W9Wk="; + hash = "sha256-hXCOsetw5o3V9NCR0TOfYSFyfBnuOOZDMiUd/6ER9WU="; }; build-system = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufomerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufomerge/default.nix new file mode 100644 index 0000000000..79b3436a28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufomerge/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonRelaxDepsHook, + pytestCheckHook, + setuptools, + setuptools-scm, + fonttools, + fontfeatures, + ufolib2, +}: + +buildPythonPackage rec { + pname = "ufomerge"; + version = "1.8.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "ufomerge"; + rev = "refs/tags/v${version}"; + hash = "sha256-Bo/KJhJTIAGNDT2QoXRKGMYLQuqjfCe5yaCsFcQ4A64="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "fonttools" ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + ufolib2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + fontfeatures + ]; + + disabledTestPaths = [ + # Failing due to fonttools being to old + "tests/test_layout.py" + ]; + + pythonImportsCheck = [ "ufomerge" ]; + + meta = { + description = "Command line utility and Python library that merges two UFO source format fonts into a single file"; + homepage = "https://github.com/googlefonts/ufomerge"; + changelog = "https://github.com/googlefonts/ufomerge/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix index 0dc8fea9bc..de30a78091 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools-scm ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch b/third_party/nixpkgs/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch deleted file mode 100644 index 904538880a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bcc65c0be18fc6ea6ec39da89d0de77544fa18c7 Mon Sep 17 00:00:00 2001 -From: Mrmaxmeier -Date: Tue, 9 Jul 2024 17:41:08 +0200 -Subject: [PATCH] Drop removed `distutils` import in favor of `sysconfig` - -This patch is available online as https://github.com/unicorn-engine/unicorn/pull/1973 - -diff --git a/unicorn/unicorn.py b/unicorn/unicorn.py -index 2e6a938f43..7204b8215f 100644 ---- a/unicorn/unicorn.py -+++ b/unicorn/unicorn.py -@@ -2,7 +2,7 @@ - from __future__ import annotations - import ctypes - import ctypes.util --import distutils.sysconfig -+import sysconfig - from functools import wraps - from typing import Any, Callable, List, Tuple, Union - import pkg_resources -@@ -85,7 +85,7 @@ def _load_lib(path, lib_name): - pkg_resources.resource_filename(__name__, 'lib'), - os.path.join(os.path.split(__file__)[0], 'lib'), - '', -- distutils.sysconfig.get_python_lib(), -+ sysconfig.get_path('platlib'), - "/usr/local/lib/" if sys.platform == 'darwin' else '/usr/lib64', - os.getenv('PATH', '')] - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix index de3a0f6a30..6ce310bfb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix @@ -9,35 +9,30 @@ buildPythonPackage rec { pname = "unicorn"; version = lib.getVersion unicorn-emu; - format = "setuptools"; + pyproject = true; src = unicorn-emu.src; sourceRoot = "${src.name}/bindings/python"; - patches = [ - # Python 3.12 compatibility: Drop removed `distutils` import in favor of `sysconfig` - ./avoid-distutils-python312.patch - ]; - prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/ ''; - # needed on non-x86 linux + # Needed on non-x86 linux setupPyBuildFlags = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ] # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix index 14a32c0ba8..b539d805f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unrardll/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { buildInputs = [ unrar ]; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libunrar.so ${unrar}/lib/libunrar.so $out/lib/python*/site-packages/unrardll/unrar.*-darwin.so install_name_tool -change libunrar.so ${unrar}/lib/libunrar.so build/lib.*/unrardll/unrar.*-darwin.so ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 70113a9ed0..afa02b4477 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.15.10"; + version = "0.15.13"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-Wgv7IcyYuOICYZDmj/jdkpSHx53ZXCR06952GmVEGOY="; + hash = "sha256-DbOuNh+p+4vsEO6AQUeMq25RTLm5Zn9FyzcTKJedbTM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 7806daf5ff..e0e666d7ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.3.12"; + version = "5.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-ozrC/I6CNHE/7S0ioL+ED9Vk6q0v3i4lNxv7ipvProk="; + hash = "sha256-iCyGG4y7cnJqHEaqpzFc/LjWiLZw3HArU5hDtEyLgFo="; }; build-system = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { numpy fsspec packaging + xxhash ]; nativeCheckInputs = [ @@ -57,7 +58,6 @@ buildPythonPackage rec { pytest-timeout rangehttpserver scikit-hep-testdata - xxhash ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix index 24dd8d2b84..b5d7cee2f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix @@ -34,7 +34,7 @@ buildPythonPackage { wsproto ] ++ uvicorn.optional-dependencies.standard; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 06447432f2..f5d0e08cbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = [ libuv ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 @@ -78,7 +78,7 @@ buildPythonPackage rec { # force using installed/compiled uvloop rm -rf uvloop '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validphys2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validphys2/default.nix deleted file mode 100644 index fd408820a2..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/validphys2/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - lhapdf, - nnpdf, - prompt-toolkit, - reportengine, - requests, - seaborn, - validobj, -}: - -buildPythonPackage rec { - pname = "validphys2"; - version = "4.0"; - format = "setuptools"; - - inherit (nnpdf) src; - - prePatch = '' - cd validphys2 - ''; - - postPatch = '' - substituteInPlace src/validphys/version.py \ - --replace '= __give_git()' '= "'$version'"' - ''; - - propagatedBuildInputs = [ - lhapdf - nnpdf - prompt-toolkit - reportengine - requests - seaborn - validobj - ]; - - doCheck = false; # no tests - pythonImportsCheck = [ "validphys" ]; - - meta = with lib; { - description = "NNPDF analysis framework"; - homepage = "https://data.nnpdf.science/validphys-docs/guide.html"; - inherit (nnpdf.meta) license; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix index ae7782699e..cf1ed3878e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { "test_rhophi_eta_tau" "test_xy_eta_tau" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # AssertionError: assert 2.1073424255447017e-08 == 0.0 "test_issue_463" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtkey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtkey/default.nix index 4815ce6341..553721e83e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtkey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtkey/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extension to emulate keypresses and to get the layout information from the X server"; homepage = "https://launchpad.net/virtkey"; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix index 7f4feb2ba9..558d47529b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; # Python ctypes.find_library uses DYLD_LIBRARY_PATH. - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${python.pkgs.boost}/lib" ''; @@ -71,6 +71,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ teh ]; # Test again when new version is released - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vttlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vttlib/default.nix new file mode 100644 index 0000000000..d90b9c3c3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/vttlib/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + setuptools-scm, + fonttools, + pyparsing, + ufolib2, + ufo2ft, +}: + +buildPythonPackage rec { + pname = "vttlib"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "daltonmaag"; + repo = "vttLib"; + rev = "v${version}"; + hash = "sha256-ChsuzeFRQFDYGlAE4TWzE+et7yGLOfha1VqGcOdayOs="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + pyparsing + ufolib2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ufo2ft + ]; + + pythonImportsCheck = [ "vttLib" ]; + + meta = { + description = "Dump, merge and compile Visual TrueType data in UFO3 with FontTools"; + homepage = "https://github.com/daltonmaag/vttLib"; + changelog = "https://github.com/daltonmaag/vttLib/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix index fbd5d9baab..59dc57777e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -31,7 +31,6 @@ nbformat, pandas, parameterized, - pathtools, protobuf, psutil, pydantic, @@ -85,7 +84,6 @@ buildPythonPackage rec { click docker-pycreds gitpython - pathtools protobuf psutil pyyaml @@ -282,11 +280,11 @@ buildPythonPackage rec { # See https://github.com/wandb/wandb/issues/6836 "tests/pytest_tests/unit_tests_old/test_logging.py" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Same as above "tests/pytest_tests/unit_tests/test_artifacts/test_storage.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Same as above "tests/pytest_tests/unit_tests/test_lib/test_filesystem.py" ]; @@ -303,7 +301,7 @@ buildPythonPackage rec { "test_pytorch_saved_model" "test_tensorflow_keras_saved_model" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable test that fails on darwin due to issue with python3Packages.psutil: # https://github.com/giampaolo/psutil/issues/1219 "test_tpu_system_stats" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index 8408780ef6..c903ede48d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -56,7 +56,7 @@ let --replace "package.metadata.maturin" "broken" ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ extraBuildInputs; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ extraBuildInputs; inherit buildAndTestSubdir; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index 4e83fb0264..10184cfef7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -26,9 +26,11 @@ buildPythonPackage rec { # force kqueue on x86_64-darwin, because our api version does # not support fsevents - patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ ./force-kqueue.patch ]; + patches = lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ + ./force-kqueue.patch + ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; passthru.optional-dependencies.watchmedo = [ pyyaml ]; @@ -50,13 +52,13 @@ buildPythonPackage rec { "--deselect=tests/test_emitter.py::test_create_wrong_encoding" "--deselect=tests/test_emitter.py::test_close" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # fails to stop process in teardown "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination" # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3 "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # FileCreationEvent != FileDeletionEvent "--deselect=tests/test_emitter.py::test_separate_consecutive_moves" "--deselect=tests/test_observers_polling.py::test___init__" @@ -66,7 +68,7 @@ buildPythonPackage rec { # AttributeError: '_thread.RLock' object has no attribute 'key'" "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # segfaults "--deselect=tests/test_delayed_queue.py::test_delayed_get" "--deselect=tests/test_0_watchmedo.py::test_tricks_from_file" @@ -89,7 +91,7 @@ buildPythonPackage rec { # tests timeout easily "tests/test_inotify_buffer.py" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # segfaults the testsuite "tests/test_emitter.py" # unsupported on x86_64-darwin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix index 22cd171afa..3b09081249 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { hash = "sha256-n9yN/VRNQWCxh+BoliIMkKqJC51inpB9DQ9WtqR4oA0="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix index b6f9eeeb90..3af49dd8d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = "watermark"; rev = "refs/tags/v${version}"; - hash = "sha256-4/1Y7cdh1tF33jgPrqdxCGPcRnnxx+Wf8lyztF54Ck0="; + hash = "sha256-UR4kV6UoZ/JLO19on+qEH+M05QIsT0SXvXJtTMCKuZM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weatherflow4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weatherflow4py/default.nix index 5ffcffcbcf..d4417374d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weatherflow4py/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "weatherflow4py"; - version = "1.0.6"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "jeeftor"; repo = "weatherflow4py"; rev = "refs/tags/v${version}"; - hash = "sha256-NazRT/gSaxat90eA66ajjVPvN9UFNEX4y1hfOtu9UoE="; + hash = "sha256-NOruMysLm0Pu2fsaA/qCNdeCTacomvJ51oqI8V2WFWI="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix index 3c5b74eed4..da172aa79f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix @@ -67,16 +67,16 @@ buildPythonPackage rec { "test_unbatched" "test_yaml3" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # pickling error "test_background_download" ] - ++ lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [ "test_concurrent_access" # fails to patch 'init_process_group' from torch.distributed "TestDistributedChunkedSampler" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # segfaults on aarch64-linux "test_webloader" "test_webloader2" @@ -84,7 +84,7 @@ buildPythonPackage rec { "test_webloader_unbatched" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: > $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index a49530ecfc..b1069673f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -583,7 +583,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the @@ -622,7 +622,7 @@ stdenv.mkDerivation rec { '' + # disable execlog parser on darwin, since it fails to build # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # need to change directory for bazel to find the workspace cd ./bazel_src # build execlog tooling @@ -649,7 +649,7 @@ stdenv.mkDerivation rec { '' + # disable execlog parser on darwin, since it fails to build # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 - (lib.optionalString (!stdenv.isDarwin) '' + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir $out/share cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar cat < $out/bin/bazel-execlog @@ -730,7 +730,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix index 5722d26ea1..7f98f512c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix @@ -56,7 +56,7 @@ let cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock echo > $out/WORSPACE '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -71,10 +71,10 @@ let --verbose_failures \ --repository_cache=${mergedDistDir} \ --curses=no \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ \ --host_cxxopt=-x --host_cxxopt=c++ \ - '' + lib.optionalString (stdenv.isDarwin && Foundation != null) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) '' --linkopt=-Wl,-F${Foundation}/Library/Frameworks \ --linkopt=-L${darwin.libobjc}/lib \ '' + '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 1a31de96ca..661eb1a71a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -419,7 +419,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx Foundation @@ -561,7 +561,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix index 51fea3e32d..752ddc4448 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix @@ -55,7 +55,7 @@ let cp ${./cpp-test-MODULE.bazel} $out/MODULE.bazel cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix index ebe4f13346..309bae9b23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix @@ -122,7 +122,7 @@ let cp ${personProto} $out/person/person.proto cp ${personBUILD} $out/person/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' echo 'tools bazel created' mkdir $out/tools install ${toolsBazel} $out/tools/bazel @@ -155,7 +155,7 @@ let --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ '' + '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 6759bf14de..cc3bc8d9a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -36,7 +36,7 @@ let cp -r ${bazel-examples}/cpp-tutorial/stage3 $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -51,10 +51,10 @@ let --distdir=${distDir} \ --curses=no \ ${extraBazelArgs} \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ - '' + lib.optionalString (stdenv.isDarwin && Foundation != null) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) '' --linkopt=-Wl,-F${Foundation}/Library/Frameworks \ --linkopt=-L${darwin.libobjc}/lib \ ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix index 3890d45d2b..afdacaf6a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -35,7 +35,7 @@ let cp -r ${bazel-examples}/java-tutorial $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 0466404ced..5880c5dd95 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -154,7 +154,7 @@ let cp ${personProto} $out/person/person.proto cp ${personBUILD} $out/person/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -178,7 +178,7 @@ let --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index e0e59fb889..59f5d0c01f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -65,7 +65,7 @@ let cp ${pythonBin} $out/python/bin.py cp ${pythonBUILD} $out/python/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index 5a97ad797f..b0d9c72ad2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,12 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.0"; + version = "2.0.2"; platform = - if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" - else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "x86_64-pc-linux" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "x86_64-apple-darwin" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "aarch64-apple-darwin" else throw "unsupported platform"; bloop-bash = fetchurl { @@ -35,14 +36,15 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-SnDXAkNu//Dn24FaQcACEBEJODlrhvpQ8uNbge99nGA=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-MfenrNbL1UBC4t/0w9MTDI+kz2HKv7xJcmA57qBbMFw=" + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-xYVfgi3ANjBiuf4/5FDgSYDL/fPsvuJn4jFxAEVYct4=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-lq0S2AsulcUUYDd3qnWonwd/W0/gb7lJwC+QTYTlTdg=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-e+9Q7xIEsHloaKOj13vZnGs2vulkOJv7tCOuACobHvk=" else throw "unsupported platform"; }; dontUnpack = true; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ stdenv.cc.cc.lib zlib ]; propagatedBuildInputs = [ jre ]; @@ -67,7 +69,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; mainProgram = "bloop"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ kubukoz tomahna ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix index f494e40535..06246f6b08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; # https://github.com/facebook/buck/issues/2666 - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix index e4d2128586..bf9951e7ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { openssl ]; - doCheck = !stdenv.isDarwin; # tests hang + doCheck = !stdenv.hostPlatform.isDarwin; # tests hang # Failing test postPatch = '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath '${lib.getLib build2}/lib' "''${!outputBin}/bin/bpkg" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/default.nix index c420bd8c73..c02334c98a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "config.build2.libpkgconf=true" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "''${!outputLib}/lib" "''${!outputBin}/bin/b" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index 5e7a0e866c..f9bb2457a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { requests tqdm urllib3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ idna cryptography pyopenssl @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { git pkg-config zlib - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ] ++ (with python3.pkgs; [ mock @@ -73,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access "TestFTP" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Rejects paths containing nix "test_conditional_os" # Requires Apple Clang diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix index 6809ee7ffd..500e56e9cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo="; }; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix index b44cefe6a9..63d53e123a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { }; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; # fac includes a unit test called ls_files_works which assumes it's @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = '' A build system that uses ptrace to handle dependencies automatically ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix index fe74486ccf..71242ceaba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ ninja python3 ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index ac22eee7e2..1afadceb9b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix index fcbb23a711..5f215be738 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index a9827e7a0a..61510384e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -61,7 +61,7 @@ rec { nativeBuildInputs = [ makeWrapper unzip - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -98,9 +98,9 @@ rec { --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}" ''; - dontFixup = !stdenv.isLinux; + dontFixup = !stdenv.hostPlatform.isLinux; - fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386"; + fixupPhase = let arch = if stdenv.hostPlatform.is64bit then "amd64" else "i386"; in '' . ${./patching.sh} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/fetch-deps.nix index 304898c013..a0d3b10ba8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/fetch-deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -22,7 +22,7 @@ in , data # redirect stdout to stderr to allow the update script to be used with update script combinators , silent ? true -, useBwrap ? stdenv.isLinux +, useBwrap ? stdenv.hostPlatform.isLinux } @ attrs: let diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix index adb3c306a7..f576caef09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix index 94469669a5..8710ea93c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix @@ -45,7 +45,7 @@ mkPackage rec { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux + LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 7c44671a3b..3241ea2aee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "ed4bce34420650fbc06cc161f1960b539f19289d"; - version = "2024-07-10"; + rev = "0b24c960935ffefc0ac7340137f81f0a7ed4d623"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "lsYFupTSZQe2id0wuy+E7lszG4IT3R6fuo+Yql91MkM="; + sha256 = "4jYlpBq7l5vypbm/6kHHxAWXyJTuZ2n9/ij59yy9CNQ="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 3977d5b184..9c03f03be7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation (finalAttrs: { echo -java-home ${jre.home} >>conf/sbtopts ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc # libstdc++.so.6 zlib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cp -ra . $out/share/sbt ln -sT ../share/sbt/bin/sbt $out/bin/sbt ln -sT ../share/sbt/bin/sbtn-${ - if (stdenv.isDarwin) then "universal-apple-darwin" + if (stdenv.hostPlatform.isDarwin) then "universal-apple-darwin" else if (stdenv.hostPlatform.isAarch64) then "aarch64-pc-linux" else "x86_64-pc-linux" } $out/bin/sbtn diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix index 5e20588993..3a0eb79b24 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { inherit pname version; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = assert lib.assertMsg (lib.versionAtLeast jre.version "17.0.0") '' scala-cli requires Java 17 or newer, but ${jre.name} is ${jre.version} @@ -54,7 +54,7 @@ stdenv.mkDerivation { # We need to call autopatchelf before generating completions dontAutoPatchelf = true; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' autoPatchelf $out '' + '' # hack to ensure the completion function looks right diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index c242ab3b4f..fc9660eab4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { buildInputs = [ gpgme - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs libapparmor libseccomp diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix index 6067079182..1b27c48997 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix @@ -19,7 +19,7 @@ let binPath = lib.makeBinPath ([ - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ runc crun conmon @@ -34,7 +34,7 @@ let # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ aardvark-dns netavark passt diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix index bddb843210..355233493c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorHash = null; - subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "cmd/buildkitd" ]; ldflags = [ "-s" "-w" "-X github.com/moby/buildkit/version.Version=${version}" "-X github.com/moby/buildkit/version.Revision=${src.rev}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix index 01ba608936..f525d9e5ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "butane"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - hash = "sha256-KsI+mt7nJHwrq0+GPNcI79jRy/4WEjHp2/egw0PcRLM="; + hash = "sha256-ELCERcgw01RcSMQjM0PL8CyTKrdfEPV9U8/RSf7YxCs="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/chit/default.nix b/third_party/nixpkgs/pkgs/development/tools/chit/default.nix index 03c301f193..7d140bf2a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/chit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/chit/default.nix @@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix index 6760b47542..848b6fb2f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ libgit2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cog \ diff --git a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix index ad7ab85596..4299c12210 100644 --- a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix @@ -92,7 +92,7 @@ mkCombyPackage { ocamlPackages.dune-configurator combyKernel combySemantic - ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then + ] ++ (if !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 then [ ocamlPackages.hack_parallel ] else [ ]); diff --git a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix index e614fe7d94..09ca1e7ff8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; installPhase = '' mkdir -p $out/{bin,share/doc/confluent-cli} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix index d0a2efb32b..a9e3b01e07 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -147,7 +147,7 @@ buildPythonApplication rec { SQLALCHEMY_SILENCE_UBER_WARNING = 1; # TimeoutErrors on slow machines -> aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' export LC_ALL="en_US.UTF-8" @@ -162,7 +162,7 @@ buildPythonApplication rec { passthru = { inherit withPlugins; updateScript = ./update.sh; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { tests = { inherit (nixosTests) buildbot; }; @@ -174,6 +174,6 @@ buildPythonApplication rec { changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; maintainers = teams.buildbot.members; license = licenses.gpl2Only; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix index aacdf92e30..3abc101343 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -56,6 +56,6 @@ buildPythonPackage ({ description = "Buildbot Worker Daemon"; maintainers = teams.buildbot.members; license = licenses.gpl2; - broken = stdenv.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 + broken = stdenv.hostPlatform.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index 28630e43b7..84c62e5568 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix index 4f04e0494f..6da44a4786 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix @@ -2,7 +2,7 @@ let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables appendConfigureFlags; inherit (lib) makeBinPath; - bundledBins = lib.optional stdenv.isLinux crun; + bundledBins = lib.optional stdenv.hostPlatform.isLinux crun; overrides = old: { hercules-ci-agent = diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index 0da85bae96..a01febb911 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -15,7 +15,7 @@ let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; - bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux crun; + bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.hostPlatform.isLinux crun; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 @@ -43,7 +43,7 @@ in pkg.overrideAttrs (finalAttrs: o: { package = finalAttrs.finalPackage; command = "hercules-ci-agent --help"; }; - } // lib.optionalAttrs (stdenv.isLinux) { + } // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { # Does not test the package, but evaluation of the related NixOS module. nixos-simple-config = (nixos { boot.loader.grub.enable = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 6c6fe74389..c8d28fa69d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-61WjfeHc8Qyl3RqgafVe1/y8cBOnL8i/fHOAIP4RCdI="; + hash = "sha256-ffP4CmvoxmXdwrWWOG2HIoz1pgmxTUdG5rPsgJ1+3do="; }; - vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg="; + vendorHash = "sha256-wB1Uv7ZSIEHzR8z96hwXScoGA31uhoql/wwAH3Olj2E="; CGO_ENABLED = "0"; diff --git a/third_party/nixpkgs/pkgs/development/tools/cotton/default.nix b/third_party/nixpkgs/pkgs/development/tools/cotton/default.nix index ec39c399bd..bc54f31549 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cotton/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cotton/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Package manager for JavaScript projects"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dynein/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dynein/default.nix index 618ca16417..1673743484 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dynein/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dynein/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; preBuild = '' export OPENSSL_DIR=${lib.getDev openssl} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/movine/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/movine/default.nix index 51a4d8f294..41ea6a42a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/movine/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/movine/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index 295c791d4f..756d5e85ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl protobuf - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # FIXME: Workaround Rust 1.80 support by updating time to 0.3.36 # https://github.com/prisma/prisma-engines/issues/4989 diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix index 2eac6f4a20..008eba559b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { sqlite zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/tools/database/replibyte/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/replibyte/default.nix index 4437e4738e..f04a00e881 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/replibyte/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/replibyte/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoBuildFlags = [ "--all-features" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index fdbe69b113..16ae0bbad2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-IgYfysinQnK8qSp4r1AuBpRYBFvwITjGHJduayDA9Fw="; + hash = "sha256-7bCfIWJV7gB+WbvMxmhJW1RM1pd3gA/bCuH+o4FGg/A="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix index 6b97b1c373..c90bfbd3b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw="; }; - patches = lib.optional stdenv.isDarwin ./macos.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; # We should be using qscintilla from nixpkgs instead of the vendored version, # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ qtbase sqlcipher ] ++ lib.optional stdenv.isDarwin qtmacextras; + buildInputs = [ qtbase sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix index a8243353ad..e47174c934 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "2.0.0-preview.3"; + version = "2.0.0"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-BSLUhXxZyffH6HX3RR6PqXts76ERa0bpct/qs0Sf0NE="; + hash = "sha256-MrIawJr8EydfYFVzxODUZ7jDj0B0M1FAuX4Arktbf4Y="; }; - cargoHash = "sha256-jj1ytX44XoNKR+TCn/MpWk8CFM/DvHSwyfjVe3ca+AA="; + cargoHash = "sha256-ELYBEQrh80LdNYNZwcGVh9GE+dSfjF+RuO8fd0PabIw="; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # Error: No such file or directory (os error 2) # failures: diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index 32458926bd..71e1073f32 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rOAXCru3m31lVFUyxywkuyKWUOJneA7ECMPyvAfw4mg="; + sha256 = "sha256-HCl0v9hS9/UgzLniFQ7QFb5pdOAnnoomT3Zv3BLf/Ac="; }; - vendorHash = "sha256-8Q+KMYu1yiHEYS035NmCvxSgIS/+oRhhcZa6SwmvGgk="; + vendorHash = "sha256-7u3eceVDnzjhGguijJXbm40qyCPO/Q101Zr5vEcGEqs="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix index 09969c80c4..1363cf66b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vitess"; - version = "20.0.1"; + version = "20.0.2"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-OkVBV/Fj2OKxkxjVBdTAyiGETuLw7OvV0KInp533iM8="; + hash = "sha256-I+pz8bz/H1mg7cQnPiJZxYr1gyzajMLVqg8yHbBXYLc="; }; vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix index 4552539bb7..cae7c6145c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { # even with __darwinAllowLocalNetworking allowed. # - CGO_FLAGS warnings break tests' expected stdout/stderr outputs. # - DAP test binaries exit prematurely. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' # fortify source breaks build since delve compiles with -O0 diff --git a/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix b/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix index 75ac8e45e4..45ef24e4b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix @@ -1,12 +1,12 @@ -{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: -stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: +stdenv.mkDerivation (finalAttrs: { pname = "detekt"; version = "1.23.7"; - jarfilename = "${pname}-${version}-executable.jar"; + jarfilename = "detekt-${finalAttrs.version}-executable.jar"; src = fetchurl { - url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; + url = "https://github.com/detekt/detekt/releases/download/v${finalAttrs.version}/detekt-cli-${finalAttrs.version}-all.jar"; sha256 = "sha256-hL7e0oMBLLKzi8rvSZZFL81gadLpynS1Dqp54K0hiX4="; }; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D "$src" "$out/share/java/${jarfilename}" + install -D "$src" "$out/share/java/${finalAttrs.jarfilename}" makeWrapper ${jre_headless}/bin/java $out/bin/detekt \ - --add-flags "-jar $out/share/java/${jarfilename}" + --add-flags "-jar $out/share/java/${finalAttrs.jarfilename}" runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = detekt; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Static code analysis for Kotlin"; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mdr ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix index 75c1e27c41..057c0d1e9d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix @@ -122,7 +122,7 @@ rec { cp -r ${frontend-build} frontend-build substituteInPlace tauri.conf.json --replace '"distDir": "../dist",' '"distDir": "frontend-build",' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -134,20 +134,20 @@ rec { nativeBuildInputs = [ copyDesktopItems pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ jq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libsoup openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libayatana-appindicator webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.WebKit diff --git a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix index a29e3a23a2..06cb34499a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs gpgme lvm2 ]; patches = [ # fix scrolling diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index b278c4d680..bfc3b39c15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.112.0"; + version = "1.114.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-+s5kxP79ZWpJsm6yk26jLGSPJ3GkToPXfl2tX+a1A1U="; + sha256 = "sha256-E+/rfOpUDBvHaVVN7xhhcFd1W1X6cSEWpxjqoKoQR80="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix index 35fcdc7095..455f18ba0a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv spdlog sqlite ] ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.9"; # put examples in an output so people/tools can test against them outputs = [ "out" "examples" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index fbd8ea3708..d6b1266ab3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions diff --git a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix index 631051ee3a..7f723096a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix @@ -17,7 +17,7 @@ let pname = "dump_syms"; - version = "2.3.3"; + version = "2.3.4"; in rustPlatform.buildRustPackage { inherit pname version; @@ -26,10 +26,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-pZlWA7LZeMb+ZhnfQh9MzvDDlre1kkPc6aSVNZcVi/w="; + hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI="; }; - cargoHash = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg="; + cargoHash = "sha256-ndRw5z4CfuX0KNqNgpA4yohG8p/cUR/Op2fIunuO6GM="; nativeBuildInputs = [ pkg-config @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index 576c3edd40..e36971390d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${version}" "-X main.GitSha=v${version}" "-X main.DefaultInstallationName=earthly" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix index 60255d21bc..39f1d1011b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix @@ -166,5 +166,5 @@ in stdenv.mkDerivation (finalAttrs: lib.recursiveUpdate (common stdenv.hostPlatform) - ((if stdenv.isDarwin then darwin else linux) finalAttrs) + ((if stdenv.hostPlatform.isDarwin then darwin else linux) finalAttrs) ) diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json index 8930848026..a51217873b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json @@ -45,24 +45,35 @@ }, "30": { "hashes": { - "aarch64-darwin": "2238c45a85b2c78aed00aeaf15bbfa2f64b4d13e48cc6b9bc330f24c4d214595", - "aarch64-linux": "aa422122373b84f4eb8ce937937b1b6fe8fb3975c3edafb9df85f7fba449afd4", - "armv7l-linux": "3643857e1eec3037ad6f07e755bffc64f033a7196307ff0386bf67c9cc3ec31e", - "headers": "1zpl51g8d0j6xw4h2pw1wy6qlwgxj37x4lsj377kg27y809rf5ah", - "x86_64-darwin": "6e633bf87be9f8bf46dff9733cfd0d611e018ae5df75f30735747721f91fcf43", - "x86_64-linux": "b365aac23c61dc0b18002c60937c4842e814cbe6d8e6a34e4dc211774ebaec01" + "aarch64-darwin": "d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a", + "aarch64-linux": "eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0", + "armv7l-linux": "224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf", + "headers": "0db38ndw9rrd8ixa14761cbff6ns31b6302bzx5q4in8i4dkrrs3", + "x86_64-darwin": "faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842", + "x86_64-linux": "ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403" }, - "version": "30.4.0" + "version": "30.5.1" }, "31": { "hashes": { - "aarch64-darwin": "4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5", - "aarch64-linux": "37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098", - "armv7l-linux": "7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423", - "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", - "x86_64-darwin": "e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee", - "x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7" + "aarch64-darwin": "dec23ecc15f4d0503163c5f65f59114127ce6d2518af8e6547ea787372575fcb", + "aarch64-linux": "1911b1cef253d68fead45432e93740223c686ebc11c931bdd08439ec88030cfd", + "armv7l-linux": "957d888d016270b658fb558f6e2061ffaa7f71c9d2b1c73c4f122342519ba741", + "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", + "x86_64-darwin": "4d5d21963bf833ccc25edbc2e8e884f408e24c2a39b53f1d0c30f4017ac2ba8a", + "x86_64-linux": "86b3794aba055e84f23cba5d8319ca9f23a05385d2c06fe7d78d24d2bb356b67" }, - "version": "31.4.0" + "version": "31.6.0" + }, + "32": { + "hashes": { + "aarch64-darwin": "b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc", + "aarch64-linux": "702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c", + "armv7l-linux": "d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d", + "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", + "x86_64-darwin": "150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab", + "x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691" + }, + "version": "32.1.2" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/generic.nix index edd648713e..1eb1a8d870 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/generic.nix @@ -92,5 +92,5 @@ let in stdenv.mkDerivation ( (common stdenv.hostPlatform) // - (if stdenv.isDarwin then darwin else linux) + (if stdenv.hostPlatform.isDarwin then darwin else linux) ) diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json index 213bc53abf..3cb6b6a756 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json @@ -34,13 +34,13 @@ }, "32": { "hashes": { - "aarch64-darwin": "8f40b497d21a8b7d2b3df168b1cf4311f6a39acab241f05ffee0dad6409e0801", - "aarch64-linux": "f92df0fafdf1be14d38a4ed4b1555f71c922ab3c096148c71aef8a46f95e0127", - "armv7l-linux": "f8c170268d348411fa5d27642327305aeca539459615a5e7648484728f4e0eed", - "headers": "01wwikj54d3fm6bsz9z61dcl7d5mzbk48mcaycrbmq1rg0h0kk5a", - "x86_64-darwin": "5efdf72e580336e91d6d696dab79ab9b932a2eaf91ff4da744b63da24f8288ca", - "x86_64-linux": "f48ca709758744f6c1ab5062444405c1416c27b57143707bfea321116f641cec" + "aarch64-darwin": "7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046", + "aarch64-linux": "405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828", + "armv7l-linux": "32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e", + "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", + "x86_64-darwin": "a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc", + "x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702" }, - "version": "32.1.0" + "version": "32.1.2" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/info.json index 1bef706fa1..3999b50e98 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-SUwtnpYQbPRCIzTQcJnoW9sI597LP1BvqNrhcb2NNfk=", + "hash": "sha256-LkDhMO6FOS/8WgAQBs3HZ8ujkS4yBtVJR7ARxEiJIME=", "owner": "electron", "repo": "electron", - "rev": "v30.4.0" + "rev": "v30.5.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -276,10 +276,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-FJVFKLhVCoOdM6dbuu/DQxw0hXjg+C8a2WfF0u3Qndw=", + "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", "owner": "nodejs", "repo": "node", - "rev": "v20.15.1" + "rev": "v20.16.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -913,8 +913,8 @@ }, "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c", "modules": "123", - "node": "20.15.1", - "version": "30.4.0" + "node": "20.16.0", + "version": "30.5.1" }, "31": { "chrome": "126.0.6478.234", @@ -964,10 +964,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-pio5G9ATJHsM4ygKkDhmAbpZecS8p1AQUJ7LHavMq6I=", + "hash": "sha256-dw2WLjkHCt/uYXT+eZpaJ1bdB6DdMcJLjnscREp4YU8=", "owner": "electron", "repo": "electron", - "rev": "v31.4.0" + "rev": "v31.6.0" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1211,10 +1211,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", + "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", "owner": "nodejs", "repo": "node", - "rev": "v20.16.0" + "rev": "v20.17.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1854,7 +1854,948 @@ }, "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194", "modules": "125", - "node": "20.16.0", - "version": "31.4.0" + "node": "20.17.0", + "version": "31.6.0" + }, + "32": { + "chrome": "128.0.6613.162", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=", + "rev": "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8", + "url": "https://gn.googlesource.com/gn", + "version": "2024-06-11" + } + }, + "version": "128.0.6613.162" + }, + "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-52pb9e5XYaiIpUlazoXbmEJ/3l4uPWt9sVmF0+cVBKQ=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "128.0.6613.162", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6pM0P5zXJQXNSQ7MaXSKEHfb7KmtztfhlNlS+i8ugD4=", + "rev": "82c1d3e5b812b35df1cb6a031f59616dc594d4f7", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-RkSdNjEmXO4xsCRzp5y5suG8svNT5LSI/eVbAUDbi5c=", + "owner": "electron", + "repo": "electron", + "rev": "v32.1.2" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bFe79wg+PHRphP6I5q2wRheGTUARKx0zjyn3LxCie0s=", + "rev": "aecfea159d58ef53bd690688e4aca512fc4a3d35", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", + "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" + }, + "src/third_party/accessibility_test_framework/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", + "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", + "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YV7RIbGq3zcnl4ZXJndjqbaPPDxCOzPJ87aH672mNq0=", + "rev": "713102774487cf1a8b3f433529eb8181cbcec31a", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-haO6KT+VbG/d2FljtsoJT7xghPTeEY5GPJdh2s9faVs=", + "rev": "5b2dfe7c775aa7b7909432944ba3535abcd25fc9", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-o/9lOnPR6vT0pkqWgenfyh9nI5Qoxyd030MNTfcoRSc=", + "rev": "76bfcccb6418239183df55111f2f24782d9f3680", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E2oaN2nbqG21qFhUtatsbXwC8KhoQadvU6BmYxF2lgs=", + "rev": "08537fdd2b0990270ea0214a61dfd318f293bc15", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY=", + "rev": "f01108e4761e1d4189cb134322c3cb01dc71ef87", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QuMzYywRDzbwZHJrz/Gm/W6kclvBImRZCnGq8AbTxUY=", + "rev": "81819541a78c49e9109d2267462775e801f89ce6", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LIPOcMBxugyuYJ7IE1VszqLAWBBR58Ozy9VCRqVL208=", + "rev": "523ebded2f72a446544e2d9271ef39857f4e6ae7", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E6deeWYQt2BxT+9Zb2VSXvZWCQI64Kf1dzUYAZJVA2s=", + "rev": "c134de595151ae72a112767e22da4448eb50e57f", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", + "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=", + "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crabbyavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vnFxeAu6NMY6TOb2+LvGbCyOLbVD9R+utl/nnnCWVks=", + "rev": "716408df5cb6d43ebe31cb24194979b81a83b03c", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6XVrzfpQ8Rh99bCGbUkGd/zmFNgt4ZyRsyNvUkIfEyE=", + "rev": "39e57dd0d30ed019d6fb07c24b350f5fe78a1625", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wq6XYQYAWzy3AurVkLGofFF4avntKIPmx6L7vPW2c2Q=", + "rev": "86bdf11581c80f776bfdf54db7f39f930fd6abaf", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ICE5UkP91LHBT0vCpwKmdR+3ePnYcwnFroPUpJMKDvU=", + "rev": "b03a515f9e56280ecabfb254b188349d1a049827", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SlHTLgqaVST4pRstuzSBZmMx87I9TJ1c0qhClvU2sjI=", + "rev": "2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=", + "rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=", + "rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", + "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jDjxhMN+cXrf2+sCdp5GqhXuoO2EkoEijSx3PcYahpg=", + "rev": "5167b71635dfbfa5d4558de0da01923d446a5cd4", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/dawn/third_party/webgpu-headers": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=", + "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686", + "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Tc3x10zkgOvOqMap0xwsFd7W2l8ZyA923C0RRgw+jp0=", + "rev": "31e21628c3a558d4f2189712e25849d608b3ff8c", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-agqi21oQNixRF+foVECaf4MiDVQdA308sLIgLGKiwYI=", + "rev": "47f04a536265028feb1254a3663853e0ce526455", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY=", + "rev": "33d0937c6bdf5ec999939fb17f2a553183d14a74", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.17.0" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/engflow-reclient-configs": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fr18LL/xX23t9TIn3q8jWdV9Y6coepbGsO3vJVdDW6k=", + "rev": "a59c3edffa54a77b8d7b268ef527da541076ca6a", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HVsENaBsYThsScvLwwuBT9dhjq5Acf3eskMIH+09mu0=", + "rev": "d941d9677bb4802f01750fd908ec284fb72c84df", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sdcZAL3ZHIHO9c1ko0xCfyii4jibwA+25RQkDa9XqTo=", + "rev": "fb9afbafc7dfe226b9db54d4923bfb8839635274", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4WPGveEx3PoBpMlh1PyCJ3w5hdpXztzrXcTZfQ+7DtA=", + "rev": "37cefe33b284d0bad4ec52bcccc1a8c2d8704340", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Go2Mrehkvk5fz2SlFrChMBnZJ3H8luhJU+M1TtqG7vg=", + "rev": "32eb84a95951fa3a0148fb3e6a1a02f830ded136", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FhuQ4i8Xhy8FsEdAqJntffpo1vJRPsYdR5GFWXDtQD0=", + "rev": "dc9f6f61adaec755a09e1943cf7014c688443bcb", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", + "rev": "344117638c8ff7e239044fd0fa7085839fc03021", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iBR2otKeTc864DvCw0n7hpcn/4fHP+CIu2kLmBWym9M=", + "rev": "cee1ba1f24fb12b9ae8f31e70dca3f73dbb12cc2", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=", + "rev": "1da053e87f0487382404656edca98b85fe51f2fd", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=", + "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=", + "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/instrumented_libs": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=", + "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-igHNDa/Jch0hiwDczrDOdrnGL4nMZMRevwX3AsYiUQ0=", + "rev": "93b8eee4f428675195c5c76e8da719ff50c2a01c", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aol16YtRFF1xQYXNRIZf4QMf5+ba09aDMEBx4lcAbWI=", + "rev": "03acd65314fe29e6627cf4eab752819f6ee15d74", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=", + "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vRRQW+ekjNpstfUI+OOA6rxwJp/OjRhfStmGEb/fOFg=", + "rev": "6bb75caa139ee1e686d2205910454cf6ea212e58", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tSIbtraD/pbqq4lCzgOakepXrSimCyry0WgcGAnkbwM=", + "rev": "a3c7d3e2f3e1e724b4651891b1a71257cbd88acc", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", + "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UhDKDfAgcCS92R2EvxKpoiJMvakUDQgyHu2k/xeE7do=", + "rev": "ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY=", + "rev": "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uUiAqW0OoB+ZWnTFpk2PJqI7kO9WgYLHiHkz8jikSKA=", + "rev": "d09db732ff68f40fd3581306c650b17ea1955b4e", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uG9dnz4l28RB8R1AZBR97Fz7RN/ZYknP0/RffR1FJ1g=", + "rev": "057e53d759ac05417bbc7880b1d2e2ac7f08fc67", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", + "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", + "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-1cj+yG9B9hEvPiGW0jGJhiFG882l56PvgEUXyCBFsSk=", + "rev": "76651429b8f96fc6c80949ba8f4e18c4b738e216", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-x/SiWPBPeU2Rg7WqrwZcFvDk2J8ILTXyMEGix8r+7Js=", + "rev": "4f7c05781bc43e93706b0330eb830e2bc33fcb6c", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", + "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GRihOFfswz+cNDxU/6LHZLp6rVSuHhz+5apRXQapOnQ=", + "rev": "66c80ddf43e3c3181d404607dcdc0cf37fdf7675", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zs3PFwBmIxSfAk4HZpKsezkyE9kqaFNTbFQ7MSCl20Y=", + "rev": "077d742d9f9738a0453e408560a283a7514c9e8e", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/protobuf-javascript/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", + "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=", + "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", + "rev": "c08ec529fc91722bde519628d9449258082eb847", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=", + "rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5lRPxsfXGWimJ7jNtM6kJembcAz357ER8PwFXnh6o4E=", + "rev": "db5a00f8cebe81146cafabf89019674a3c4bf03d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Uld5cLV+oD0wm8TxK0V15yiwrdiUbWGqPQEbtMW9Apg=", + "rev": "a0817526b8e391732632e6a887134be256a20a18", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZDByCZjc0coy19a0/BkVAU8y/Fkt7FKgWtCwI5K0Tdo=", + "rev": "9e45bccab2b8de8140c1732b0ec490db0362f730", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YGVv/wDle+VyO/Ue7wR004dl8nvO5GjmDeWsoC30+kc=", + "rev": "c4dfa69de7deecf52c6b53badbc8bb7be1a05e8c", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2iYz04vqZI1nbvtnMjjy6aE9PMzvpLhttNbTrEvhC4M=", + "rev": "f9122e774969459927e9d956674c0aac06eb3b68", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-88nATFDj0QqE57ZH7effuNXByjYwGI58SYiAdvyjrt8=", + "rev": "d8095b45a0b2dcc2a85327ff4cc306c618dfa39a", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5gslQRGEeHu7lshmlM6SON+P6cKTGOYrmwkBRmu9NIw=", + "rev": "fabe9e2672334fdb9a622d42a2e8f94578952082", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CwBKsSCvrhp8gw9zm5lw+aJ/lzYksXd5zGZw0abw2JY=", + "rev": "5892ebe2d7505c2238a643288d9a5b2e68784a36", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BraOoeYPOaLw7LfqnG+bZHQiJtWByYjnUU8Gw5ee29k=", + "rev": "2cee0d5b1d8c34e26fd6d9992d3d428ac4c5139d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0p4CEh0BzMXRDxOh72QIPUjhYFB+9cna2bRtJXEGE/M=", + "rev": "67522b34edde86dbb97e164280291f387ade55fc", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ompMbxRxa0acD/+a830N0VL88s1GepOO0e8Rkg5Nmjk=", + "rev": "919599474e6e6639527e7c3775ed1064665412d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5gWBte8oiuXM01StvyXFAsxFwuQZHjZT/LZ6l0mvrwI=", + "rev": "c7e9c4f5d396cda4051e49b15d7d0e4f91e4efac", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cxu9+Kzw2t1BDfuGzNobaraT4eJcSPO7jvnHpuUANoo=", + "rev": "31577177454b89db37ceabd94e1640d398adbc87", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", + "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4ZDhNhd4kh2lT47PV9zBISNmZDqxZO8WY+pTtxajEfw=", + "rev": "198d1770062c1a8aba86e7d6e001bb47bea028ee", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZHkIEiazTp9MBDUufupLGeV97UEfjTwXxG87OUeHcog=", + "rev": "f237dc146debcfde3d70038c2b66f71bfea8d24b", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JO49N/vJz2nske13dcNFxC9hO7oO/1X6AsNnRCW/RqI=", + "rev": "8df2e765487685757ab5dabd12516cd0a24e3e25", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sy6cs+c3t/XlwwJOMKCuBmoyrOiYHYeqsr/uOMVOdlI=", + "rev": "0ff651dd876823b99fa5c5f53292be28381aee9b", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-weN8PR9qaRcws9T5PhWyJntrJJ4sKoLwP3gTSLHU574=", + "rev": "485b9d9f88ef1c4787b183b8ccc6cdcfbc07ab1a", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", + "modules": "128", + "node": "20.17.0", + "version": "32.1.2" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/update.py b/third_party/nixpkgs/pkgs/development/tools/electron/update.py index 022306a2ba..14ccfe6d84 100755 --- a/third_party/nixpkgs/pkgs/development/tools/electron/update.py +++ b/third_party/nixpkgs/pkgs/development/tools/electron/update.py @@ -321,7 +321,6 @@ class ElectronChromedriverRepo(ElectronBinRepo): # and it is rather pointless trying to update those. # # https://endoflife.date/electron -@memory.cache def supported_version_range() -> range: """Returns a range of electron releases that have not reached end-of-life yet""" releases_json = json.loads( diff --git a/third_party/nixpkgs/pkgs/development/tools/espup/default.nix b/third_party/nixpkgs/pkgs/development/tools/espup/default.nix index ca650be0e3..336bdcdf52 100644 --- a/third_party/nixpkgs/pkgs/development/tools/espup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/espup/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { openssl xz zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/explain/default.nix b/third_party/nixpkgs/pkgs/development/tools/explain/default.nix index 66334b12d9..fb25deacb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/explain/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/explain/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ McSinyx ]; platforms = platforms.unix; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix index ac577f16a9..9148c79da2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-kAdvQtc3FWXQffL1KRg4peeAJ+0439n609jTV9u11aA="; + hash = "sha256-6EM+J5LLSt18/Sl7zUG3SDlawVA28IBUbb9tQgK6d3E="; }; - vendorHash = "sha256-yQ6LGWNVWxrUqFskt22+G9OfbcKfHXh1bf4uNoATsxg="; + vendorHash = "sha256-n4Ue2TSG0zbC2uqXiNakqWQjxhbOgXnC2Y7EKP2BM8Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix b/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix index 17c525d801..aa6b1247b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix index 8222c1df9e..ccfb5f6e89 100644 --- a/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix @@ -25,7 +25,7 @@ buildNpmPackage rec { nativeBuildInputs = [ python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix b/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix index 9aafdb4e02..145da019b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation Security ]; cargoHash = "sha256-b15m5DjTDNWJBHOaKSEMwkO/o+0mV+JMBDBurml7xOs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix index f31f68b502..4b9560f72e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-XvR2Ja3x75unzs7BeyuppmyzDdTZw+BlUmnjqfDTQI0="; + hash = "sha256-bHyLEJiSM42arZiM1VVKga6wp3Q3EAMgUrFnh3hbk9M="; }; - vendorHash = "sha256-QYeOd144ko04Aowi1gtPxgR+3mo7DozCca2xtEN8ARs="; + vendorHash = "sha256-in+c8Wl7ffXAqMvs+3K6dzAd5ePqBpRaxU2iM81moQM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/functiontrace-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/functiontrace-server/default.nix index abacb1d9f9..efb5026e06 100644 --- a/third_party/nixpkgs/pkgs/development/tools/functiontrace-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/functiontrace-server/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-3tLjW7yiS1dNsV81KUZbfN2pvYT9kqiC62nWFid2NH8="; - buildInputs = lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/garble/default.nix b/third_party/nixpkgs/pkgs/development/tools/garble/default.nix index 438d834059..0735e283d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/garble/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/garble/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { # Used for some of the tests. nativeCheckInputs = [git]; - preBuild = lib.optionalString (!stdenv.isx86_64) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' # The test assumex amd64 assembly rm testdata/script/asm.txtar ''; @@ -30,6 +30,6 @@ buildGoModule rec { homepage = "https://github.com/burrowers/garble/"; maintainers = with lib.maintainers; [ davhau ]; license = lib.licenses.bsd3; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix index f62ab97c1b..7af8747ef8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-gopI5iOCSzD23mvOues76WIiBtpNf9A6X9NoOULm6Qo="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gen-license/default.nix b/third_party/nixpkgs/pkgs/development/tools/gen-license/default.nix deleted file mode 100644 index d875574ab0..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/gen-license/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchCrate -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "gen-license"; - version = "0.1.2"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; - }; - - cargoHash = "sha256-2PT20eoXxBPhGsmHlEEGE2ZDyhyrD7tFdwnn3khjKNo="; - - buildInputs = lib.optional stdenv.isDarwin Security; - - meta = with lib; { - description = "Create licenses for your projects right from your terminal"; - mainProgram = "gen-license"; - homepage = "https://github.com/nexxeln/license-generator"; - license = licenses.mit; - maintainers = [ maintainers.ryanccn ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix index 667cafdf67..089c032689 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Tool for working with a stack of patches"; diff --git a/third_party/nixpkgs/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/github-copilot-intellij-agent/default.nix index c919e2de62..13c28ca5b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/github-copilot-intellij-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/github-copilot-intellij-agent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin unzip -p $src github-copilot-intellij/copilot-agent/bin/copilot-agent-${ - if stdenv.isDarwin then (if stdenv.isAarch64 then "macos-arm64" else "macos") else "linux" + if stdenv.hostPlatform.isDarwin then (if stdenv.hostPlatform.isAarch64 then "macos-arm64" else "macos") else "linux" } | install -m755 /dev/stdin $out/bin/copilot-agent runHook postInstall diff --git a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix index da706dcdb3..2658cbe241 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix @@ -9,7 +9,7 @@ , gtk3 , glib , gjs -, enableWebkit2gtk ? stdenv.isLinux +, enableWebkit2gtk ? stdenv.hostPlatform.isLinux , webkitgtk_4_1 , gobject-introspection , wrapGAppsHook3 diff --git a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix index e2f5ed297f..9f44b74933 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.0"; + version = "1.1.2"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-863xmWC9AuNFTmmBTZVDSchgbqXuk14t1r6B6MeLU74="; + hash = "sha256-C48zAKkkOIHe7ggjtjBVLbfCVRdY6BJGqdvTI/rCfns="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix index b1350fba7c..26b820f264 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -16,7 +16,7 @@ buildGoModule { nativeCheckInputs = with llvmPackages; [ clang llvm - ] ++ lib.optionals stdenv.isDarwin [ getconf ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]; meta = with lib; { homepage = "https://github.com/SRI-CSL/gllvm"; diff --git a/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix index 809a674a36..0d950d24bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ncurses ffmpeg ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; meta = with lib; { description = "Live GLSL coding renderer"; @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "glslViewer"; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index 99f1cc7cf3..61cc59d4a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.45.1"; + version = "2.46.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-9zekTcbojUtVaiA6JiWhY78qyDleNIreFwO3kTmffFg="; + sha256 = "sha256-qPE4hzdu5soGVfw6mLJLWvjiXxdkUAT+kpOCWMO1sL8="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix b/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix index f1bd3376e1..2c97533a26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix @@ -30,8 +30,8 @@ rustPlatform.buildRustPackage { # 0.5.6 release has failing tests doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ] - ++ lib.optionals stdenv.isLinux [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix b/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix index 34a279ec10..3b08fda8ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-4d2IFJIoIX0IlS/v/EJkn1cK8hJl9808PE8ZnwqYzu8="; + sha256 = "sha256-i2+J8hWbADeOmua4I3/NX8MC6FKP+5I9BqwCDkLOnvw="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-GcqLW/Ooy2h5spYA94/HmaG0yYiqA4g5DyKlg9EORCQ="; + vendorHash = "sha256-/lrOc2suNyNRlpi22QUr6MZCIrdWaWiZUv6pe/mYnB8="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; diff --git a/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix index 241e1ef95f..8fe6ff5bcf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "GraphQL tool for Rust projects"; diff --git a/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix b/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix index d4a76bf291..f6d8c0fb86 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix @@ -58,7 +58,7 @@ llvmPackages.stdenv.mkDerivation { checkTarget = "test"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Language and an embedded JIT compiler"; longDescription = '' Hobbes is a a language, embedded compiler, and runtime for efficient diff --git a/third_party/nixpkgs/pkgs/development/tools/hors/default.nix b/third_party/nixpkgs/pkgs/development/tools/hors/default.nix index 4ecea68c18..03f53f1eab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hors/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hors/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # requires network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix index 11d9cf11b1..8dcee1b730 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix @@ -91,7 +91,7 @@ buildPythonApplication rec { disabledTests = [ # Test does not correctly handle path normalization for test comparison "test_cli_overrides" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test does not correctly handle absolute /home paths on Darwin (even fake ones) "test_index" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix b/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix index 7e55740d03..e9767ca600 100644 --- a/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix b/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix index 665dda06b2..675334b14e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, testers, infisical, installShellFiles }: +{ stdenv, lib, fetchurl, testers, installShellFiles }: # this expression is mostly automated, and you are STRONGLY # RECOMMENDED to use to nix-update for updating this expression when new @@ -36,7 +36,7 @@ let fetchurl { inherit name url hash; }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "infisical"; version = version; inherit src; @@ -63,7 +63,7 @@ stdenv.mkDerivation { passthru = { updateScript = ./update.sh; - tests.version = testers.testVersion { package = infisical; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -84,4 +84,4 @@ stdenv.mkDerivation { "x86_64-darwin" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix index 8304303d30..4bd2f8cb1a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix index 723937f8f5..fa6bcbf10f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix @@ -5,9 +5,9 @@ let platform = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "mac" - else if stdenv.isWindows then "windows" + if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "mac" + else if stdenv.hostPlatform.isWindows then "windows" else throw "unsupported platform"; in maven.buildMavenPackage rec { @@ -31,7 +31,7 @@ maven.buildMavenPackage rec { dontConfigure = true; preBuild = '' jlink \ - ${lib.optionalString (!stdenv.isDarwin) "--module-path './jdks/${platform}/jdk-13/jmods'"} \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "--module-path './jdks/${platform}/jdk-13/jmods'"} \ --add-modules java.base,java.compiler,java.logging,java.sql,java.xml,jdk.compiler,jdk.jdi,jdk.unsupported,jdk.zipfs \ --output dist/${platform} \ --no-header-files \ diff --git a/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix index 7f74d8665a..400c339475 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix @@ -26,7 +26,7 @@ let maintainers = with maintainers; [ catap ]; }; - src = if stdenv.isLinux then fetchurl { + src = if stdenv.hostPlatform.isLinux then fetchurl { url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg="; } else fetchurl { @@ -99,4 +99,4 @@ let meta = meta // { platforms = lib.platforms.darwin; }; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/third_party/nixpkgs/pkgs/development/tools/jless/default.nix b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix index e704ec994e..0aba5e3f23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jless/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sas94liAOSIirIJGdexdApXic2gWIBDT4uJFRM3qMw0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ AppKit ] - ++ lib.optionals stdenv.isLinux [ libxcb ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; meta = with lib; { description = "Command-line pager for JSON data"; diff --git a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix index 8d4ec0d1c5..1443ca7837 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; # https://github.com/jqlang/jq/issues/2871 - postPatch = lib.optionalString stdenv.isFreeBSD '' + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" "" ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # Otherwise, configure will detect that they’re in libm, but the build will fail # with clang 16+ due to calls to undeclared functions. # This is fixed upstream and can be removed once jq is updated (to 1.7 or an unstable release). - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-D_REENTRANT=1" "-D_DARWIN_C_SOURCE=1" ]); @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "--mandir=\${man}/share/man" ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" # jq is linked to libjq: - ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; # Break the dependency cycle: $dev refers to $bin via propagated-build-outputs, and # $bin refers to $dev because of https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100 diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index 8bb3b03a6f..b9add5050a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.13"; + version = "7.2.0"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-JJV/r64TQecj2Sa/sjxaddiVFCGmtjEn+wfobUbN1OU="; + hash = "sha256-UyZ7unIbKRn/5WsoYxkHWQ5k0Tb5NcC+UGpiyvpShBo="; }; - cargoHash = "sha256-w3MF4FcBCq5gQnhVVlcXOeGH4r2cA6kWwIzGVeLY5zg="; + cargoHash = "sha256-gJQsap31twigZT5n5w7oHATdNf0DfqoNfdS7cMU/hiA="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix b/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix index 8dd3cf1299..a5fea071b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Highly efficient daemon for streaming data from Kafka into Delta Lake"; mainProgram = "kafka-delta-ingest"; homepage = "https://github.com/delta-io/kafka-delta-ingest"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix b/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix index 13edb7bd1f..aceddd467b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl python3 pkg-config ]; buildInputs = [ openssl xorg.xcbutil ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cargoHash = "sha256-jm0UCKDy6TrogMPavB86lvk8yKZXubTGGbApk+oP2RQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix index 42f19d97e4..18b429e2d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installShellCompletion completion/kubie.bash diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix index 3687d1fc57..217e7ab0fa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.13.1"; + version = "0.14.0"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - hash = "sha256-Exv83jmSyhJv90Oo4oApZwNgNjy7tOKxLNh7yJIbfws="; + hash = "sha256-NTuI9sYprX6lu/nfHU4U9bEks6EHlXz/L4yQJ5j3XvA="; }; format = "crystal"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index 0bbab7942e..8e8f5fa3f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Foundation ditto @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pushd 3rd/luamake '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # This package uses the program clang for C and C++ files. The language # is selected via the command line argument -std, but this do not work # in combination with the nixpkgs clang wrapper. Therefor we have to @@ -55,7 +55,9 @@ stdenv.mkDerivation (finalAttrs: { -e '/cxx_/s,$cc,clang++,' ''; - ninjaFlags = [ "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; + ninjaFlags = [ + "-fcompile/ninja/${if stdenv.hostPlatform.isDarwin then "macos" else "linux"}.ninja" + ]; postBuild = '' popd diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/rune-languageserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/rune-languageserver/default.nix index df2d91fa7e..41977f89e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/rune-languageserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/rune-languageserver/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-GlzT7lN9iCNiPFIjhL/UfqohgtOwDaIeTVEWOyaeicM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix index 0a8b3ef124..9faf60024c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ninja pkg-config scdoc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # GNOME Builder Plugin gnome-builder ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 4b7f571ead..03dec7c8c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -23,7 +23,7 @@ buildNpmPackage rec { buildPhase = let extensions = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then "../VSCodium.app/Contents/Resources/app/extensions" else "../resources/app/extensions"; in diff --git a/third_party/nixpkgs/pkgs/development/tools/ldid/default.nix b/third_party/nixpkgs/pkgs/development/tools/ldid/default.nix index 38b252781c..c3a988885c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ldid/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ldid/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libplist libxml2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "-lcrypto" "-lplist-2.0" "-lxml2" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-framework CoreFoundation" "-framework Security" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/libsigrok/default.nix b/third_party/nixpkgs/pkgs/development/tools/libsigrok/default.nix index ca9aee9c45..c93c27722e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/libsigrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/libsigrok/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook doxygen pkg-config python ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport glibmm hidapi - ] ++ lib.optionals stdenv.isLinux [ libieee1284 bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libieee1284 bluez ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix b/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix index 66b9684175..d5489e7e25 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems unzip imagemagick - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix index 45fd8da44b..46025c0f9b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, qtbase, qmake, qtwebsockets, minizinc, makeWrapper, Cocoa }: let - executableLoc = if stdenv.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE"; + executableLoc = if stdenv.hostPlatform.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE"; in stdenv.mkDerivation rec { pname = "minizinc-ide"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake makeWrapper ]; - buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; sourceRoot = "${src.name}/MiniZincIDE"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix index daf026dc3a..c505cc6948 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + #doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); doCheck = false; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix index 870b0ae1d3..bdd534055a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.69.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + #doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); doCheck = false; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.71.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.71.nix index 1fcb819bd4..bfc24892ec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.71.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.71.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix index 8039e36a4f..9f4ee80d1a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix index 3cb6760842..e435716667 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" ] # See: https://sourceforge.net/p/autogen/bugs/187/ - ++ lib.optionals stdenv.isDarwin [ "ac_cv_func_utimensat=no" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "ac_cv_func_utimensat=no" ]; #doCheck = true; # not reliable diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/2.38/libbfd.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/2.38/libbfd.nix index 08cf35970a..313b610560 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/2.38/libbfd.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/2.38/libbfd.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook bison ]; - buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; + buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; configurePlatforms = [ "build" "host" ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 0df4f3d41b..e3114ea8bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.11"; + version = "2.28.12"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ dpkg ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - if ${ lib.boolToString stdenv.isLinux } + if ${ lib.boolToString stdenv.hostPlatform.isLinux } then dpkg-deb -x $src $out mv $out/usr/* $out @@ -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 = "g/Wt/rTmqSAM+m46J7bTGJnX3lD7aYHJKIqXGL2cUlo="; + sha256 = "Z8E8Nn+q9Onku6K7OM3qh2Co0QYnxn9s+g2/xgntFCw="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "GDNy0Y0ytySvU/6LgoY6OoEZex+EujhdWjfrOdmK968="; + sha256 = "RbT65OuvjUD73h5qp9n5EIXTPR94T7z6/4EcsE/XMsM="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "QzK4uxgt+nUtR9sY62PNk6ea3ZuUFVI1Ve16MdCeOog="; + sha256 = "d1VadZt5yZg7AF0UITh3XcEGxBLR6uONgkaLt5vXTE0="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "jrBP8iCD6/DNa/9UNBODvI1Du2SjiQSR2fJAXeWdIiY="; + sha256 = "h8IAxVUj85mh8Lz/zpxAHv0r4ozodiFWw+we0b4ZhJo="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "2xCz5/G/aFMopI3VGXEkXz4cetFI2NdUg+6dXfvOxFQ="; + sha256 = "wp5I8urCtH1zr5Pg10yBN5RqVMPmWS/KNd6zSvIslKo="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 4a292f6079..c5b5aae3b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { inherit system phpMajor; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix index 7adc78013f..a8b6acb1e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # On Linux, c-reduce's preferred way to reason about # the cpu architecture/topology is to use 'lscpu', # so let's make sure it knows where to find it: - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace creduce/creduce_utils.pm --replace \ lscpu ${util-linux}/bin/lscpu ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix index 228f8ed98a..d74dfaa7e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, clang-tools , cmake , colordiff , flex @@ -34,11 +35,11 @@ buildPythonApplication rec { # Avoid blanket -Werror to evade build failures on less # tested compilers. substituteInPlace CMakeLists.txt \ - --replace " -Werror " " " + --replace-fail " -Werror " " " substituteInPlace cvise/utils/testing.py \ - --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ - --replace "'colordiff'" "'${colordiff}/bin/colordiff'" + --replace-fail "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ + --replace-fail "'colordiff'" "'${colordiff}/bin/colordiff'" ''; nativeBuildInputs = [ @@ -65,6 +66,12 @@ buildPythonApplication rec { unifdef ]; + cmakeFlags = [ + # By default `cvise` looks it up in `llvm` bin directory. But + # `nixpkgs` moves it into a separate derivation. + "-DCLANG_FORMAT_PATH=${clang-tools}/bin/clang-format" + ]; + disabledTests = [ # Needs gcc, fails when run noninteractively (without tty). "test_simple_reduction" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ddd/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ddd/default.nix index 0321b24de3..f33f088257 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ddd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ddd/default.nix @@ -25,7 +25,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'debuggerCommand:' 'debuggerCommand: ${gdb}/bin/gdb' ''; - nativeBuildInputs = [ imagemagick ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + nativeBuildInputs = [ + imagemagick + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ motif @@ -36,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # ioctl is not found without this flag. fixed in next release # Upstream issue ref: https://savannah.gnu.org/bugs/index.php?64188 - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-DHAVE_SYS_IOCTL_H"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-DHAVE_SYS_IOCTL_H"; }; configureFlags = [ "--enable-builtin-manual" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix index a6bed02574..33e37cb77e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.12"; + version = "6.3.13"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-tnkMXB0BWavSZF3HEdvtCE42zgcHNRGI5CdK3RDvv9c="; + hash = "sha256-MWFDAyr4oHBe1K9ag5mC3iJAyJgs3ePa6W9//6T2G9A="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix index 34b5127e11..34b966607a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch new file mode 100644 index 0000000000..a3442c6aa2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch @@ -0,0 +1,331 @@ +From: Tristan Ross +Date: Wed, 31 Jul 2024 04:03:03 +0000 (-0700) +Subject: Prevent binaries in src from colliding with libc++ headers +X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=232b9ede92cbecabbd61291c2fc9aaf3fc61061f;hp=87a60d22299c4ba7b94cbce04a32c2abf015f98a + +Prevent binaries in src from colliding with libc++ headers + +Discovered with Nix and LLVM 17. Headers inside of libc++ can easily +collide with binaries being linked in src. This results in clang trying +to include a binary as a header. + +Fix this by removing '-I.' and '-I$(srcdir)' from AM_CPPFLAGS and +DEFAULT_INCLUDES in src/Makefile.am. + +To facilitate this config/eu.am has been refactored. New file +config/eu-common.am contains all of the old eu.am but with the +AM_CPPFLAGS definition removed. eu.am now includes eu-common.am and +contains the old AM_CPPFLAGS definition. + +eu.am functionality does not change, but src/Makefile.am can instead +include eu-common.am and define its own AM_CPPFLAGS without causing a +"multiply defined" warning during autoreconf. + +Signed-off-by: Tristan Ross +--- + +diff --git a/config/eu-common.am b/config/eu-common.am +new file mode 100644 +index 000000000..9cc7f6969 +--- /dev/null ++++ b/config/eu-common.am +@@ -0,0 +1,148 @@ ++## Common automake fragments for elfutils subdirectory makefiles. ++## ++## Copyright (C) 2010, 2014, 2016 Red Hat, Inc. ++## Copyright (C) 2023, Mark J. Wielaard ++## ++## This file is part of elfutils. ++## ++## This file is free software; you can redistribute it and/or modify ++## it under the terms of either ++## ++## * the GNU Lesser General Public License as published by the Free ++## Software Foundation; either version 3 of the License, or (at ++## your option) any later version ++## ++## or ++## ++## * the GNU General Public License as published by the Free ++## Software Foundation; either version 2 of the License, or (at ++## your option) any later version ++## ++## or both in parallel, as here. ++## ++## elfutils is distributed in the hope that it will be useful, but ++## WITHOUT ANY WARRANTY; without even the implied warranty of ++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++## General Public License for more details. ++## ++## You should have received copies of the GNU General Public License and ++## the GNU Lesser General Public License along with this program. If ++## not, see . ++## ++ ++DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' ++ ++# Drop the 'u' flag that automake adds by default. It is incompatible ++# with deterministic archives. ++ARFLAGS = cr ++ ++# Warn about stack usage of more than 256K = 262144 bytes. ++if ADD_STACK_USAGE_WARNING ++STACK_USAGE_WARNING=-Wstack-usage=262144 ++STACK_USAGE_NO_ERROR=-Wno-error=stack-usage= ++else ++STACK_USAGE_WARNING= ++STACK_USAGE_NO_ERROR= ++endif ++ ++if SANE_LOGICAL_OP_WARNING ++LOGICAL_OP_WARNING=-Wlogical-op ++else ++LOGICAL_OP_WARNING= ++endif ++ ++if HAVE_DUPLICATED_COND_WARNING ++DUPLICATED_COND_WARNING=-Wduplicated-cond ++else ++DUPLICATED_COND_WARNING= ++endif ++ ++if HAVE_NULL_DEREFERENCE_WARNING ++NULL_DEREFERENCE_WARNING=-Wnull-dereference ++else ++NULL_DEREFERENCE_WARNING= ++endif ++ ++if HAVE_IMPLICIT_FALLTHROUGH_WARNING ++# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the ++# warning ++if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING ++IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5 ++else ++IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough ++endif ++else ++IMPLICIT_FALLTHROUGH_WARNING= ++endif ++ ++if HAVE_TRAMPOLINES_WARNING ++TRAMPOLINES_WARNING=-Wtrampolines ++else ++TRAMPOLINES_WARNING= ++endif ++ ++if HAVE_NO_PACKED_NOT_ALIGNED_WARNING ++NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned ++else ++NO_PACKED_NOT_ALIGNED_WARNING= ++endif ++ ++if HAVE_USE_AFTER_FREE3_WARNING ++USE_AFTER_FREE3_WARNING=-Wuse-after-free=3 ++else ++USE_AFTER_FREE3_WARNING= ++endif ++ ++AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ ++ -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ ++ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ ++ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ ++ $(USE_AFTER_FREE3_WARNING) \ ++ $(if $($(*F)_no_Werror),,-Werror) \ ++ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ ++ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ ++ $($(*F)_CFLAGS) ++ ++AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ ++ $(TRAMPOLINES_WARNING) \ ++ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ ++ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ ++ $(if $($(*F)_no_Werror),,-Werror) \ ++ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ ++ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ ++ $($(*F)_CXXFLAGS) ++ ++COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) ++ ++DEFS.os = -DPIC -DSHARED ++if SYMBOL_VERSIONING ++DEFS.os += -DSYMBOL_VERSIONING ++else ++endif ++ ++%.os: %.c %.o ++if AMDEP ++ $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \ ++ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ ++ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ ++ rm -f "$(DEPDIR)/$*.Tpo"; \ ++ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++ fi ++else ++ $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $< ++endif ++ ++CLEANFILES = *.gcno *.gcda ++ ++textrel_msg = echo "WARNING: TEXTREL found in '$@'" ++if FATAL_TEXTREL ++textrel_found = $(textrel_msg); exit 1 ++else ++textrel_found = $(textrel_msg) ++endif ++textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi ++ ++print-%: ++ @echo $*=$($*) +diff --git a/config/eu.am b/config/eu.am +index e6c241f9d..3aa6048aa 100644 +--- a/config/eu.am ++++ b/config/eu.am +@@ -1,4 +1,5 @@ +-## Common automake fragments for elfutils subdirectory makefiles. ++## Common automake fragments for elfutils subdirectory makefiles ++## with AM_CPPFLAGS set. + ## + ## Copyright (C) 2010, 2014, 2016 Red Hat, Inc. + ## Copyright (C) 2023, Mark J. Wielaard +@@ -30,120 +31,5 @@ + ## not, see . + ## + +-DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' + AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. +- +-# Drop the 'u' flag that automake adds by default. It is incompatible +-# with deterministic archives. +-ARFLAGS = cr +- +-# Warn about stack usage of more than 256K = 262144 bytes. +-if ADD_STACK_USAGE_WARNING +-STACK_USAGE_WARNING=-Wstack-usage=262144 +-STACK_USAGE_NO_ERROR=-Wno-error=stack-usage= +-else +-STACK_USAGE_WARNING= +-STACK_USAGE_NO_ERROR= +-endif +- +-if SANE_LOGICAL_OP_WARNING +-LOGICAL_OP_WARNING=-Wlogical-op +-else +-LOGICAL_OP_WARNING= +-endif +- +-if HAVE_DUPLICATED_COND_WARNING +-DUPLICATED_COND_WARNING=-Wduplicated-cond +-else +-DUPLICATED_COND_WARNING= +-endif +- +-if HAVE_NULL_DEREFERENCE_WARNING +-NULL_DEREFERENCE_WARNING=-Wnull-dereference +-else +-NULL_DEREFERENCE_WARNING= +-endif +- +-if HAVE_IMPLICIT_FALLTHROUGH_WARNING +-# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the +-# warning +-if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING +-IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5 +-else +-IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough +-endif +-else +-IMPLICIT_FALLTHROUGH_WARNING= +-endif +- +-if HAVE_TRAMPOLINES_WARNING +-TRAMPOLINES_WARNING=-Wtrampolines +-else +-TRAMPOLINES_WARNING= +-endif +- +-if HAVE_NO_PACKED_NOT_ALIGNED_WARNING +-NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned +-else +-NO_PACKED_NOT_ALIGNED_WARNING= +-endif +- +-if HAVE_USE_AFTER_FREE3_WARNING +-USE_AFTER_FREE3_WARNING=-Wuse-after-free=3 +-else +-USE_AFTER_FREE3_WARNING= +-endif +- +-AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +- -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ +- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ +- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(USE_AFTER_FREE3_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ +- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ +- $($(*F)_CFLAGS) +- +-AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ +- $(TRAMPOLINES_WARNING) \ +- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ +- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ +- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ +- $($(*F)_CXXFLAGS) +- +-COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +- +-DEFS.os = -DPIC -DSHARED +-if SYMBOL_VERSIONING +-DEFS.os += -DSYMBOL_VERSIONING +-else +-endif +- +-%.os: %.c %.o +-if AMDEP +- $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \ +- -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +- then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +- rm -f "$(DEPDIR)/$*.Tpo"; \ +- else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +- fi +-else +- $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $< +-endif +- +-CLEANFILES = *.gcno *.gcda +- +-textrel_msg = echo "WARNING: TEXTREL found in '$@'" +-if FATAL_TEXTREL +-textrel_found = $(textrel_msg); exit 1 +-else +-textrel_found = $(textrel_msg) +-endif +-textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi +- +-print-%: +- @echo $*=$($*) ++include $(top_srcdir)/config/eu-common.am +diff --git a/src/Makefile.am b/src/Makefile.am +index 1d592d4de..5fcebc21d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -16,10 +16,12 @@ + ## You should have received a copy of the GNU General Public License + ## along with this program. If not, see . + ## +-include $(top_srcdir)/config/eu.am ++include $(top_srcdir)/config/eu-common.am + DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ + -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" +-AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ ++DEFAULT_INCLUDES = -I$(top_builddir) ++AM_CPPFLAGS = -I$(top_srcdir)/lib -I.. \ ++ -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \ + -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 78c88f3420..260d385e35 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -2,7 +2,7 @@ , musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs , argp-standalone , enableDebuginfod ? true, sqlite, curl, libmicrohttpd, libarchive -, gitUpdater +, gitUpdater, autoreconfHook }: # TODO: Look at the hardcoded paths to kernel, modules etc. @@ -37,7 +37,10 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ] + # Prevent headers and binaries from colliding which results in an error. + # https://sourceware.org/pipermail/elfutils-devel/2024q3/007281.html + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) ./cxx-header-collision.patch; postPatch = '' patchShebangs tests/*.sh @@ -53,7 +56,8 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. nativeBuildInputs = [ m4 bison flex gettext bzip2 ] - ++ lib.optional enableDebuginfod pkg-config; + ++ lib.optional enableDebuginfod pkg-config + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) autoreconfHook; buildInputs = [ zlib zstd bzip2 xz ] ++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ezno/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ezno/default.nix index 559622bf7d..af035e7565 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ezno/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ezno/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix index afeac90c58..05fbd759ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-gVYDvda+6ZJkShJXUxUEVxq4enkRrhdvlTTxYWq4Aho="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool texinfo ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/funzzy/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/funzzy/default.nix index c05def1840..c1f4b642a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/funzzy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/funzzy/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eq5d6oHWKip9K+9yszLXW+JHtzYzrThXfqoZGMhnSHk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index 5cf686dcfb..ac1bd1627d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { hash = "sha256-OCVOrNRXITS8qcWlqk1MpWTLvTDDadiB9zP7a5AzVPI="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace gdb/darwin-nat.c \ --replace '#include "bfd/mach-o.h"' '#include "mach-o.h"' '' + lib.optionalString stdenv.hostPlatform.isMusl '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin-target-match.patch ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }) - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # darwin build fails with format hardening since v7.12 - hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "format" ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix index 5273621148..bed0297be5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix index fc2036ec9b..229532c755 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { CXXFLAGS = ["-fPIC" "-O2" "-w" "-fpermissive"]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Ignominous Profiler"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix index eacb70a5ea..f5af6c868c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix @@ -24,8 +24,8 @@ buildGoModule rec { # able to use the Virtualization framework at runtime. # - sigtool is allows us to validly sign such executables with a dummy # authority. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ sigtool ]; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Virtualization ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Virtualization ]; ldflags = [ "-s" @@ -43,7 +43,7 @@ buildGoModule rec { # - Finally, at the start of the fixup phase, the working directory is # $sourceRoot/src/cmd/linuxkit, so it's simpler to use the sign target from # the Makefile in that directory rather than $sourceRoot/Makefile. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' make sign LOCAL_TARGET=$out/bin/linuxkit ''; passthru.tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index de1decee52..98f7d23987 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # We remove phony 'FRC' target that forces rebuilds: # 'version.h: FRC ...' is translated to 'version.h: ...'. sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|lcurses|lncurses|g' Configure ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix index 0d4d5c2c43..6b190f9c65 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; # WiX tests fail on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' patchShebangs subprojects/bats-core/{bin,libexec} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix index d3c0802510..3fd8c3eeaa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation { # include source here so that autoPatchelfHook can do it's job src = managed; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; installPhase = '' mkdir -p $out/share/netcoredbg $out/bin cp ${unmanaged}/* $out/share/netcoredbg diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index 21bd640fb4..8dc6c61283 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.20"; + version = "1.13.22"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-qlD1zm2eCQm27N268tht0jtsSiCi3A31XCTFXG9jB0Y="; + hash = "sha256-zFF8cHElrWtLOa5xtO5N0520JC47rGOQ7YshEf12tCw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix index 218fdf7068..0f772eac7d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index 951493b843..646fbb1aff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { updateScript = unstableGitUpdater { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix index a962444a6f..d71155bd67 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix index ae567bb01b..a04b8874e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 patches = lib.optional (!vanilla) ./requires-private.patch - ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; + ++ lib.optional stdenv.hostPlatform.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch postPatch = @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; configureFlags = [ "--with-internal-glib" ] - ++ lib.optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] + ++ lib.optionals (stdenv.hostPlatform.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] # Can't run these tests while cross-compiling ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "glib_cv_stack_grows=no" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix b/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix index 64ee0c3731..e84d2a57c9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY="; }; - buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; + buildInputs = [ libuuid ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation readline ]; patches = [ ./no-curl-ca.patch ]; postPatch = '' substituteInPlace contrib/curl/premake5.lua \ --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ --replace-fail '"-arch arm64"' '""' \ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' make -f Bootstrap.mak osx '' else '' make -f Bootstrap.mak linux diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pwninit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pwninit/default.nix index 341532d004..d67c7e6406 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pwninit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pwninit/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tbZS7PdRFvO2ifoHA/w3cSPfqqHrLeLHAg6V8oG9gVE="; }; - buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl xz ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/pwninit \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/riff/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/riff/default.nix index d6c7ee8164..aa85616720 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/riff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/riff/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix index 8299ceba53..9f7c7d6415 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix @@ -45,7 +45,7 @@ buildGoModule rec { ]; # tests fail to access /etc/bashrc on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix index 6ffcd67a55..12d3e2aa7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yZQSY2zqVpmhMd6+Avg2vBh0WQB2FJ2fiMuy5x9Zl9U="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix index a929d90652..98dfbc3aca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index a268e1749f..fc7e2b485a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix index 414be9560b..ae5441edb2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DUSE_GSL=1" "-DUSE_PCAP=1" "-DUSE_SSL=1" - "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" + "-DUSE_SCTP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git ]; buildInputs = [ ncurses libpcap openssl ] - ++ lib.optional (stdenv.isLinux) lksctp-tools; + ++ lib.optional (stdenv.hostPlatform.isLinux) lksctp-tools; meta = with lib; { homepage = "http://sipp.sf.net"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix index 9fee7cca7f..f51b848a62 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix @@ -21,7 +21,7 @@ let rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ] - ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { OpenGL ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath ${lib.makeLibraryPath rpathLibs} $out/bin/slint-lsp ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix index 612ef223e6..458e3b51d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { pname = "sqitch"; version = sqitch.version; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; src = sqitch; dontBuild = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${sqitch}/$d $out/$d fi done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix index 44b8cc6214..c809b52826 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix @@ -25,9 +25,9 @@ buildGoModule rec { "cmd/src" ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index 16785e4d4b..c5c54351ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -11,7 +11,7 @@ let # The Darwin build of stlink explicitly refers to static libusb. - libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + libusb1' = if stdenv.hostPlatform.isDarwin then libusb1.override { withStatic = true; } else libusb1; # IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix index 6256831969..ee4242c1ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ strace ]; - checkFlags = lib.optionals stdenv.isAarch64 [ + checkFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ # thread 'analysis::tests::analyze_dd' panicked at 'assertion failed: ...' "--skip=analysis::tests::analyze_dd" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix index fa39c310a2..955a0296b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "1.0.20"; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libmysqlclient luajit ] ++ lib.optionals stdenv.isLinux [ libaio ]; + buildInputs = [ libmysqlclient luajit ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ]; depsBuildBuild = [ pkg-config ]; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix index c1c44f4971..341919bd41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terramate"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-z7G0oj6aJRUXVitj9f2hGTLOFPo0LcQyADKvMFsk9t0="; + hash = "sha256-raVB0c/TZK/NKv/J1t8nrPAeABd5gQhjeuKL8kYm9YI="; }; - vendorHash = "sha256-TOntPPtynr333rX0wlb2pIeEwcNzyWP3wFqPoMz6LK0="; + vendorHash = "sha256-kjzpXOoyTwjpYLBqDuB6Eup5Yzgej2U+HUo4z8V+cEI="; # required for version info nativeBuildInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index a43eab5f00..e630489ffa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { bash libintl ] - ++ optionals stdenv.isSunOS [ + ++ optionals stdenv.hostPlatform.isSunOS [ libiconv gawk ] @@ -104,7 +104,7 @@ stdenv.mkDerivation { ++ optionals (crossBuildTools && lib.versionAtLeast version "7.1") [ "texinfo_cv_sys_iconv_converts_euc_cn=yes" ] - ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + ++ optional stdenv.hostPlatform.isSunOS "AWK=${gawk}/bin/awk"; installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ @@ -114,7 +114,7 @@ stdenv.mkDerivation { nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ]; - doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky + doCheck = interactive && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isSunOS; # flaky checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [ # Test is known to fail on various locales on texinfo-6.8: diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index d691b94c38..68e29724eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!isCross) help2man; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security CoreServices diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index ff3ceafc7f..6c6b232e93 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; - checkInputs = lib.optionals stdenv.isDarwin [ zlib ]; + checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; # enable all output formats buildFeatures = [ "all" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix index 0befa7aac9..474de71004 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ marcweber peterhoeg ]; platforms = platforms.linux; + mainProgram = "usb_modeswitch"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/wasmer-pack/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/wasmer-pack/default.nix index 7c1d84de88..f1216ae124 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/wasmer-pack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/wasmer-pack/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-nyhjwEZyT8IEb0pTbou/EtN47gehge3fUCQVPs2TkIY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/default.nix index 1c6eca4729..5ba3b74a5a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Simple but powerful graphical interface to gdb"; mainProgram = "xxgdb"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix index 2f8983572f..79ceb8a0aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; buildInputs = [ curl @@ -95,8 +95,8 @@ stdenv.mkDerivation (finalAttrs: { python3 antlr.runtime.cpp ] ++ pythonDeps - ++ lib.optionals stdenv.isLinux [ libtirpc ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; preConfigure = '' # Build MySQL diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix index 32fd074636..14ff96542c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; buildInputs = [ curl @@ -95,8 +95,8 @@ stdenv.mkDerivation (finalAttrs: { python3 antlr.runtime.cpp ] ++ pythonDeps - ++ lib.optionals stdenv.isLinux [ libtirpc ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; preConfigure = '' # Build MySQL diff --git a/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix index 9c5f8a12df..c9d4227818 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix @@ -27,7 +27,7 @@ buildNpmPackage rec { python3 ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix b/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix index 83ba3fe2e4..5bc067085e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix @@ -30,9 +30,9 @@ buildNpmPackage { npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ node-gyp python3 ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; postInstall = '' # Only keep the necessary parts of build/Release to reduce closure size diff --git a/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix b/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix index 32e69dcf70..1651a3c43d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ scons ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; CPPPATH = symlinkJoin { name = "nsis-includes"; - paths = [ zlib.dev ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + paths = [ zlib.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; }; LIBPATH = symlinkJoin { name = "nsis-libs"; - paths = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + paths = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; }; sconsFlags = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "SKIPUTILS=all" "SKIPMISC=all" "NSIS_CONFIG_CONST_DATA=no" - ] ++ lib.optional stdenv.isDarwin "APPEND_LINKFLAGS=-liconv"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "APPEND_LINKFLAGS=-liconv"; preBuild = '' sconsFlagsArray+=( @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ pombeirp ]; mainProgram = "makensis"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix index 4c9e6ff4af..e5e656877e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix index f2c00e16c9..1aa192f1da 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 6696a99977..194ea1c8a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib -, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.14.3" +, version ? if lib.versionAtLeast ocaml.version "4.08" then "0.15.0" else "0.14.3" }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index ec34ba2f17..4e7d0af89a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; buildInputs = [ ncurses getconf ] - ++ lib.optionals stdenv.isLinux [ bubblewrap ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; patches = [ ./opam-shebangs.patch ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.hostPlatform.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 891733635c..4b11dd7576 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -8,7 +8,7 @@ , enableWasmEval ? false }: -assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; +assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; buildGoModule rec { pname = "open-policy-agent"; @@ -55,9 +55,9 @@ buildGoModule rec { # want but also limits the tests # Also avoid wasm tests on darwin due to wasmtime-go build issues getGoDirs() { - go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} + go list ./... | grep -v -e e2e ${lib.optionalString stdenv.hostPlatform.isDarwin "-e wasm"} } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra rm server/server_test.go ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix index 4625b97eb0..5feddddb90 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix index 0f756388be..682bc51923 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix @@ -2,21 +2,20 @@ bats, fetchFromGitHub, lib, - packcc, python3, stdenv, testers, uncrustify, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "packcc"; version = "2.0.2"; src = fetchFromGitHub { owner = "arithy"; repo = "packcc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-k1C/thvr/5fYrgu/j8YN3kwXp4k26sC9AhYhYAKQuX0="; }; @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = packcc; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Parser generator for C"; @@ -72,10 +71,10 @@ stdenv.mkDerivation rec { - Supports direct and indirect left-recursive grammar rules. ''; homepage = "https://github.com/arithy/packcc"; - changelog = "https://github.com/arithy/packcc/releases/tag/${src.rev}"; + changelog = "https://github.com/arithy/packcc/releases/tag/${finalAttrs.src.rev}"; license = licenses.mit; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; mainProgram = "packcc"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix index e6254bdbbb..06b55790dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ bzip2 ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ bzip2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage artifacts/pactorio.1 diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix index a47918f435..991925cb4e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./2.7.7-fixes.patch ]; buildInputs = [ jdk ]; - CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"; + CXXFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"; meta = with lib; { description = "Powerful parser generator"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix index 79db5301ad..f575110b87 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix @@ -89,7 +89,7 @@ let nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = - lib.optional stdenv.isDarwin CoreFoundation ++ + lib.optional stdenv.hostPlatform.isDarwin CoreFoundation ++ extraCppBuildInputs; cmakeDir = "../runtime/Cpp"; @@ -153,7 +153,7 @@ in { version = "4.10.1"; sourceSha256 = "sha256-Z1P81L0aPbimitzrHH/9rxsMCA6Qn3i42jFbUmVqu1E="; jarSha256 = "sha256-QZSdQfINMdW4J3GHc13XVRCN9Ss422yGUQjTOCBA+Rg="; - extraCppBuildInputs = lib.optional stdenv.isLinux libuuid; + extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DANTLR4_INSTALL=ON" "-DANTLR_BUILD_CPP_TESTS=OFF" @@ -165,7 +165,7 @@ in { sourceSha256 = "1af3cfqwk7lq1b5qsh1am0922fyhy7wmlpnrqdnvch3zzza9n1qm"; jarSha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg"; extraCppBuildInputs = [ utf8cpp ] - ++ lib.optional stdenv.isLinux libuuid; + ++ lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" ]; @@ -178,7 +178,7 @@ in { version = "4.8"; sourceSha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m"; jarSha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k"; - extraCppBuildInputs = lib.optional stdenv.isLinux libuuid; + extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DANTLR4_INSTALL=ON" ]; }).antlr; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index 43ef3ffa3e..80a2ad835c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # cannot add bash to buildInputs due to infinite recursion strictDeps = stdenv.hostPlatform != stdenv.buildPlatform; - nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; + nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.hostPlatform.isSunOS help2man; propagatedBuildInputs = [ m4 ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix index bd62241ec9..84cb5f35d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { export ac_cv_func_realloc_0_nonnull=yes ''; - postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' + postConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix index 03814d3cfb..a6b64efb7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-std=c89"}" + substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.hostPlatform.isDarwin "-std=c89"}" ''; sourceRoot = "jikespg/src"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix index 72e77a55a1..a6090f104f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix @@ -50,6 +50,6 @@ in version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = lib.licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index ea3386e15d..662d6ace13 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -114,7 +114,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g="; buildInputs = - lib.optionals stdenv.isDarwin [ Security CoreServices ]; + lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix index cffa0299be..ba795a6ef8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; postInstall = '' wrapProgram $out/bin/perseus \ diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix index d4407fa5ec..cad3d2af45 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -35,8 +35,8 @@ perlPackages.buildPerlPackage rec { --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," ''; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pg_format ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/pgtop/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgtop/default.nix index 5798b7da51..066e07fd48 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgtop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgtop/default.nix @@ -15,8 +15,8 @@ perlPackages.buildPerlPackage rec { buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWP ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pgtop ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix b/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix index a31f468083..b4cbcde826 100644 --- a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk, mbedtls_2 }: stdenv.mkDerivation rec { pname = "picotool"; - version = "1.1.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-OcQJeiva6X2rUyh1rJ+w4O2dWxaR7MwMfbHlnWuBVb8="; + sha256 = "sha256-z7EFk3qxg1PoKZQpUQqjhttZ2RkhhhiMdYc9TkXzkwk="; }; + postPatch = '' + # necessary for signing/hashing support. our pico-sdk does not come with + # it by default, and it shouldn't due to submodule size. pico-sdk uses + # an upstream version of mbedtls 2.x so we patch ours in directly. + substituteInPlace lib/CMakeLists.txt \ + --replace-fail "''$"'{PICO_SDK_PATH}/lib/mbedtls' '${mbedtls_2.src}' + ''; + buildInputs = [ libusb1 pico-sdk ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; - description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; + description = "Tool for interacting with RP2040/RP2350 device(s) in BOOTSEL mode, or with an RP2040/RP2350 binary"; mainProgram = "picotool"; license = licenses.bsd3; maintainers = with maintainers; [ muscaln ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/poac/default.nix b/third_party/nixpkgs/pkgs/development/tools/poac/default.nix index 95a028c6f8..d6a1ad39bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poac/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poac/default.nix @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git cacert ]; buildInputs = [ (boost179.override { - enableShared = stdenv.isDarwin; - enableStatic = !stdenv.isDarwin; + enableShared = stdenv.hostPlatform.isDarwin; + enableStatic = !stdenv.hostPlatform.isDarwin; }) git2-cpp glob diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix index 516aa5927b..36a5bb15e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.16.2"; + version = "1.17.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-Ej8ya2sKtRVRQdMr63YpPbqzwtV0ZsqO+7xiif3gFr0="; + hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs="; }; - vendorHash = "sha256-OKTRxExgJ2V3736fIVvQX3FEa44jGngwCi2D/uk0F58="; + vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo="; subPackages = [ "cmd/protoc-gen-connect-go" diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 460f29bf5c..5d12aa44be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.11.0"; + version = "0.12.0"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - hash = "sha256-LUFwmxlbZVTlEyp82lm3ylh6KYtVlviYK13pxj4MH0M="; + hash = "sha256-GDDycFWGrNXWdWNjGhb+W6kImF1nqVVH+dJ8VjYQ2MQ="; }; - vendorHash = "sha256-BPvKRIYvIxen0m8C9geFC4gIq4VH8mmdI0ZLMnlBB/I="; + vendorHash = "sha256-ErTXIbPKAFm8jBYRPuWSaCFbTS+5MPyto9edixbTR7E="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix index 8522333ef9..01d847649b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Pull a header that contains a definition of proc_pid_rusage(). darwin.apple_sdk_11_0.Libsystem ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix index a109b0ea57..beae01a2c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ ruby which - ] ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; + ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rcodesign/default.nix b/third_party/nixpkgs/pkgs/development/tools/rcodesign/default.nix index 72c261cfa0..a110611ab4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rcodesign/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rcodesign/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cpQBdxTw/ge4VtzjdL2a2xgSeCT22fMIjuKu5UEedhI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix index d5979ac53d..4b9549b8a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "tool for expediting bazel build workflows"; diff --git a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix index f3d384c5bf..3989e24c76 100644 --- a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = - [ openssl ] ++ lib.optionals stdenv.isDarwin [ + [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices diff --git a/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix b/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix index 2788f4fb11..83b32a7dd2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix index a70cd7805a..beeeddeb70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix @@ -28,7 +28,6 @@ let rev = "renderdoc-modified-7"; sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; }; - cmakeBool = b: if b then "ON" else "OFF"; in mkDerivation rec { pname = "renderdoc"; @@ -57,12 +56,12 @@ mkDerivation rec { ''; cmakeFlags = [ - "-DBUILD_VERSION_HASH=${src.rev}" - "-DBUILD_VERSION_DIST_NAME=NixOS" - "-DBUILD_VERSION_DIST_VER=${version}" - "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" - "-DBUILD_VERSION_STABLE=ON" - "-DENABLE_WAYLAND=${cmakeBool waylandSupport}" + (lib.cmakeFeature "BUILD_VERSION_HASH" src.rev) + (lib.cmakeFeature "BUILD_VERSION_DIST_NAME" "NixOS") + (lib.cmakeFeature "BUILD_VERSION_DIST_VER" version) + (lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc") + (lib.cmakeBool "BUILD_VERSION_STABLE" true) + (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) ]; # TODO: define these in the above array via placeholders, once those are widely supported diff --git a/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix b/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix index 273b0577dc..256f6515ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VTJ3FNhVLgxo/VVBhk1yF9UUktLXcbrEkYwoyoWFhXA="; buildInputs = - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ postgresqlTestHook diff --git a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix index 1c181c0efb..927eb7b43c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - hash = "sha256-ZfZNqr7zeMrLjSS1h3ZbjiXNjX1UiqldtrEFth2Z4f0="; + hash = "sha256-ViYNXZXvlOOpBjQuMAQXwcDtu1HoF+NstrOZzQcBOuQ="; # 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; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-iIAKPCE06lhAf/4f4TRVO51RdlvuXNA7yMlGVPGrIeo="; + vendorHash = "sha256-btuAXaJL8URkJvzPy+9tci5gOAqSkkNZn3mN2ox1Vfk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix index 32ebfcf418..ada53d437f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices SystemConfiguration ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = "1"; # tests flaky on darwin on hydra - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Project management tool for Roblox"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rover/default.nix b/third_party/nixpkgs/pkgs/development/tools/rover/default.nix index c70869299c..92b5339fdf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rover/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rover/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix b/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix index 3710cb6122..b3f9e00a81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; buildInputs = [ llvmPackages.llvm llvmPackages.libclang openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] - ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; src = fetchFromGitHub { owner = "andersbakken"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix index 287959dbf0..480826ab55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { libxcrypt libyaml rust-jemalloc-sys-unprefixed - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ readline libiconv libobjc @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; preFixup = '' mv $out/bin/rubyfmt{-main,} @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fables-tales/rubyfmt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bobvanderlinden ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "rubyfmt"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix index ee7da1db88..3da8e4beea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix index 9c66f2cd97..4e8cecb4a3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QsaOFman+VBSIAbCalW63I3QXY0uECZy9+ufOKhSQrA="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Test checks against machine code output, which fails with some # LLVM/compiler versions. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix index 01f72f1bc4..9de3d6c943 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix index 22567ad2d1..151f155f9e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # `test_data` is explicitly excluded from the package published to crates.io, so tests cannot be run doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index 205484f5fa..f7b2426612 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { bzip2 xz zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix index 9babac9eba..8a89387ca8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix @@ -39,13 +39,13 @@ rustPlatform.buildRustPackage rec { --subst-var libPath ''; in - lib.optionals stdenv.isLinux [ patchelfPatch ]; + lib.optionals stdenv.hostPlatform.isLinux [ patchelfPatch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix index daf4bc230b..7d302da100 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix @@ -26,9 +26,9 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index ca0f8a590e..3dd89aefe7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-UfhIz87s0CLUDbIpWMPzGQ7qVmh14GuiFoquauSbTOw="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; - buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl curl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libiconv Security diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 1c19b61bf8..fc5da4b5b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; checkFlags = [ "offline_tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix index 50025c628f..b307704c76 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.67"; + version = "0.1.68"; src = fetchCrate { inherit pname version; - hash = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; + hash = "sha256-NTFrNSEIzHppwOOjI3VadjhdV6EgGUmJzyX5JmTsJoI="; }; - cargoHash = "sha256-EIpi1k5GffGCk+fzHSW32T+ZLkRfswnEGZdER95TyBk="; + cargoHash = "sha256-DoIkK/tj3AYt0vm7u7f4SmgOKbdQZv3ZunMFT68+37E="; meta = with lib; { description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix index c5e065eb2e..ee119146fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix index 23880c2480..ce20d409df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index fa8ba8accb..e23844785c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 0a2b797610..67c5ca0bc0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index 841a502a31..3fbb42c88a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration CoreFoundation diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix index d206e739bb..70c9a377f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # assumes the target is x86_64-unknown-linux-gnu "--skip simple_project::it_checks_okay_project_correctly"; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index 573bdb96db..71ff14557f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix index 1302fd581b..b1f390f773 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl darwin.apple_sdk.frameworks.Security libgit2 diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix index e7f5003768..cbdd2a90b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { bzip2 xz zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix index f9417651cf..17c9cd7d83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix index 7a72bc3602..f42607332d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix index 1e713076e1..81f0a1c62b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = with lib; { description = "Cargo plugin to manage dependency features"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 4a6d9c3ff3..aca8e713e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/cargo-flamegraph \ --set-default PERF ${perf}/bin/perf wrapProgram $out/bin/flamegraph \ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix index 42f703aaa2..23d13a8841 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv curl ]; meta = with lib; { description = "Discover funding links for your project's dependencies"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index fc60b761fe..6c296e8ccb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index f4c25a60db..fa6a057802 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { # - should_canonicalize: the test assumes that it will be called from the /Users// folder on darwin variant. checkFlags = [ "--skip=favorites::favorites_default_to_git_if_not_defined" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=git::utils::should_canonicalize" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix index 13bb3eaff1..68a696ab1a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix index ec689cb515..8859fa605a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; meta = with lib; { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix index 096ef8f764..f6aa12d2c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix index e8b1443dd0..b1126b42f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-+cYbejdZOmvaX8jdf1llAvaTefPVtIOl1fqGm5tHMRk="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix index 75127127ea..b63c9e43b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreServices Security diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix index 2beed790ed..5a14ac3425 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -10,7 +10,7 @@ let SystemConfiguration Security; inherit (lib) optionals; - inherit (stdenv) isDarwin; + inherit (stdenv.hostPlatform) isDarwin; in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix index 958bfeb447..7132ebff02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 387460a0dd..2672d165b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -94,6 +94,6 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ wucke13 matthiasbeyer CobaltCause ]; # The profiler runtime is (currently) disabled on non-Linux platforms - broken = !(stdenv.isLinux && !stdenv.targetPlatform.isRedox); + broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix index 76f26decd8..7e6c0c917a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix @@ -33,9 +33,9 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix index 28c94f9a0f..17ba08923b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage { export CARGO_HOME=$out/share/ ''; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; nativeBuildInputs = [ pkg-config git makeWrapper ]; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix index 3787173f0f..da236481f4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index e8b23c70bd..2db732560d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ libiconv Security ] else [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix index 7420002138..e5e7fcde55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VRkhDgKunSUOz2/U4oC2t0YrDh5l48z4luevMazfj6o="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix index b106812748..1397ffc374 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sIKan8LnGv4sGVrGOUOKSD3R4fNRu5yBFATm5MWDTSU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreGraphics Foundation ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix index 64b7c4a776..0c575c604c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreFoundation CoreServices diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index 3d41c35ffd..89293ab62e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -56,6 +56,7 @@ # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g. # if you include the generated code in the output via postInstall. , useFakeRustfmt ? true +, usePgTestCheckFeature ? true , ... } @ args: let @@ -96,12 +97,12 @@ let pg_ctl stop ''; - argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" ]; + argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" "usePgTestCheckFeature" ]; # so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because # we forgot parentheses finalArgs = argsForBuildRustPackage // { - buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cargo-pgrx @@ -118,7 +119,7 @@ let ${maybeEnterBuildAndTestSubdir} PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ - ${lib.optionalString stdenv.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ cargo pgrx package \ --pg-config ${lib.getDev postgresql}/bin/pg_config \ ${maybeDebugFlag} \ @@ -154,7 +155,7 @@ let RUST_BACKTRACE = "full"; checkNoDefaultFeatures = true; - checkFeatures = (args.checkFeatures or [ ]) ++ [ "pg_test pg${pgrxPostgresMajor}" ]; + checkFeatures = (args.checkFeatures or [ ]) ++ (lib.optionals usePgTestCheckFeature [ "pg_test" ]) ++ [ "pg${pgrxPostgresMajor}" ]; }; in rustPlatform.buildRustPackage finalArgs diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix index 3aa7003b75..93010928dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -24,13 +24,13 @@ let inherit cargoHash; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -71,4 +71,10 @@ in hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU="; cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw="; }; + + cargo-pgrx_0_12_0_alpha_1 = generic { + version = "0.12.0-alpha.1"; + hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; + cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; + }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index aa55cac49d..8bc991d0bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.37.0"; + version = "0.38.0"; src = fetchCrate { inherit pname version; - hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg="; + hash = "sha256-NgaW/QsBaMMBbfUGyHwuu0fb3q3GmD8Qv5wG6qYPjvA="; }; - cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c="; + cargoHash = "sha256-KX3+tIdAyaWdaq2nabVTvoZRTXLSXEALFJYCa5nda4w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # Tests fail doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix index 8f9abcb28d..c818582433 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-risczero/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-risczero/default.nix index ead0103d3f..bf61c32cf7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-risczero/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-risczero/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix index a219cbd41d..ad2e4b7f33 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix index f6d52a2c54..80af89869c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.38"; + version = "0.2.39"; src = fetchCrate { inherit pname version; - hash = "sha256-CYnW6wv4aL/Qs6IwPaRi9w8/iNMo5to0J3z4zTdgHaE="; + hash = "sha256-fGUx2SOgs5IF7KTr36fHktykrFkxqLWp4CWVGOZ+MeM="; }; - cargoHash = "sha256-jRsxP4b1URTDcnp8VsZvSTaPNOBBwq570eCn2jfQSGg="; + cargoHash = "sha256-iCHf4/bqICZ0bTeFFeVopU0Yl8VbxRd+Cr4WucuptVk="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix index 61a0bf1c6c..57d6104185 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix index aae0be3376..6d6bfa5ae2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; preCheck = "HOME=$(mktemp -d)"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix index 395a484982..073500a16e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Fx1C4X0dQqePqLa+X+4ZDrIMFKBQ6J50nBApYXcGbFM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index 828f50e467..b85112f755 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration Foundation IOKit diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix index 1dcc79fb4b..7ae69fa552 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -35,14 +35,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix index a00d4fef22..8f1e96c556 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-8VkhEpggSoE0DIdZk8Y1fCYAwN6CZd2nK6auWRIbS6w="; + hash = "sha256-gsrmHCj9DC6OkGS0CD/NE2UMc/9TdjA2In6f3iKXMOg="; }; - cargoHash = "sha256-fYpG/Bl3hsbkWWTkbX59UqD/HuL9OpmcZc6hPAmnNtM="; + cargoHash = "sha256-ryvv4SuhxIXPJKa3WLdjNQZAP+JLAjWtrCfWXUm+WVg="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index bc72b8a6a7..a41e2616ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { # TODO figure out how to use provided curl instead of compiling curl from curl-sys buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; # Requires network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ui/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ui/default.nix index 01578e497d..fedd72458c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ui/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ui/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ expat fontconfig libGL @@ -39,11 +39,11 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr xorg.libxcb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/cargo-ui \ --add-rpath ${lib.makeLibraryPath [ fontconfig libGL ]} ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-unused-features/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-unused-features/default.nix index 32fae29d90..cf1fd1deb3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-unused-features/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-unused-features/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { curl libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix index f2aa809208..b98d1dd513 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { installShellFiles pkg-config ronn - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { libssh2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix index 96822b3078..69c5d69d2c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # the test_project tests require internet access checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 69c04b520b..1033476eb9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-skUG1B6TCFEXeQSRwA6vWjXmNifk5bTR4+JESw7CZMo="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix index 11f1fc6aac..7bbc503fd1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; nativeBuildInputs = [ openssl perl pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; meta = with lib; { description = "Cargo subcommand for the client-side Web"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index 4e757c6402..42b3078f4e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Simple cargo plugin to get a list of features for a specific crate"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-workspaces/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-workspaces/default.nix index 32c4730b39..5e0b5483e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { libssh2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index f15e5bf6ff..3a6a509bda 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-AY5oq8fSF1IEvmbB5hRjo+Esz7EE9ZI4EKwtZIjbasA="; + hash = "sha256-O3Sg7wVNqTH8uhBSlVpmPNmFv+JC9/tw3G0LcOYUzKc="; }; - cargoHash = "sha256-StYEw5DvgxEojRcF0g88CTa58qUDjgNJiw6BCYKNzBY="; + cargoHash = "sha256-C0TpZZ/CJgNx0sB920/0yJW3iY4tPF6M70bveS1Ux24="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 95dacabcf5..ff4cfdf9ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-l4FgwXdibek4BAnqjWd1rLxpEwuMNjYgvo6X3SS3fRo="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = [ cmake @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { "--skip lib_default_uses_debug_build" "--skip lib_explicit_debug_build" "--skip lib_explicit_release_build" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # WORKAROUND: test_body fails when using clang # https://github.com/eqrion/cbindgen/issues/628 "--skip test_body" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix index 68632a1d60..b66b99b87b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-shllaNdg9g6fD8qRyCKpN47keFUTu0g96MzVX4BrhXI="; nativeBuildInputs = [ pkg-config cacert ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix index be536194d2..dfdb3e5e00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv ]; cargoHash = "sha256-bBqcHETEWooMgQeqPOZIK/77DdTtGq1JusBKoRj5K6w="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/humility/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/humility/default.nix index a8c157f9ac..5486d07852 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/humility/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/humility/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { version = "unstable-2023-11-08"; nativeBuildInputs = [ pkg-config cargo-readme ]; - buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix index 16d8176de4..3ca774d0d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 6326657372..7fd2aafb70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optional useMimalloc cmake; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix index d71b1e655d..f5dacb999a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix @@ -41,13 +41,13 @@ rustPlatform.buildRustPackage rec { --subst-var libPath ''; in - lib.optionals stdenv.isLinux [ patchelfPatch ]; + lib.optionals stdenv.hostPlatform.isLinux [ patchelfPatch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl xz - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index b59d9d08ef..5824696a43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -39,13 +39,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ (curl.override { inherit openssl; }) zlib - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv xz ]; buildFeatures = [ "no-self-update" ]; checkFeatures = [ "test" ]; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { # Random tests fail nondeterministically on macOS. # TODO: Investigate this. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # skip failing tests checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix index 09bc2e44f7..ce16743a07 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-WU3lgGJH6qVDI1Un3HBqg0edqiP5sobTsAIXdnjeNTU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index ca608dafd1..71f6b2b9dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -45,10 +45,10 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix b/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix index 562125acf0..6d3c5434e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - patchPhase = lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${lib.makeLibraryPath [zlib]}" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix b/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix index 3fc74d7e3c..925fc8d5b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }: let - jdk = openjdk.override (lib.optionalAttrs stdenv.isLinux { + jdk = openjdk.override (lib.optionalAttrs stdenv.hostPlatform.isLinux { enableJavaFX = true; openjfx = openjfx.override { withWebKit = true; }; }); @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { desktopItems = [ desktopItem ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications"; mainProgram = "scenic-view"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix index 98b52a55af..6e9df125e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix @@ -8,19 +8,19 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "0.12.15"; + version = "1.0.1"; src = fetchCrate { inherit pname version; - hash = "sha256-eRsWQXaE8zzECPY+xxVIwTylbuSPT6ABamI4WNVkw8M="; + hash = "sha256-b1Nlt3vsLDajTiIW9Vn51Tv9gXja8/ZZBD62iZjh3KY="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-sIyKkTO2DSLkRAlSUSRQYrZb8UtKZrszjn2jELNOSOU="; + cargoHash = "sha256-ZGM+Y67ycBiukgEBUq+WiA1OUCGahya591gM6CGwzMQ="; meta = with lib; { homepage = "https://www.sea-ql.org/SeaORM"; diff --git a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix index 0d836fe7a2..bcd1409b99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals robloxSupport [ openssl - ] ++ lib.optionals (robloxSupport && stdenv.isDarwin) [ + ] ++ lib.optionals (robloxSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/semantic-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/semantic-release/default.nix index 95f92919d1..da97f7e61b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/semantic-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/semantic-release/default.nix @@ -23,7 +23,7 @@ buildNpmPackage rec { nativeBuildInputs = [ python3 - ] ++ lib.optional stdenv.isDarwin cctools; + ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # Fixes `semantic-release --version` output postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index 2adcaf4dc4..52e7927bb1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; cargoHash = "sha256-fzQfU3xlRwV/GI69+sd7zz4okbNHbFAskJPgI1X0KQo="; diff --git a/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix b/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix index deab8539ef..e50986dd65 100644 --- a/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix @@ -31,12 +31,12 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ which pkg-config avrgcc ] - ++ lib.optional stdenv.isDarwin setupHookDarwin; + ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin; buildInputs = [ libelf libglut libGLU libGL ] - ++ lib.optional stdenv.isDarwin GLUT; + ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index 082abb488c..facfb6e7c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' runHook preBuild @@ -49,7 +49,7 @@ buildGoModule rec { runHook preInstall PREFIX=${placeholder "out"} make install-binary install-completions install-docs install ${passthru.policy}/default-policy.json -Dt $out/etc/containers - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} '' + '' diff --git a/third_party/nixpkgs/pkgs/development/tools/spr/default.nix b/third_party/nixpkgs/pkgs/development/tools/spr/default.nix index 7ecd5dcfb2..d7a9b4530c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spr/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Submit pull requests for individual, amendable, rebaseable commits to GitHub"; diff --git a/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix b/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix index ec071f739e..e7b0342ac6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { preConfigure = '' export SYBASE=${freetds} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace "libct.so" "libct.dylib" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix b/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix index 5270523caf..2190401c00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix @@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libiconv openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); diff --git a/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix index e239483e4a..73907cac37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { # Needed by wabt-sys nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/taplo/default.nix b/third_party/nixpkgs/pkgs/development/tools/taplo/default.nix index 77774a0d9a..d353127070 100644 --- a/third_party/nixpkgs/pkgs/development/tools/taplo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/taplo/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/tarmac/default.nix b/third_party/nixpkgs/pkgs/development/tools/tarmac/default.nix index 34471106d7..a2b03fa93c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tarmac/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tarmac/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/teller/default.nix b/third_party/nixpkgs/pkgs/development/tools/teller/default.nix index 16e44c4637..21eb39d655 100644 --- a/third_party/nixpkgs/pkgs/development/tools/teller/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/teller/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix index 5505533858..2101512886 100644 --- a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix index 17cf053b98..9845c56519 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ CoreServices SystemConfiguration ] else [ openssl ]; # requires network diff --git a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix index c2c599f32f..e9bc3c11bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Cdup65w31wF1RZu0g4/msHfLESrNTcuCU5kxkk0gnW8="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index 465fbcfa8c..defdf1ed92 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.22.0"; + version = "5.22.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-6VGxfbo/44iOuG5VG1uevgeRrgP0ThyrNts1iR5VLCk="; + hash = "sha256-PxAc9sC44HBcm3Zv5dsN35cTZWfSYP0F46PFZ48xhrw="; }; buildInputs = [ nodejs-slim ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix index 84fe6d4359..893f476df6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.8.0"; + version = "3.9.1"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-TjuOsF4LFqQGx4j5j/Er97MNhVm72qlvGYZvA5vuXs8="; + sha256 = "sha256-ZNsViLT0sFnHeV3FvJFPQbJ99mgpD2rH+bZOOGPgIhA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix index 064f1cf6ba..6eb3ceca77 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive -, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux +, libguestfs, qemu, writeText, withLibvirt ? stdenv.hostPlatform.isLinux , openssl }: diff --git a/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix index 16282c7f7d..34c547a461 100644 --- a/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0jED0Ju7ojqDxfEjZKmWuCfGR830/gJF5p+QtcVajIY="; }; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; cargoHash = "sha256-rSZe/MrJlbB0oaAsKg38mEnS3pqe9Rk4/aoRuLlOUFc="; diff --git a/third_party/nixpkgs/pkgs/development/tools/volta/default.nix b/third_party/nixpkgs/pkgs/development/tools/volta/default.nix index 15c9c493b7..c49145e0a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/volta/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/volta/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; HOME = "$TMPDIR"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix index 8988424d77..de73c6b637 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix @@ -46,7 +46,7 @@ buildGoModule rec { go stdenv.cc nodejs - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ]; @@ -60,7 +60,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/wails \ --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.isLinux [ gtk3 webkitgtk ])}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ])}" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix index 305a4e666c..4b97848589 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security ++ [ zstd ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [ + zstd + ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix index 938fcba2da..3a6f256339 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { llvmPackages.llvm libxml2 libffi - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; cmakeFlags = [ "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DWASMEDGE_FORCE_DISABLE_LTO=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix b/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix index b60872dce6..aa915d89c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs "-DWATCHMAN_STATE_DIR=${stateDir}" "-DWATCHMAN_VERSION_OVERRIDE=${version}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { lz4 zstd libiconv - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cargoRoot = "watchman/cli"; diff --git a/third_party/nixpkgs/pkgs/development/tools/winhelpcgi/default.nix b/third_party/nixpkgs/pkgs/development/tools/winhelpcgi/default.nix index c2d4dd31bf..51383b5b79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/winhelpcgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/winhelpcgi/default.nix @@ -19,6 +19,6 @@ license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.shlevy ]; platforms = lib.platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix index fd7c1e3786..cc48ae31d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; buildAndTestSubdir = "worker-build"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler_1/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler_1/default.nix index 7fc33c2dda..570092b7ee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler_1/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler_1/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreFoundation CoreServices Security libiconv ]; OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix b/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix index ad31bcad0d..7a5d7a9332 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix @@ -37,21 +37,21 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ shared-mime-info ]; buildInputs = [ boost wxGTK32 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/wxFormBuilder.app $out/Applications makeWrapper $out/Applications/wxFormBuilder.app/Contents/MacOS/wxFormBuilder $out/bin/wxformbuilder diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix index 8dc527c0e1..e30700ca20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Fix build on gcc-13 due to missing includes sed -e '1i #include ' -i \ Libraries/libutil/Headers/libutil/Permissions.h \ @@ -48,7 +48,7 @@ in stdenv.mkDerivation { # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include ' \ -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Apple Open Sourced LZFSE, but not libcompression, and it isn't # part of an impure framework we can add substituteInPlace Libraries/libcar/Sources/Rendition.cpp \ @@ -68,7 +68,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ zlib libxml2 libpng ] - ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices CoreGraphics ImageIO ]; meta = with lib; { description = "Xcode-compatible build tool"; diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/platforms.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/platforms.nix index 0108ac8ef6..333e5471b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/platforms.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/platforms.nix @@ -48,7 +48,7 @@ let ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; } { - Identifier = if stdenv.isAarch64 then "arm64" else "x86_64"; + Identifier = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; Type = "Architecture"; Name = "Apple Silicon or Intel 64-bit"; } diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix index a5e8ed28ce..2da12ba7cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix @@ -59,7 +59,7 @@ runCommand "Toolchains" {} ('' ln -s ${buildPackages.gperf}/bin/gperf $toolchain/bin/gperf ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags -'' + optionalString stdenv.isDarwin '' +'' + optionalString stdenv.hostPlatform.isDarwin '' for bin in ${getBin buildPackages.cctools}/bin/*; do if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then ln -s $bin $toolchain/bin diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix index 79f3143ef3..0f0e7c7f81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-bkhPdnRImeYBd0yY+iRYXk1KELyCWZusSmVGl2tbM+s="; + hash = "sha256-OTCFUoEgj1kY8QSqaYIqtSoWBYR0i0ao2dNRBhijEzc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix index 8adf786836..a567ce7f47 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zed"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bafX3i6jEMqYB4YCpIX4z4SgQbJjryGmZ6pvqtVrk3A="; + sha256 = "sha256-NCoeTeOkxkCsj/nRBhMJeEshFuwozOXNJvgp8vyCQDk="; }; - vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; + vendorHash = "sha256-E9CXS3BQAglJV36BPgwhkb9SswxAj/yBcGqJ+XXwTmE="; subPackages = [ "cmd/zed" "cmd/zq" ]; diff --git a/third_party/nixpkgs/pkgs/development/web/boa/default.nix b/third_party/nixpkgs/pkgs/development/web/boa/default.nix index 122e0df08a..9f695ff7d7 100644 --- a/third_party/nixpkgs/pkgs/development/web/boa/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/boa/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index 66f0bd7a64..6e187aa3fe 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.27"; + version = "1.1.29"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); strictDeps = true; - nativeBuildInputs = [ unzip installShellFiles ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ unzip installShellFiles ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ openssl ]; dontConfigure = true; @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-I/axYOXXLU5V+82jfNwsmhjwGOMkK+e5Sx7pKqQlvBE="; + hash = "sha256-RSMuealmdHe7qGFwhK9e51TED3PaCwSqzd4aj2RKMxE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-LvIjCWx7fd0EOLEY9qy26SS5/5ztAvEPKdv8mUG+TCA="; + hash = "sha256-gY+MDJqDjQamxQsk/CJJVuHsBAfwgrebs/h6nI0HV78="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-/YgDnB8m0ZhkKpqPvFL8Hd6IBitySD+jMOJCn/7xxG8="; + hash = "sha256-j5jpgofGcfjto/3CtBsC4QV411lUGdk2wHwLGmLduo4="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-Ir0EQH+bnHPwOTakrO/ZQ6pyeOWvhu5bK5j+YLN8Myc="; + hash = "sha256-RnKczYB/IkUYVBnRktCFhHsmvObQovVMfCilqJq3q1g="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index eebb68cc3f..856b31af15 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -12,6 +12,7 @@ , unzip , wrapGAppsHook3 , xorg +, darwin }: let @@ -24,6 +25,10 @@ let platform = "linux-arm64"; checksum = "sha256-rB0ak6jYnJMb0aHDLAyhaGoOFK4FXDLEOeofNdW/Wk8="; }; + aarch64-darwin = { + platform = "darwin-arm64"; + checksum = "sha256-L2rhtB/DIK7Qum2YNoWVBn4mf+DA3rbcBUfZEEa/C8c="; + }; }; inherit (stdenv.hostPlatform) system; binary = availableBinaries.${system} or (throw "cypress: No binaries available for system ${system}"); @@ -35,27 +40,37 @@ in stdenv.mkDerivation rec { src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; sha256 = checksum; + stripRoot = !stdenv.isDarwin; }; # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) unzip makeShellWrapper]; + nativeBuildInputs = [ unzip makeShellWrapper ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; - buildInputs = with xorg; [ + buildInputs = lib.optionals stdenv.isLinux (with xorg; [ libXScrnSaver libXdamage libXtst libxshmfence - ] ++ [ nss gtk2 alsa-lib gtk3 mesa # for libgbm - ]; + ]) ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + CoreServices + CoreMedia + CoreAudio + AudioToolbox + AVFoundation + Foundation + ApplicationServices + ]); - runtimeDependencies = [ (lib.getLib udev) ]; + runtimeDependencies = lib.optional stdenv.isLinux (lib.getLib udev); installPhase = '' runHook preInstall @@ -68,11 +83,15 @@ in stdenv.mkDerivation rec { printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json # Cypress now looks for binary_state.json in bin echo '{"verified": true}' > $out/binary_state.json - ln -s $out/opt/cypress/Cypress $out/bin/cypress + ${if stdenv.isDarwin then '' + ln -s $out/opt/cypress/Cypress.app/Contents/MacOS/Cypress $out/bin/cypress + '' else '' + ln -s $out/opt/cypress/Cypress $out/bin/cypress + ''} runHook postInstall ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' # exit with 1 after 25.05 makeWrapper $out/opt/cypress/Cypress $out/bin/Cypress \ --run 'echo "Warning: Use the lowercase cypress executable instead of the capitalized one."' diff --git a/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix b/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix index 7a51944a4f..891c4ca303 100644 --- a/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]); # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 90351bc317..2fba60c535 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.1"; + version = "0.3.6"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-5P6B52ekrAupoQh2K3LhC4ydwuKOTPfpjOVlGiDxQb0="; + hash = "sha256-Wj9omHywqXYEaap4w4C6wtwRs0QyKx4kp+QAkmK07fE="; }; - vendorHash = "sha256-QfequNmKLbZqMKcwhRXKaTflQYWKu8ucjaGcBM7Jn6g="; + vendorHash = "sha256-Z9qbrFctUv6F8374qyJ7Fw4HU/7BIhEfHfrwoFUXM4Q="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index 9317dbe8f4..2e886e195c 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -6,16 +6,16 @@ }: let pname = "insomnia"; - version = "9.0.0"; + version = "10.0.0"; src = fetchurl { x86_64-darwin = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-QIArPdThQcNTUgrXpWP8JHaZfrZ/6ztekIvzFdoWjsY="; + hash = "sha256-HYEZzLDV2T4ugCjIeskS5SkrQlu5nQt1S0RG9R/rlcs="; }; x86_64-linux = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; - hash = "sha256-2UiqopYmNxnDcIqQMn/H89ugvOtTWkHH4LrmKkQErSs="; + hash = "sha256-hElisKB1C1By8lCCgNqNr6bIOMKqMG3UyBQ6jYu8yNg="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -29,7 +29,7 @@ let maintainers = with maintainers; [ markus1189 kashw2 DataHearth ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation { +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix b/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix index 84bfc654c7..7732ce9f48 100644 --- a/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libbsd ] ; + buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libbsd ] ; dontAddPrefix = true; installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://kristaps.bsd.lv/kcgi"; description = "Minimal CGI and FastCGI library for C/C++"; license = licenses.isc; diff --git a/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix b/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix index 2e54104d7d..4bd736ddc7 100644 --- a/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix +++ b/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/third_party/nixpkgs/pkgs/development/web/netlify-cli/node-env.nix b/third_party/nixpkgs/pkgs/development/web/netlify-cli/node-env.nix index bc1e36628a..eb94495aeb 100644 --- a/third_party/nixpkgs/pkgs/development/web/netlify-cli/node-env.nix +++ b/third_party/nixpkgs/pkgs/development/web/netlify-cli/node-env.nix @@ -499,8 +499,8 @@ let stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -591,8 +591,8 @@ let name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -662,7 +662,7 @@ let stdenv.mkDerivation ({ name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <= 50 then "dwarfort" else "libs/Dwarf_Fortress" else "dwarfort.exe"; @@ -86,8 +86,8 @@ stdenv.mkDerivation { postUnpack = '' directory=${ - if stdenv.isLinux then "df_linux" - else if stdenv.isDarwin then "df_osx" + if stdenv.hostPlatform.isLinux then "df_linux" + else if stdenv.hostPlatform.isDarwin then "df_osx" else throw "Unsupported system" } if [ -d "$directory" ]; then @@ -95,7 +95,7 @@ stdenv.mkDerivation { fi ''; - nativeBuildInputs = optional stdenv.isLinux autoPatchelfHook; + nativeBuildInputs = optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ] ++ optional (!isAtLeast50) SDL ++ optional enableUnfuck dwarf-fortress-unfuck @@ -124,7 +124,7 @@ stdenv.mkDerivation { # Store the original hash md5sum $exe | awk '{ print $1 }' > $out/hash.md5.orig echo "Original MD5: $(<$out/hash.md5.orig)" >&2 - '' + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.hostPlatform.isDarwin '' # My custom unfucked dwarfort.exe for macOS. Can't use # absolute paths because original doesn't have enough # header space. Someone plz break into Tarn's house & put diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix index c94a46f04d..eef830965e 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -9,7 +9,7 @@ # This package should, at any given time, provide an opinionated "optimal" # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and # should contain every utility available unless you disable them. -, enableDFHack ? stdenvNoCC.isLinux +, enableDFHack ? stdenvNoCC.hostPlatform.isLinux , enableTWBT ? enableDFHack , enableSoundSense ? true , enableStoneSense ? true diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix index daa27ce5dc..268a5c1f5d 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/soundsense ''; - doInstallCheck = stdenv.isLinux; - nativeInstallCheckInputs = lib.optionals stdenv.isLinux [ expect xvfb-run ]; + doInstallCheck = stdenv.hostPlatform.isLinux; + nativeInstallCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ expect xvfb-run ]; installCheckPhase = let commonExpectStatements = fmod: lib.optionalString isAtLeast50 '' diff --git a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix index 8bbbc53a0d..77ccc9a929 100644 --- a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix +++ b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix @@ -25,16 +25,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; # ECWolf installs its binary to the games/ directory, but Nix only adds bin/ # directories to the PATH. - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mv "$out/games" "$out/bin" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} cp -R ecwolf.app $out/Applications makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf diff --git a/third_party/nixpkgs/pkgs/games/eduke32/default.nix b/third_party/nixpkgs/pkgs/games/eduke32/default.nix index 740d0bc47e..c213a6317b 100644 --- a/third_party/nixpkgs/pkgs/games/eduke32/default.nix +++ b/third_party/nixpkgs/pkgs/games/eduke32/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation (finalAttrs: { libvpx SDL2 SDL2_mixer - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk2 libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AGL Cocoa GLUT @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { --replace-fail '#include ' '#include ' \ --replace-fail '#include ' '#include ' \ --replace-fail '#include ' '#include ' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for f in glad.c glad_wgl.c ; do substituteInPlace source/glad/src/$f \ --replace-fail libGL.so ${libGL}/lib/libGL.so @@ -117,7 +117,7 @@ in stdenv.mkDerivation (finalAttrs: { runHook preInstall install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \ --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ --add-flags '-g "$EDUKE32_DATA_DIR/DUKE3D.GRP"' @@ -127,7 +127,7 @@ in stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/icons/hicolor/scalable/apps gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/EDuke32.app/Contents/MacOS mkdir -p $out/Applications/Mapster32.app/Contents/MacOS mkdir -p $out/Applications/VoidSW.app/Contents/MacOS diff --git a/third_party/nixpkgs/pkgs/games/ferium/default.nix b/third_party/nixpkgs/pkgs/games/ferium/default.nix index 294421527d..08710c4221 100644 --- a/third_party/nixpkgs/pkgs/games/ferium/default.nix +++ b/third_party/nixpkgs/pkgs/games/ferium/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoHash = "sha256-yBi6zyljkYEIUvSH4nXMw8fjPnt4kjqiuZ/QLT5IbqQ="; diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix index 0d6ba0b24e..c505970c96 100644 --- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix @@ -7,19 +7,19 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-RzMSHcyDsdZYTJYU53DjoCrCpy5gjgrtZb8NuP5trPk="; + hash = "sha256-FSfA2gjJZWAbl2nTJwkAhWcJghbw5ulftU+6QBqljxY="; }; nativeBuildInputs = [ imagemagick ]; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "FHEROES2_STRICT_COMPILATION=1" diff --git a/third_party/nixpkgs/pkgs/games/flare/engine.nix b/third_party/nixpkgs/pkgs/games/flare/engine.nix index a1f8761815..b404e8ecfc 100644 --- a/third_party/nixpkgs/pkgs/games/flare/engine.nix +++ b/third_party/nixpkgs/pkgs/games/flare/engine.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; diff --git a/third_party/nixpkgs/pkgs/games/freeciv/default.nix b/third_party/nixpkgs/pkgs/games/freeciv/default.nix index 47dfb08405..1a0cb892dc 100644 --- a/third_party/nixpkgs/pkgs/games/freeciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeciv/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pierron ]; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin - broken = qtClient && stdenv.isDarwin; # Missing Qt5 development files + broken = qtClient && stdenv.hostPlatform.isDarwin; # Missing Qt5 development files }; } diff --git a/third_party/nixpkgs/pkgs/games/freedroid/default.nix b/third_party/nixpkgs/pkgs/games/freedroid/default.nix index a3aba73131..130b02997b 100644 --- a/third_party/nixpkgs/pkgs/games/freedroid/default.nix +++ b/third_party/nixpkgs/pkgs/games/freedroid/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ iblech ]; platforms = platforms.unix; # Builds but fails to render to the screen at runtime. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix b/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix index b41b91855e..8c9b3e0cbf 100644 --- a/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix +++ b/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { buildInputs = [ glew SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib - ] ++ lib.optional stdenv.isDarwin libiconv; + ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/games/freenukum/default.nix b/third_party/nixpkgs/pkgs/games/freenukum/default.nix index af202ffd52..e0f9077381 100644 --- a/third_party/nixpkgs/pkgs/games/freenukum/default.nix +++ b/third_party/nixpkgs/pkgs/games/freenukum/default.nix @@ -69,6 +69,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://salsa.debian.org/silwol/freenukum/-/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Plus; maintainers = with maintainers; [ _0x4A6F ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/gargoyle/default.nix b/third_party/nixpkgs/pkgs/games/gargoyle/default.nix index 35b8dc7330..d7863361b8 100644 --- a/third_party/nixpkgs/pkgs/games/gargoyle/default.nix +++ b/third_party/nixpkgs/pkgs/games/gargoyle/default.nix @@ -5,7 +5,7 @@ let jamenv = '' unset AR - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev SDL}/include/SDL" export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" '' else '' @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; }; - nativeBuildInputs = [ jam pkg-config ] ++ lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ jam pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] - ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ smpeg libvorbis ]; # Workaround build failure on -fno-common toolchains: # ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then (substituteAll { inherit (stdenv) shell; isExecutable = true; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://ccxvii.net/gargoyle/"; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/third_party/nixpkgs/pkgs/games/gemrb/default.nix b/third_party/nixpkgs/pkgs/games/gemrb/default.nix index 5906fb6f1c..85ea295430 100644 --- a/third_party/nixpkgs/pkgs/games/gemrb/default.nix +++ b/third_party/nixpkgs/pkgs/games/gemrb/default.nix @@ -20,7 +20,7 @@ let backend = if stdenv.hostPlatform.isx86 then "OpenGL" else "GLES"; - withVLC = stdenv.isDarwin; + withVLC = stdenv.hostPlatform.isDarwin; inherit (lib) optional optionalString; diff --git a/third_party/nixpkgs/pkgs/games/gmad/default.nix b/third_party/nixpkgs/pkgs/games/gmad/default.nix index 97538679ee..7996098561 100644 --- a/third_party/nixpkgs/pkgs/games/gmad/default.nix +++ b/third_party/nixpkgs/pkgs/games/gmad/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ premake4 bootil ]; targetName = - if stdenv.isLinux then "gmad_linux" - else if stdenv.isDarwin then "gmad_osx" + if stdenv.hostPlatform.isLinux then "gmad_linux" + else if stdenv.hostPlatform.isDarwin then "gmad_osx" else "gmad"; premakeFlags = [ "--bootil_lib=${bootil}/lib" "--bootil_inc=${bootil}/include" ]; diff --git a/third_party/nixpkgs/pkgs/games/gogdl/default.nix b/third_party/nixpkgs/pkgs/games/gogdl/default.nix index dacf8a2f9f..0f96f0e4e3 100644 --- a/third_party/nixpkgs/pkgs/games/gogdl/default.nix +++ b/third_party/nixpkgs/pkgs/games/gogdl/default.nix @@ -10,14 +10,14 @@ buildPythonApplication rec { pname = "gogdl"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "heroic-gogdl"; - rev = "b1d9792f4b6c60382a88f09d03d6ed63afcc0310"; - hash = "sha256-/J50pRbc3iua86HES/3RUIeamz/abh8wo0c/yegC4cM="; + rev = "1ff09820915f855ea764c6e49ea2def63e86b3bb"; + hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0="; }; disabled = pythonOlder "3.8"; diff --git a/third_party/nixpkgs/pkgs/games/gtypist/default.nix b/third_party/nixpkgs/pkgs/games/gtypist/default.nix index 169b0fa77d..4d9fe630ca 100644 --- a/third_party/nixpkgs/pkgs/games/gtypist/default.nix +++ b/third_party/nixpkgs/pkgs/games/gtypist/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ncurses perl fortune ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; preFixup = '' wrapProgram "$out/bin/typefortune" \ diff --git a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix index 351dd15c41..389beb7b51 100644 --- a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/games/heroic/default.nix b/third_party/nixpkgs/pkgs/games/heroic/default.nix index 4a4e2abd66..a9c85e26b5 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/default.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/default.nix @@ -1,26 +1,28 @@ -{ lib -, stdenv -, fetchFromGitHub -, pnpm -, nodejs -, makeWrapper -, electron -, vulkan-helper -, gogdl -, legendary-gl -, nile -, comet-gog +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + pnpm, + nodejs, + makeWrapper, + electron, + vulkan-helper, + gogdl, + legendary-gl, + nile, + comet-gog, }: stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; - version = "2.15.1"; + version = "2.15.2"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-+OQRcBOf9Y34DD7FOp/3SO05mREG6or/HPiOkasHWPM="; + hash = "sha256-AndJqk1VAUdC4pOTRzyfhdxmzJMskGF6pUiqPs3fIy4="; }; pnpmDeps = pnpm.fetchDeps { @@ -93,6 +95,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + inherit (finalAttrs) pnpmDeps; + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac"; homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; diff --git a/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix b/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix index 54732d0e87..4fe9429193 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix @@ -1,7 +1,8 @@ -{ buildFHSEnv -, heroic-unwrapped -, extraPkgs ? pkgs: [ ] -, extraLibraries ? pkgs: [ ] +{ + buildFHSEnv, + heroic-unwrapped, + extraPkgs ? pkgs: [ ], + extraLibraries ? pkgs: [ ], }: buildFHSEnv { @@ -15,120 +16,131 @@ buildFHSEnv { # required by Electron unshareIpc = false; - targetPkgs = pkgs: with pkgs; [ - heroic-unwrapped - gamemode - curl - gawk - zenity - plasma5Packages.kdialog - mangohud - nettools - opencl-headers - p7zip - perl - psmisc - python3 - unzip - which - xorg.xrandr - zstd - ] ++ extraPkgs pkgs; + targetPkgs = + pkgs: + with pkgs; + [ + heroic-unwrapped + gamemode + curl + gawk + zenity + plasma5Packages.kdialog + mangohud + nettools + opencl-headers + p7zip + perl + psmisc + python3 + unzip + which + xorg.xrandr + zstd + ] + ++ extraPkgs pkgs; - multiPkgs = let - xorgDeps = pkgs: with pkgs.xorg; [ - libpthreadstubs - libSM - libX11 - libXaw - libxcb - libXcomposite - libXcursor - libXdmcp - libXext - libXi - libXinerama - libXmu - libXrandr - libXrender - libXv - libXxf86vm - ]; - gstreamerDeps = pkgs: with pkgs.gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ]; - in pkgs: with pkgs; [ - alsa-lib - alsa-plugins - bash - cabextract - cairo - coreutils - cups - dbus - freealut - freetype - fribidi - giflib - glib - gnutls - gtk3 - icu - lcms2 - libevdev - libgcrypt - libGLU - libglvnd - libgpg-error - libgudev - libjpeg - libkrb5 - libmpeg2 - libogg - libopus - libpng - libpulseaudio - libselinux - libsndfile - libsoup - libtheora - libtiff - libunwind - libusb1 - libv4l - libva - libvdpau - libvorbis - libvpx - libwebp - libxkbcommon - libxml2 - mpg123 - ncurses - ocl-icd - openal - openldap - openssl - pango - pipewire - samba4 - sane-backends - SDL2 - speex - sqlite - udev - unixODBC - util-linux - v4l-utils - vulkan-loader - wayland - zlib - ] ++ xorgDeps pkgs + multiPkgs = + let + xorgDeps = + pkgs: with pkgs.xorg; [ + libpthreadstubs + libSM + libX11 + libXaw + libxcb + libXcomposite + libXcursor + libXdmcp + libXext + libXi + libXinerama + libXmu + libXrandr + libXrender + libXv + libXxf86vm + ]; + gstreamerDeps = + pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; + in + pkgs: + with pkgs; + [ + alsa-lib + alsa-plugins + bash + cabextract + cairo + coreutils + cups + dbus + freealut + freetype + fribidi + giflib + glib + gnutls + gtk3 + icu + lcms2 + libevdev + libgcrypt + libGLU + libglvnd + libgpg-error + libgudev + libjpeg + libkrb5 + libmpeg2 + libogg + libopus + libpng + libpulseaudio + libselinux + libsndfile + libsoup + libtheora + libtiff + libunwind + libusb1 + libv4l + libva + libvdpau + libvorbis + libvpx + libwebp + libxkbcommon + libxml2 + mpg123 + ncurses + ocl-icd + openal + openldap + openssl + pango + pipewire + samba4 + sane-backends + SDL2 + speex + sqlite + udev + unixODBC + util-linux + v4l-utils + vulkan-loader + wayland + zlib + ] + ++ xorgDeps pkgs ++ gstreamerDeps pkgs ++ extraLibraries pkgs; diff --git a/third_party/nixpkgs/pkgs/games/hheretic/default.nix b/third_party/nixpkgs/pkgs/games/hheretic/default.nix index 6e4be6bd54..83b0ccb620 100644 --- a/third_party/nixpkgs/pkgs/games/hheretic/default.nix +++ b/third_party/nixpkgs/pkgs/games/hheretic/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "hheretic-gl"; maintainers = with lib.maintainers; [ moody ]; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/games/hhexen/default.nix b/third_party/nixpkgs/pkgs/games/hhexen/default.nix index 0e5345e85a..c73040a30f 100644 --- a/third_party/nixpkgs/pkgs/games/hhexen/default.nix +++ b/third_party/nixpkgs/pkgs/games/hhexen/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ moody djanatyn ]; mainProgram = "hhexen-gl"; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/games/hmcl/default.nix b/third_party/nixpkgs/pkgs/games/hmcl/default.nix index 69b5461834..7a330c3992 100644 --- a/third_party/nixpkgs/pkgs/games/hmcl/default.nix +++ b/third_party/nixpkgs/pkgs/games/hmcl/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { glib openal libglvnd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXxf86vm xorg.libXext diff --git a/third_party/nixpkgs/pkgs/games/ja2-stracciatella/default.nix b/third_party/nixpkgs/pkgs/games/ja2-stracciatella/default.nix index ea363c9694..9ad6e31054 100644 --- a/third_party/nixpkgs/pkgs/games/ja2-stracciatella/default.nix +++ b/third_party/nixpkgs/pkgs/games/ja2-stracciatella/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { inherit src version; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; patches = [ ./remove-rust-buildstep.patch diff --git a/third_party/nixpkgs/pkgs/games/jfsw/default.nix b/third_party/nixpkgs/pkgs/games/jfsw/default.nix index ed82964e4d..181b28e06c 100644 --- a/third_party/nixpkgs/pkgs/games/jfsw/default.nix +++ b/third_party/nixpkgs/pkgs/games/jfsw/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; mainProgram = "sw"; maintainers = with lib.maintainers; [ moody ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; inherit (SDL2.meta) platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/games/julius/default.nix b/third_party/nixpkgs/pkgs/games/julius/default.nix index 69f3c34a1f..f5f5bb6d1e 100644 --- a/third_party/nixpkgs/pkgs/games/julius/default.nix +++ b/third_party/nixpkgs/pkgs/games/julius/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool libicns imagemagick @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications cp -r julius.app $out/Applications/ diff --git a/third_party/nixpkgs/pkgs/games/jumpy/default.nix b/third_party/nixpkgs/pkgs/games/jumpy/default.nix index 23e130582a..7040aa4e34 100644 --- a/third_party/nixpkgs/pkgs/games/jumpy/default.nix +++ b/third_party/nixpkgs/pkgs/games/jumpy/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libxkbcommon udev @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/jumpy --chdir $out/share ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/.jumpy-wrapped \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; diff --git a/third_party/nixpkgs/pkgs/games/klavaro/default.nix b/third_party/nixpkgs/pkgs/games/klavaro/default.nix index 58dda8d23a..adaae799cb 100644 --- a/third_party/nixpkgs/pkgs/games/klavaro/default.nix +++ b/third_party/nixpkgs/pkgs/games/klavaro/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/third_party/nixpkgs/pkgs/games/ldmud/default.nix b/third_party/nixpkgs/pkgs/games/ldmud/default.nix index 83bbadfe7d..de92518781 100644 --- a/third_party/nixpkgs/pkgs/games/ldmud/default.nix +++ b/third_party/nixpkgs/pkgs/games/ldmud/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ lib.optional postgresSupport postgresql ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl ++ lib.optional pythonSupport python310 - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # To support systems without autoconf LD puts its configure.ac in a non-default # location and uses a helper script. We skip that script and symlink the .ac diff --git a/third_party/nixpkgs/pkgs/games/libremines/default.nix b/third_party/nixpkgs/pkgs/games/libremines/default.nix index f1a79e54bd..e639b98136 100644 --- a/third_party/nixpkgs/pkgs/games/libremines/default.nix +++ b/third_party/nixpkgs/pkgs/games/libremines/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtmultimedia - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/games/lincity/default.nix b/third_party/nixpkgs/pkgs/games/lincity/default.nix index 3f77d9bbe4..deb4f2eb02 100644 --- a/third_party/nixpkgs/pkgs/games/lincity/default.nix +++ b/third_party/nixpkgs/pkgs/games/lincity/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/lincity"; maintainers = [ ]; # ../lcintl.h:14:10: fatal error: 'libintl.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/liquidwar/5.nix b/third_party/nixpkgs/pkgs/games/liquidwar/5.nix index 9c61f97d1a..64ea76560f 100644 --- a/third_party/nixpkgs/pkgs/games/liquidwar/5.nix +++ b/third_party/nixpkgs/pkgs/games/liquidwar/5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ allegro ]; - configureFlags = lib.optional stdenv.isx86_64 "--disable-asm"; + configureFlags = lib.optional stdenv.hostPlatform.isx86_64 "--disable-asm"; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/games/manaplus/default.nix b/third_party/nixpkgs/pkgs/games/manaplus/default.nix index deb12d45ad..768a971d83 100644 --- a/third_party/nixpkgs/pkgs/games/manaplus/default.nix +++ b/third_party/nixpkgs/pkgs/games/manaplus/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Free OpenSource 2D MMORPG client"; homepage = "https://manaplus.org/"; license = lib.licenses.gpl2Plus; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/mchprs/default.nix b/third_party/nixpkgs/pkgs/games/mchprs/default.nix index 49ef836423..97fc84b5d9 100644 --- a/third_party/nixpkgs/pkgs/games/mchprs/default.nix +++ b/third_party/nixpkgs/pkgs/games/mchprs/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix index 789b2bca65..43001343b7 100644 --- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix +++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${jdk}/bin/java $out/bin/mindustry \ --add-flags "-jar $out/share/mindustry.jar" \ - ${lib.optionalString stdenv.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \ + ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \ --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/'' + lib.optionalString enableWayland '' \ --set SDL_VIDEODRIVER wayland \ @@ -240,6 +240,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ chkno fgaz thekostins ]; platforms = lib.platforms.all; # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin - broken = enableClient && stdenv.isDarwin; + broken = enableClient && stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/derivation.nix b/third_party/nixpkgs/pkgs/games/minecraft-servers/derivation.nix index a94a2daeca..c6f26d73eb 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-servers/derivation.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/derivation.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeWrapper ${lib.getExe jre_headless} $out/bin/minecraft-server \ --append-flags "-jar $out/lib/minecraft/server.jar nogui" \ - ${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} + ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index 3a49b5b90f..f4ccf5ac71 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -119,13 +119,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' patchShebangs $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/minetest.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/games/mudlet/default.nix b/third_party/nixpkgs/pkgs/games/mudlet/default.nix index 78a7eb901c..eef4560e38 100644 --- a/third_party/nixpkgs/pkgs/games/mudlet/default.nix +++ b/third_party/nixpkgs/pkgs/games/mudlet/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { qtmultimedia yajl discord-rpc - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ AppKit ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { cp -r ../translations $out/share/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r src/mudlet.app/ $out/Applications/mudlet.app mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsForQt5.qtkeychain discord-rpc ]}:$out/lib" \ --chdir "$out"; - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -pv $out/bin cp src/mudlet $out/bin/mudlet-unwrapped makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \ diff --git a/third_party/nixpkgs/pkgs/games/npush/default.nix b/third_party/nixpkgs/pkgs/games/npush/default.nix index 7a061a4bc6..e3d199c7fa 100644 --- a/third_party/nixpkgs/pkgs/games/npush/default.nix +++ b/third_party/nixpkgs/pkgs/games/npush/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://npush.sourceforge.net/"; description = "Sokoban-like game"; mainProgram = "npush"; diff --git a/third_party/nixpkgs/pkgs/games/opendungeons/default.nix b/third_party/nixpkgs/pkgs/games/opendungeons/default.nix index 3562aa8c6f..a66504fa1d 100644 --- a/third_party/nixpkgs/pkgs/games/opendungeons/default.nix +++ b/third_party/nixpkgs/pkgs/games/opendungeons/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ]; # source/utils/StackTraceUnix.cpp:122:2: error: #error Unsupported architecture. - postPatch = lib.optionalString (!stdenv.isx86_64) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' cp source/utils/StackTrace{Stub,Unix}.cpp ''; diff --git a/third_party/nixpkgs/pkgs/games/openmw/default.nix b/third_party/nixpkgs/pkgs/games/openmw/default.nix index edeed841c9..22bd90a348 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/default.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postPatch = '' sed '1i#include ' -i components/myguiplatform/myguidatamanager.cpp # gcc12 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Don't fix Darwin app bundle sed -i '/fixup_bundle/d' CMakeLists.txt ''; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; # If not set, OSG plugin .so files become shell scripts on Darwin. - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; buildInputs = [ SDL2 @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { recastnavigation unshield yaml-cpp - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreMedia VideoDecodeAcceleration VideoToolbox @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=${GL}" "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENMW_OSX_DEPLOYMENT=ON" ]; diff --git a/third_party/nixpkgs/pkgs/games/openrw/default.nix b/third_party/nixpkgs/pkgs/games/openrw/default.nix index 061d053e34..d2d86226af 100644 --- a/third_party/nixpkgs/pkgs/games/openrw/default.nix +++ b/third_party/nixpkgs/pkgs/games/openrw/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { buildInputs = [ sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg_6 - ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL Cocoa ]; meta = with lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; diff --git a/third_party/nixpkgs/pkgs/games/openspades/default.nix b/third_party/nixpkgs/pkgs/games/openspades/default.nix index ebab9a018f..fd070312b1 100644 --- a/third_party/nixpkgs/pkgs/games/openspades/default.nix +++ b/third_party/nixpkgs/pkgs/games/openspades/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ abbradar azahi ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix index d3dd268620..89ebe14cb4 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix @@ -43,7 +43,7 @@ let passthru.updateScript = ./update-bin.sh; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta passthru; diff --git a/third_party/nixpkgs/pkgs/games/papermc/derivation.nix b/third_party/nixpkgs/pkgs/games/papermc/derivation.nix index 5dd169dbc9..c7ad650d00 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/derivation.nix +++ b/third_party/nixpkgs/pkgs/games/papermc/derivation.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ --append-flags "-jar $out/share/papermc/papermc.jar nogui" \ - ${lib.optionalString stdenvNoCC.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} + ${lib.optionalString stdenvNoCC.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/games/path-of-building/default.nix b/third_party/nixpkgs/pkgs/games/path-of-building/default.nix index 0fcd79b4b9..622df7873b 100644 --- a/third_party/nixpkgs/pkgs/games/path-of-building/default.nix +++ b/third_party/nixpkgs/pkgs/games/path-of-building/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { qttools wrapQtAppsHook icoutils - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ qtbase @@ -126,6 +126,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = [ lib.maintainers.k900 ]; mainProgram = "pobfrontend"; - broken = stdenv.isDarwin; # doesn't find uic6 for some reason + broken = stdenv.hostPlatform.isDarwin; # doesn't find uic6 for some reason }; } diff --git a/third_party/nixpkgs/pkgs/games/powermanga/default.nix b/third_party/nixpkgs/pkgs/games/powermanga/default.nix index 3c89266370..eaa45460be 100644 --- a/third_party/nixpkgs/pkgs/games/powermanga/default.nix +++ b/third_party/nixpkgs/pkgs/games/powermanga/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix index 4135706c98..3c78d0e5f2 100644 --- a/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix +++ b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix @@ -25,13 +25,13 @@ let postPatch = '' substituteInPlace src/client/curl/qcurl.c \ --replace "\"libcurl.so.3\", \"libcurl.so.4\"" "\"${curl.out}/lib/libcurl.so\", \"libcurl.so.3\", \"libcurl.so.4\"" - '' + lib.optionalString (openalSupport && !stdenv.isDarwin) '' + '' + lib.optionalString (openalSupport && !stdenv.hostPlatform.isDarwin) '' substituteInPlace Makefile \ --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\"" ''; buildInputs = [ SDL2 libGL curl ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenAL ] ++ lib.optional openalSupport openal; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix index 6b3080c757..5b124cb464 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, SDL, SDL2, fetchurl, gzip, libvorbis, libmad, flac, libopus, opusfile, libogg, libxmp , Cocoa, CoreAudio, CoreFoundation, IOKit, OpenGL , copyDesktopItems, makeDesktopItem, pkg-config -, useSDL2 ? stdenv.isDarwin # TODO: CoreAudio fails to initialize with SDL 1.x for some reason. +, useSDL2 ? stdenv.hostPlatform.isDarwin # TODO: CoreAudio fails to initialize with SDL 1.x for some reason. }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}/Quake"; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Makes Darwin Makefile use system libraries instead of ones from app bundle ./quakespasm-darwin-makefile-improvements.patch ]; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { buildInputs = [ gzip libvorbis libmad flac libopus opusfile libogg libxmp (if useSDL2 then SDL2 else SDL) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreAudio IOKit OpenGL - ] ++ lib.optionals (stdenv.isDarwin && useSDL2) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && useSDL2) [ CoreFoundation ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "USE_SDL2=1" ]; - makefile = if (stdenv.isDarwin) then "Makefile.darwin" else "Makefile"; + makefile = if (stdenv.hostPlatform.isDarwin) then "Makefile.darwin" else "Makefile"; preInstall = '' mkdir -p "$out/bin" @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.darwin --replace "/usr/local/games" "$out/bin" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Let's build app bundle mkdir -p $out/Applications/Quake.app/Contents/MacOS mkdir -p $out/Applications/Quake.app/Contents/Resources diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix index 32428107d8..d4fdc41b4a 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix @@ -47,14 +47,14 @@ stdenv.mkDerivation rec { libvorbis opusfile vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moltenvk vulkan-headers ]; buildFlags = [ "DO_USERDIRS=1" ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ "-Wno-error=unused-but-set-variable" "-Wno-error=implicit-const-int-float-conversion" @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { cp vkquake "$out/bin" ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' patchelf $out/bin/vkquake \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; diff --git a/third_party/nixpkgs/pkgs/games/quantumminigolf/default.nix b/third_party/nixpkgs/pkgs/games/quantumminigolf/default.nix index c91fb8b28c..b7e8feae24 100644 --- a/third_party/nixpkgs/pkgs/games/quantumminigolf/default.nix +++ b/third_party/nixpkgs/pkgs/games/quantumminigolf/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/games/randtype/default.nix b/third_party/nixpkgs/pkgs/games/randtype/default.nix index f7e6ee06ce..ba5c40367e 100644 --- a/third_party/nixpkgs/pkgs/games/randtype/default.nix +++ b/third_party/nixpkgs/pkgs/games/randtype/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dandellion ]; license = licenses.gpl2Only; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/games/raylib-games/default.nix b/third_party/nixpkgs/pkgs/games/raylib-games/default.nix index 7a0d80a4c5..cad4424a30 100644 --- a/third_party/nixpkgs/pkgs/games/raylib-games/default.nix +++ b/third_party/nixpkgs/pkgs/games/raylib-games/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ raylib ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; configurePhase = '' runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix b/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix index cdd6eb0e57..f6c3249c72 100644 --- a/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix +++ b/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "1.0.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-rhG/EK68PWvQYoZdjhk0w7oNmh/QiTaAt4/WgEkgxEA="; + sha256 = "sha256-xNkM8qN9vg/WGRR/96aCQRVjIbSdSs2845l6oE6+tzg="; }; - cargoHash = "sha256-YXQohmDmkClziaLkL2N4cGURZ0tewyt7BuNY4hS+a4w="; + cargoHash = "sha256-AiNyyLEpVhNhDGq2vngna1ZJmPiI0rFT00gj7vXOW20="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix b/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix index 6bed4908f4..700003f640 100644 --- a/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix @@ -8,7 +8,6 @@ , gcc-unwrapped , glib , glibc -, gnome2 , gtk2-x11 , libGL , libpulseaudio diff --git a/third_party/nixpkgs/pkgs/games/scummvm/default.nix b/third_party/nixpkgs/pkgs/games/scummvm/default.nix index 2252146679..6c6fc7fac0 100644 --- a/third_party/nixpkgs/pkgs/games/scummvm/default.nix +++ b/third_party/nixpkgs/pkgs/games/scummvm/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libGLU libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis SDL2 zlib @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # They use 'install -s', that calls the native strip instead of the cross postConfigure = '' sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.mk \ --replace x86_64-apple-darwin-ranlib ${cctools}/bin/ranlib \ --replace aarch64-apple-darwin-ranlib ${cctools}/bin/ranlib diff --git a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix index 0f82433fad..866cc83942 100644 --- a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix +++ b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240909.53ceb98"; + version = "20240911.cd97968"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-BRbTm6dnogzkAVYZjQ8/YTEB4A8edNa2yymR3KlqAE4="; + hash = "sha256-l1QDe/PRQnaEBenR3NcSthtDzCcQ1ZOGz6RCserGfjs="; }; sgt-puzzles-menu = fetchurl { diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index 0de47544df..7b97a9af33 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,13 +5,13 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-G/g84Jl+jkmvxmQtCIPHsW9vHi3FPKt7A087SkVxNVE="; + hash = "sha256-/CxOiJaBiOgKEKVSX7qx2HjMLUgeE+lRyRn4nrAqzsg="; }; depsPath = ./deps.json; diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix index ec379dfef0..60a0b67232 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix @@ -4,13 +4,13 @@ callPackage ../generic.nix rec { pname = "experienced-pixel-dungeon"; - version = "2.18"; + version = "2.18.2"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Experienced-Pixel-Dungeon-Redone"; rev = "ExpPD-${version}"; - hash = "sha256-jOKHBd9LaDn3oqLdQWqAcJnicktlbkDGw00nT8JveoI="; + hash = "sha256-REBltg7rKgrNSKHh3QuG8XVLPivS1fAtyqf/TRjH0W0="; }; desktopName = "Experienced Pixel Dungeon"; diff --git a/third_party/nixpkgs/pkgs/games/shipwright/default.nix b/third_party/nixpkgs/pkgs/games/shipwright/default.nix index d214e6934b..2ff8c063f5 100644 --- a/third_party/nixpkgs/pkgs/games/shipwright/default.nix +++ b/third_party/nixpkgs/pkgs/games/shipwright/default.nix @@ -62,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: { python3 imagemagick makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release copyDesktopItems - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns darwin.sigtool ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_net libpng - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { libXext libpulseaudio zenity - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOSurface Metal QuartzCore @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-Wno-int-conversion -Wno-implicit-int"; + lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int"; dontAddPrefix = true; @@ -114,18 +114,18 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - preInstall = lib.optionalString stdenv.isLinux '' + preInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Cmake likes it here for its install paths cp ../OTRExporter/soh.otr .. - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp ../OTRExporter/soh.otr soh/soh.otr ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/bin ln -s $out/lib/soh.elf $out/bin/soh install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Recreate the macOS bundle (without using cpack) # We mirror the structure of the bundle distributed by the project @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos ''; - fixupPhase = lib.optionalString stdenv.isLinux '' + fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]} ''; diff --git a/third_party/nixpkgs/pkgs/games/simutrans/default.nix b/third_party/nixpkgs/pkgs/games/simutrans/default.nix index 6a48c5a2ca..b6452819be 100644 --- a/third_party/nixpkgs/pkgs/games/simutrans/default.nix +++ b/third_party/nixpkgs/pkgs/games/simutrans/default.nix @@ -121,8 +121,8 @@ let configurePhase = let # Configuration as per the readme.txt and config.template platform = - if stdenv.isLinux then "linux" else - if stdenv.isDarwin then "mac" else throw "add your platform"; + if stdenv.hostPlatform.isLinux then "linux" else + if stdenv.hostPlatform.isDarwin then "mac" else throw "add your platform"; config = '' BACKEND = mixer_sdl COLOUR_DEPTH = 16 diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix b/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix index fcdd6616a5..fd53b78042 100644 --- a/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix +++ b/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { makeFlags = [ "VERSION=${region}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "OSX_BUILD=1" ] ++ compileFlags; diff --git a/third_party/nixpkgs/pkgs/games/snipes/default.nix b/third_party/nixpkgs/pkgs/games/snipes/default.nix index f978a1b71d..7212d6d816 100644 --- a/third_party/nixpkgs/pkgs/games/snipes/default.nix +++ b/third_party/nixpkgs/pkgs/games/snipes/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation { homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. maintainers = with maintainers; [ peterhoeg cybershadow ]; - broken = stdenv.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046 + broken = stdenv.hostPlatform.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046 }; } diff --git a/third_party/nixpkgs/pkgs/games/space-cadet-pinball/default.nix b/third_party/nixpkgs/pkgs/games/space-cadet-pinball/default.nix index 53edf58605..0f3009e4ab 100644 --- a/third_party/nixpkgs/pkgs/games/space-cadet-pinball/default.nix +++ b/third_party/nixpkgs/pkgs/games/space-cadet-pinball/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_mixer - ] ++ lib.optional stdenv.isDarwin Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; # Darwin needs a custom installphase since it is excluded from the cmake install # https://github.com/k4zmu2a/SpaceCadetPinball/blob/0f88e43ba261bc21fa5c3ef9d44969a2a079d0de/CMakeLists.txt#L221 - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/bin install ../bin/SpaceCadetPinball $out/bin diff --git a/third_party/nixpkgs/pkgs/games/space-orbit/default.nix b/third_party/nixpkgs/pkgs/games/space-orbit/default.nix index 74db273bb8..c5bd6fdf77 100644 --- a/third_party/nixpkgs/pkgs/games/space-orbit/default.nix +++ b/third_party/nixpkgs/pkgs/games/space-orbit/default.nix @@ -38,7 +38,7 @@ EOF ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Space combat simulator"; mainProgram = "space-orbit"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index d9d16a98b3..2679866a52 100644 --- a/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -23,7 +23,7 @@ , gdk-pixbuf }: let - version = "0.28.1"; + version = "0.29.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -36,7 +36,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-5g/twJgQ7i6yQBYP7U6bn1UMU09WkJeolgCl+0pGT2Y="; + hash = "sha256-0HpHTZhGqCcSCCBk1d5923ALVCjozLn5fym4RH2Ov5Y="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 85f3bf1abf..6a4a1e0020 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -46,7 +46,7 @@ let sqlite ] ++ extraPkgs pkgs; - ldPath = lib.optionals stdenv.is64bit [ "/lib64" ] + ldPath = lib.optionals stdenv.hostPlatform.is64bit [ "/lib64" ] ++ [ "/lib32" ] ++ map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); @@ -299,7 +299,7 @@ in buildFHSEnv rec { '' + args.extraPreBwrapCmds or ""; extraBwrapArgs = [ - "--bind /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript + "--bind-try /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript "--bind-try /tmp/dumps /tmp/dumps" ] ++ args.extraBwrapArgs or []; diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/games/steam/steam.nix index 151a1ba5be..bbdb946a6b 100644 --- a/third_party/nixpkgs/pkgs/games/steam/steam.nix +++ b/third_party/nixpkgs/pkgs/games/steam/steam.nix @@ -1,22 +1,21 @@ { lib, stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }: -let - traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.74"; - -in stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "steam-original"; - inherit version; + version = "1.0.0.81"; src = fetchurl { # use archive url so the tarball doesn't 404 on a new release - url = "https://repo.steampowered.com/steam/archive/stable/steam_${version}.tar.gz"; - sha256 = "sha256-sO07g3j1Qejato2LWJ2FrW3AzfMCcBz46HEw7aKxojQ="; + url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz"; + hash = "sha256-Gia5182s4J4E3Ia1EeC5kjJX9mSltsr+b+1eRtEXtPk="; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - postInstall = '' + postInstall = + let + traceLog = "/tmp/steam-trace-dependencies.log"; + in '' rm $out/bin/steamdeps ${lib.optionalString traceDeps '' cat > $out/bin/steamdeps < $out/share/applications/steam.desktop ''; + passthru.updateScript = ./update-bootstrap.py; + meta = with lib; { description = "Digital distribution platform"; longDescription = '' @@ -51,4 +52,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ jagajaga ]; mainProgram = "steam"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/steam/update-bootstrap.py b/third_party/nixpkgs/pkgs/games/steam/update-bootstrap.py new file mode 100755 index 0000000000..7720a08f4f --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/steam/update-bootstrap.py @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure --keep NIX_PATH -i python3 -p git nix-update "python3.withPackages (ps: [ ps.beautifulsoup4 ps.requests ])" + +import sys +import re +import requests +import subprocess +from bs4 import BeautifulSoup + +VERSION_PATTERN = re.compile(r'^steam_(?P(\d+\.)+)tar.gz$') + +found_versions = [] +response = requests.get("https://repo.steampowered.com/steam/archive/stable/") +soup = BeautifulSoup (response.text, "html.parser") +for a in soup.find_all("a"): + href = a["href"] + if not href.endswith(".tar.gz"): + continue + + match = VERSION_PATTERN.match(href) + if match is not None: + version = match.groupdict()["ver"][0:-1] + found_versions.append(version) + +if len(found_versions) == 0: + print("Failed to find available versions!", file=sys.stderr) + sys.exit(1) + +found_versions.sort() +subprocess.run(["nix-update", "--version", found_versions[-1], "steamPackages.steam"]) +found_versions[0] diff --git a/third_party/nixpkgs/pkgs/games/stockfish/default.nix b/third_party/nixpkgs/pkgs/games/stockfish/default.nix index 456c36784d..b4531fc001 100644 --- a/third_party/nixpkgs/pkgs/games/stockfish/default.nix +++ b/third_party/nixpkgs/pkgs/games/stockfish/default.nix @@ -4,11 +4,11 @@ let # The x86-64-modern may need to be refined further in the future # but stdenv.hostPlatform CPU flags do not currently work on Darwin # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745 - archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "apple-silicon"; - arch = if stdenv.isDarwin then archDarwin else - if stdenv.isx86_64 then "x86-64" else - if stdenv.isi686 then "x86-32" else - if stdenv.isAarch64 then "armv8" else + archDarwin = if stdenv.hostPlatform.isx86_64 then "x86-64-modern" else "apple-silicon"; + arch = if stdenv.hostPlatform.isDarwin then archDarwin else + if stdenv.hostPlatform.isx86_64 then "x86-64" else + if stdenv.hostPlatform.isi686 then "x86-32" else + if stdenv.hostPlatform.isAarch64 then "armv8" else "unknown"; # These files can be found in src/evaluate.h diff --git a/third_party/nixpkgs/pkgs/games/system-syzygy/default.nix b/third_party/nixpkgs/pkgs/games/system-syzygy/default.nix index b478259a8a..d321284b74 100644 --- a/third_party/nixpkgs/pkgs/games/system-syzygy/default.nix +++ b/third_party/nixpkgs/pkgs/games/system-syzygy/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Story and a puzzle game, where you solve a variety of puzzle"; mainProgram = "syzygy"; homepage = "https://mdsteele.games/syzygy"; diff --git a/third_party/nixpkgs/pkgs/games/taisei/default.nix b/third_party/nixpkgs/pkgs/games/taisei/default.nix index cb87e48da3..ee5712f7b7 100644 --- a/third_party/nixpkgs/pkgs/games/taisei/default.nix +++ b/third_party/nixpkgs/pkgs/games/taisei/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Free and open-source Touhou Project clone and fangame"; mainProgram = "taisei"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix b/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix index 0d19a2c0f7..b3f1914bc1 100644 --- a/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix +++ b/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/games/teeworlds/default.nix b/third_party/nixpkgs/pkgs/games/teeworlds/default.nix index 505c61588e..b07dbc311a 100644 --- a/third_party/nixpkgs/pkgs/games/teeworlds/default.nix +++ b/third_party/nixpkgs/pkgs/games/teeworlds/default.nix @@ -51,19 +51,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals (buildClient && stdenv.isLinux) [ + ] ++ lib.optionals (buildClient && stdenv.hostPlatform.isLinux) [ icoutils ]; buildInputs = [ python3 lua5_3 zlib wavpack - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals buildClient ([ SDL2 freetype - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU alsa-lib libX11 @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { "-DCLIENT=${if buildClient then "ON" else "OFF"}" ]; - postInstall = lib.optionalString buildClient (lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString buildClient (lib.optionalString stdenv.hostPlatform.isLinux '' # Convert and install desktop icon mkdir -p $out/share/pixmaps icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico # Install menu item install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS" mkdir -p "$out/Applications/teeworlds.app/Contents/Resources" diff --git a/third_party/nixpkgs/pkgs/games/uhexen2/default.nix b/third_party/nixpkgs/pkgs/games/uhexen2/default.nix index 1d44b16c3a..a0922a1457 100644 --- a/third_party/nixpkgs/pkgs/games/uhexen2/default.nix +++ b/third_party/nixpkgs/pkgs/games/uhexen2/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Cross-platform port of Hexen II game"; longDescription = '' Hammer of Thyrion (uHexen2) is a cross-platform port of Raven Software's Hexen II source. diff --git a/third_party/nixpkgs/pkgs/games/vessel/default.nix b/third_party/nixpkgs/pkgs/games/vessel/default.nix index 42408cd042..ddbbf68bbc 100644 --- a/third_party/nixpkgs/pkgs/games/vessel/default.nix +++ b/third_party/nixpkgs/pkgs/games/vessel/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { directory where you saved it. ''; - src = if (stdenv.isi686) then + src = if (stdenv.hostPlatform.isi686) then requireFile { message = goBuyItNow; name = "vessel-${version}-bin"; diff --git a/third_party/nixpkgs/pkgs/games/voxelands/default.nix b/third_party/nixpkgs/pkgs/games/voxelands/default.nix index bac78ab72f..b1b30a7e76 100644 --- a/third_party/nixpkgs/pkgs/games/voxelands/default.nix +++ b/third_party/nixpkgs/pkgs/games/voxelands/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ ]; - broken = stdenv.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'" + broken = stdenv.hostPlatform.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'" }; } diff --git a/third_party/nixpkgs/pkgs/games/warsow/engine.nix b/third_party/nixpkgs/pkgs/games/warsow/engine.nix index 5bc2ef7dbd..71bf581f14 100644 --- a/third_party/nixpkgs/pkgs/games/warsow/engine.nix +++ b/third_party/nixpkgs/pkgs/games/warsow/engine.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix index 45b2123e44..81ab98e67b 100644 --- a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { freetype harfbuzz sqlite - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ vulkan-headers vulkan-loader ]; @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin". "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" - ] ++ lib.optional stdenv.isDarwin "-P../configure_mac.cmake"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-P../configure_mac.cmake"; postInstall = lib.optionalString withVideos '' cp ${sequences_src} $out/share/warzone2100/sequences.wz @@ -141,6 +141,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # configure_mac.cmake tries to download stuff # https://github.com/Warzone2100/warzone2100/blob/master/macosx/README.md - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix index 01dd8ceaca..5017216aec 100644 --- a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost libvorbis fribidi dbus libpng pcre openssl icu lua curl ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Foundation]; cmakeFlags = [ "-DENABLE_SYSTEM_LUA=ON" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; meta = with lib; { description = "Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; diff --git a/third_party/nixpkgs/pkgs/games/widelands/default.nix b/third_party/nixpkgs/pkgs/games/widelands/default.nix index 11e6db9c68..e34e23ab60 100644 --- a/third_party/nixpkgs/pkgs/games/widelands/default.nix +++ b/third_party/nixpkgs/pkgs/games/widelands/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Wno-dev" # dev warnings are only needed for upstream development - "-DCMAKE_BUILD_TYPE=Release" "-DWL_INSTALL_BASEDIR=${placeholder "out"}/share/widelands" # for COPYING, Changelog, etc. "-DWL_INSTALL_DATADIR=${placeholder "out"}/share/widelands" # for game data "-DWL_INSTALL_BINDIR=${placeholder "out"}/bin" @@ -73,12 +72,12 @@ stdenv.mkDerivation rec { libSM # XXX: these should be propagated by SDL2? libICE ] - ++ lib.optional stdenv.isLinux libXext - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optional stdenv.hostPlatform.isLinux libXext + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm444 -t $out/share/applications ../xdg/org.widelands.Widelands.desktop for s in 16 32 48 64 128; do diff --git a/third_party/nixpkgs/pkgs/games/zaz/default.nix b/third_party/nixpkgs/pkgs/games/zaz/default.nix index 3af6f069a5..dca1d74a43 100644 --- a/third_party/nixpkgs/pkgs/games/zaz/default.nix +++ b/third_party/nixpkgs/pkgs/games/zaz/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Puzzle game about arranging balls in triplets, like Luxor, Zuma, or Puzzle Bobble"; homepage = "https://zaz.sourceforge.net/"; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/kde/default.nix b/third_party/nixpkgs/pkgs/kde/default.nix index 8019e64ea5..ee011c3a7a 100644 --- a/third_party/nixpkgs/pkgs/kde/default.nix +++ b/third_party/nixpkgs/pkgs/kde/default.nix @@ -11,78 +11,90 @@ wayland-protocols, wayland, zxing-cpp, -}: let - allPackages = self: let - frameworks = import ./frameworks {inherit (self) callPackage;}; - gear = import ./gear {inherit (self) callPackage;}; - plasma = import ./plasma {inherit (self) callPackage;}; +}: +let + allPackages = + self: + let + frameworks = import ./frameworks { inherit (self) callPackage; }; + gear = import ./gear { inherit (self) callPackage; }; + plasma = import ./plasma { inherit (self) callPackage; }; - sets = ["gear" "frameworks" "plasma"]; + sets = [ + "gear" + "frameworks" + "plasma" + ]; - loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); - allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); + loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); + allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); - sources = lib.mapAttrs (_: v: - (fetchurl { - inherit (v) url hash; - }) - // {inherit (v) version;}) - allUrls; - in ( - qt6Packages - // frameworks - // gear - // plasma - // { - inherit sources; + sources = lib.mapAttrs ( + _: v: + (fetchurl { + inherit (v) url hash; + }) + // { + inherit (v) version; + } + ) allUrls; + in + ( + qt6Packages + // frameworks + // gear + // plasma + // { + inherit sources; - mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) {}; + mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { }; - # THIRD PARTY - inherit - cmark - gpgme - taglib - wayland - wayland-protocols - zxing-cpp - ; + # THIRD PARTY + inherit + cmark + gpgme + taglib + wayland + wayland-protocols + zxing-cpp + ; - # Alias to match metadata - kquickimageeditor = self.kquickimageedit; + # Alias to match metadata + kquickimageeditor = self.kquickimageedit; - # Alias because it's just data - plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; + # Alias because it's just data + plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; - selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub + selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub - alpaka = self.callPackage ./misc/alpaka {}; - kdiagram = self.callPackage ./misc/kdiagram {}; - kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {}; - kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; - kirigami-addons = self.callPackage ./misc/kirigami-addons {}; - kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {}; - kio-fuse = self.callPackage ./misc/kio-fuse {}; - klevernotes = self.callPackage ./misc/klevernotes {}; - ktextaddons = self.callPackage ./misc/ktextaddons {}; - kunifiedpush = self.callPackage ./misc/kunifiedpush {}; - kup = self.callPackage ./misc/kup {}; - marknote = self.callPackage ./misc/marknote {}; - mpvqt = self.callPackage ./misc/mpvqt {}; - oxygen-icons = self.callPackage ./misc/oxygen-icons {}; - phonon = self.callPackage ./misc/phonon {}; - phonon-vlc = self.callPackage ./misc/phonon-vlc {}; - polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; - pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + alpaka = self.callPackage ./misc/alpaka { }; + kdiagram = self.callPackage ./misc/kdiagram { }; + kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { }; + kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { }; + kirigami-addons = self.callPackage ./misc/kirigami-addons { }; + kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 { }; + kio-fuse = self.callPackage ./misc/kio-fuse { }; + klevernotes = self.callPackage ./misc/klevernotes { }; + ktextaddons = self.callPackage ./misc/ktextaddons { }; + kunifiedpush = self.callPackage ./misc/kunifiedpush { }; + kup = self.callPackage ./misc/kup { }; + marknote = self.callPackage ./misc/marknote { }; + mpvqt = self.callPackage ./misc/mpvqt { }; + oxygen-icons = self.callPackage ./misc/oxygen-icons { }; + phonon = self.callPackage ./misc/phonon { }; + phonon-vlc = self.callPackage ./misc/phonon-vlc { }; + polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { }; + pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { }; - applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; - karousel = self.callPackage ./third-party/karousel {}; - krohnkite = self.callPackage ./third-party/krohnkite {}; - kzones = self.callPackage ./third-party/kzones {}; - } - ); + applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { }; + karousel = self.callPackage ./third-party/karousel { }; + koi = self.callPackage ./third-party/koi { }; + krohnkite = self.callPackage ./third-party/krohnkite { }; + kzones = self.callPackage ./third-party/kzones { }; + } + ); in - makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "kdePackages"; - f = allPackages; - } +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "kdePackages"; + f = allPackages; +} diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/attica/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/attica/default.nix index 05b5c1e59b..c2d8a53157 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/attica/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/attica/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "attica"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/baloo/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/baloo/default.nix index 40ab00ebd1..dc05d254df 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/baloo/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/baloo/default.nix @@ -11,5 +11,8 @@ mkKdeDerivation { substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition ''; - extraBuildInputs = [qtdeclarative lmdb]; + extraBuildInputs = [ + qtdeclarative + lmdb + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/bluez-qt/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/bluez-qt/default.nix index 3bccb4309a..24814d0d8d 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/bluez-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/bluez-qt/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluez-qt"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/breeze-icons/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/breeze-icons/default.nix index 103903c04c..e7c75aad85 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/breeze-icons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/breeze-icons/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "breeze-icons"; extraNativeBuildInputs = [ - (python3.withPackages (ps: [ps.lxml])) + (python3.withPackages (ps: [ ps.lxml ])) libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/default.nix index 302be8ad3e..148c6a3d98 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/default.nix @@ -1,74 +1,75 @@ -{callPackage}: { - attica = callPackage ./attica {}; - baloo = callPackage ./baloo {}; - bluez-qt = callPackage ./bluez-qt {}; - breeze-icons = callPackage ./breeze-icons {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration {}; - kapidox = callPackage ./kapidox {}; - karchive = callPackage ./karchive {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks {}; - kcalendarcore = callPackage ./kcalendarcore {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs {}; - kcolorscheme = callPackage ./kcolorscheme {}; - kcompletion = callPackage ./kcompletion {}; - kconfig = callPackage ./kconfig {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcontacts = callPackage ./kcontacts {}; - kcoreaddons = callPackage ./kcoreaddons {}; - kcrash = callPackage ./kcrash {}; - kdav = callPackage ./kdav {}; - kdbusaddons = callPackage ./kdbusaddons {}; - kdeclarative = callPackage ./kdeclarative {}; - kded = callPackage ./kded {}; - kdesu = callPackage ./kdesu {}; - kdnssd = callPackage ./kdnssd {}; - kdoctools = callPackage ./kdoctools {}; - kfilemetadata = callPackage ./kfilemetadata {}; - kglobalaccel = callPackage ./kglobalaccel {}; - kguiaddons = callPackage ./kguiaddons {}; - kholidays = callPackage ./kholidays {}; - ki18n = callPackage ./ki18n {}; - kiconthemes = callPackage ./kiconthemes {}; - kidletime = callPackage ./kidletime {}; - kimageformats = callPackage ./kimageformats {}; - kio = callPackage ./kio {}; - kirigami = callPackage ./kirigami {}; - kitemmodels = callPackage ./kitemmodels {}; - kitemviews = callPackage ./kitemviews {}; - kjobwidgets = callPackage ./kjobwidgets {}; - knewstuff = callPackage ./knewstuff {}; - knotifications = callPackage ./knotifications {}; - knotifyconfig = callPackage ./knotifyconfig {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts {}; - kpeople = callPackage ./kpeople {}; - kplotting = callPackage ./kplotting {}; - kpty = callPackage ./kpty {}; - kquickcharts = callPackage ./kquickcharts {}; - krunner = callPackage ./krunner {}; - kservice = callPackage ./kservice {}; - kstatusnotifieritem = callPackage ./kstatusnotifieritem {}; - ksvg = callPackage ./ksvg {}; - ktexteditor = callPackage ./ktexteditor {}; - ktexttemplate = callPackage ./ktexttemplate {}; - ktextwidgets = callPackage ./ktextwidgets {}; - kunitconversion = callPackage ./kunitconversion {}; - kuserfeedback = callPackage ./kuserfeedback {}; - kwallet = callPackage ./kwallet {}; - kwidgetsaddons = callPackage ./kwidgetsaddons {}; - kwindowsystem = callPackage ./kwindowsystem {}; - kxmlgui = callPackage ./kxmlgui {}; - modemmanager-qt = callPackage ./modemmanager-qt {}; - networkmanager-qt = callPackage ./networkmanager-qt {}; - prison = callPackage ./prison {}; - purpose = callPackage ./purpose {}; - qqc2-desktop-style = callPackage ./qqc2-desktop-style {}; - solid = callPackage ./solid {}; - sonnet = callPackage ./sonnet {}; - syndication = callPackage ./syndication {}; - syntax-highlighting = callPackage ./syntax-highlighting {}; - threadweaver = callPackage ./threadweaver {}; +{ callPackage }: +{ + attica = callPackage ./attica { }; + baloo = callPackage ./baloo { }; + bluez-qt = callPackage ./bluez-qt { }; + breeze-icons = callPackage ./breeze-icons { }; + extra-cmake-modules = callPackage ./extra-cmake-modules { }; + frameworkintegration = callPackage ./frameworkintegration { }; + kapidox = callPackage ./kapidox { }; + karchive = callPackage ./karchive { }; + kauth = callPackage ./kauth { }; + kbookmarks = callPackage ./kbookmarks { }; + kcalendarcore = callPackage ./kcalendarcore { }; + kcmutils = callPackage ./kcmutils { }; + kcodecs = callPackage ./kcodecs { }; + kcolorscheme = callPackage ./kcolorscheme { }; + kcompletion = callPackage ./kcompletion { }; + kconfig = callPackage ./kconfig { }; + kconfigwidgets = callPackage ./kconfigwidgets { }; + kcontacts = callPackage ./kcontacts { }; + kcoreaddons = callPackage ./kcoreaddons { }; + kcrash = callPackage ./kcrash { }; + kdav = callPackage ./kdav { }; + kdbusaddons = callPackage ./kdbusaddons { }; + kdeclarative = callPackage ./kdeclarative { }; + kded = callPackage ./kded { }; + kdesu = callPackage ./kdesu { }; + kdnssd = callPackage ./kdnssd { }; + kdoctools = callPackage ./kdoctools { }; + kfilemetadata = callPackage ./kfilemetadata { }; + kglobalaccel = callPackage ./kglobalaccel { }; + kguiaddons = callPackage ./kguiaddons { }; + kholidays = callPackage ./kholidays { }; + ki18n = callPackage ./ki18n { }; + kiconthemes = callPackage ./kiconthemes { }; + kidletime = callPackage ./kidletime { }; + kimageformats = callPackage ./kimageformats { }; + kio = callPackage ./kio { }; + kirigami = callPackage ./kirigami { }; + kitemmodels = callPackage ./kitemmodels { }; + kitemviews = callPackage ./kitemviews { }; + kjobwidgets = callPackage ./kjobwidgets { }; + knewstuff = callPackage ./knewstuff { }; + knotifications = callPackage ./knotifications { }; + knotifyconfig = callPackage ./knotifyconfig { }; + kpackage = callPackage ./kpackage { }; + kparts = callPackage ./kparts { }; + kpeople = callPackage ./kpeople { }; + kplotting = callPackage ./kplotting { }; + kpty = callPackage ./kpty { }; + kquickcharts = callPackage ./kquickcharts { }; + krunner = callPackage ./krunner { }; + kservice = callPackage ./kservice { }; + kstatusnotifieritem = callPackage ./kstatusnotifieritem { }; + ksvg = callPackage ./ksvg { }; + ktexteditor = callPackage ./ktexteditor { }; + ktexttemplate = callPackage ./ktexttemplate { }; + ktextwidgets = callPackage ./ktextwidgets { }; + kunitconversion = callPackage ./kunitconversion { }; + kuserfeedback = callPackage ./kuserfeedback { }; + kwallet = callPackage ./kwallet { }; + kwidgetsaddons = callPackage ./kwidgetsaddons { }; + kwindowsystem = callPackage ./kwindowsystem { }; + kxmlgui = callPackage ./kxmlgui { }; + modemmanager-qt = callPackage ./modemmanager-qt { }; + networkmanager-qt = callPackage ./networkmanager-qt { }; + prison = callPackage ./prison { }; + purpose = callPackage ./purpose { }; + qqc2-desktop-style = callPackage ./qqc2-desktop-style { }; + solid = callPackage ./solid { }; + sonnet = callPackage ./sonnet { }; + syndication = callPackage ./syndication { }; + syntax-highlighting = callPackage ./syntax-highlighting { }; + threadweaver = callPackage ./threadweaver { }; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix index b7dc85d277..d0b5c09a10 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,5 +1,6 @@ -{ mkKdeDerivation -, python3 +{ + mkKdeDerivation, + python3, }: mkKdeDerivation { pname = "extra-cmake-modules"; diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/frameworkintegration/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/frameworkintegration/default.nix index 3607c115c3..938ed4e1c0 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/frameworkintegration/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/frameworkintegration/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "frameworkintegration"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [packagekit-qt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ packagekit-qt ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kapidox/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kapidox/default.nix index 2544e7921f..8a79a0dde1 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kapidox/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kapidox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapidox"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/karchive/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/karchive/default.nix index fe124e1187..d9d15c9592 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/karchive/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/karchive/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "karchive"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [xz]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ xz ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kauth/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kauth/default.nix index df033770a3..4ed23d29fd 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kauth/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kauth/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { # Late resolve paths so things end up in their own prefix # FIXME(later): discuss with upstream - patches = [./fix-paths.patch]; + patches = [ ./fix-paths.patch ]; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kbookmarks/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kbookmarks/default.nix index ac9255e6f8..e52786637f 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kbookmarks/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kbookmarks/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kbookmarks"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcalendarcore/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcalendarcore/default.nix index 0e9802e5aa..05f1023a9b 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcalendarcore/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcalendarcore/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcalendarcore"; - extraBuildInputs = [qtdeclarative libical]; + extraBuildInputs = [ + qtdeclarative + libical + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcmutils/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcmutils/default.nix index 617fb5978d..62c80823df 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcmutils/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcmutils/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kcmutils"; - extraPropagatedBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [ qtdeclarative ]; meta.mainProgram = "kcmshell6"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcodecs/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcodecs/default.nix index be91267120..c2649fe03d 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcodecs/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcodecs/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcodecs"; - extraNativeBuildInputs = [qttools gperf]; + extraNativeBuildInputs = [ + qttools + gperf + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcolorscheme/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcolorscheme/default.nix index 05f32ce574..eb682a4e56 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcolorscheme/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcolorscheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorscheme"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcompletion/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcompletion/default.nix index c07f274e08..922182e928 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcompletion/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcompletion/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kcompletion"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kconfig/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kconfig/default.nix index b29a081524..451ec7db5d 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kconfig/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kconfig/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kconfig"; - extraNativeBuildInputs = [qttools]; - extraPropagatedBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraPropagatedBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kconfigwidgets/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kconfigwidgets/default.nix index 354972d005..7f026b34a1 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kconfigwidgets/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kconfigwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kconfigwidgets"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcontacts/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcontacts/default.nix index 57e35a90a9..fa8e1429fa 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcontacts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcontacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcontacts"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcoreaddons/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcoreaddons/default.nix index 12c6ae5d77..55189f9f54 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcoreaddons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcoreaddons/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kcoreaddons"; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kcrash/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kcrash/default.nix index b3ade8fd67..ae389456e5 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kcrash/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kcrash/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcrash"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kdav/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kdav/default.nix index d53562fc90..04e27a4818 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kdav/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kdav/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdav"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kdbusaddons/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kdbusaddons/default.nix index 6803331b1e..c75df4132c 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kdbusaddons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kdbusaddons/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdbusaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; meta.mainProgram = "kquitapp6"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kdeclarative/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kdeclarative/default.nix index 8b05ec66b0..a1a0bb4089 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kdeclarative/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kdeclarative/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdeclarative"; - extraNativeBuildInputs = [spirv-tools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ spirv-tools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kded/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kded/default.nix index aa2ec5fc5a..2eecc23ab8 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kded/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kded/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kded"; meta.mainProgram = "kded6"; diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kdesu/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kdesu/default.nix index ae7ed3a33c..479c7cc6a4 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kdesu/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kdesu/default.nix @@ -1,7 +1,7 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesu"; # Look for NixOS SUID wrapper first - patches = [./kdesu-search-for-wrapped-daemon-first.patch]; + patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kdnssd/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kdnssd/default.nix index 3241dcf9c2..ce22856035 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kdnssd/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kdnssd/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdnssd"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [avahi]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ avahi ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix index 2de9ed21d9..ee5115c9f4 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix @@ -10,7 +10,17 @@ mkKdeDerivation { pname = "kdoctools"; # Perl could be used both at build time and at runtime. - extraNativeBuildInputs = [perl perlPackages.URI libxml2]; - extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; - extraPropagatedBuildInputs = [perl perlPackages.URI]; + extraNativeBuildInputs = [ + perl + perlPackages.URI + libxml2 + ]; + extraBuildInputs = [ + docbook_xml_dtd_45 + docbook-xsl-nons + ]; + extraPropagatedBuildInputs = [ + perl + perlPackages.URI + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix index 0e9fd5489e..9bd377380c 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix @@ -14,8 +14,16 @@ mkKdeDerivation { # Fix installing cmake files into wrong directory # FIXME(later): upstream - patches = [./cmake-install-paths.patch]; + patches = [ ./cmake-install-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + attr + ebook_tools + exiv2 + ffmpeg + kconfig + kdegraphics-mobipocket + libappimage + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kglobalaccel/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kglobalaccel/default.nix index b7d5e627d6..10d40753ae 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kglobalaccel/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kglobalaccel/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kglobalaccel"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix index 3aa8bcdf29..e4cf58bbb3 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kguiaddons"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kholidays/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kholidays/default.nix index 07702734a0..966ca350c6 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kholidays/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kholidays/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kholidays"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/ki18n/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/ki18n/default.nix index 9c3bef7852..0e50c345f5 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/ki18n/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/ki18n/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "ki18n"; - extraNativeBuildInputs = [python3]; - propagatedNativeBuildInputs = [gettext]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ python3 ]; + propagatedNativeBuildInputs = [ gettext ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix index 7171822ec1..1fc517f205 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kidletime"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland xorg.libXScrnSaver]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + xorg.libXScrnSaver + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix index 21c84cb569..0b3d049dc1 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix @@ -10,7 +10,13 @@ mkKdeDerivation { pname = "kimageformats"; - extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libheif libjxl libavif libraw openexr_3]; + extraCmakeFlags = [ "-DKIMAGEFORMATS_HEIF=1" ]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libheif + libjxl + libavif + libraw + openexr_3 + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kio/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kio/default.nix index 98d7a12f00..45f448692b 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kio/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kio/default.nix @@ -13,5 +13,10 @@ mkKdeDerivation { ./0001-Remove-impure-smbd-search-path.patch ]; - extraBuildInputs = [qt5compat qttools acl attr]; + extraBuildInputs = [ + qt5compat + qttools + acl + attr + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kirigami/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kirigami/default.nix index cf82923596..83edf8c526 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kirigami/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kirigami/default.nix @@ -17,18 +17,27 @@ let unwrapped = mkKdeDerivation { pname = "kirigami"; - extraNativeBuildInputs = [qtsvg qttools]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "kirigami-wrapped"; inherit (unwrapped) version; - propagatedBuildInputs = [ unwrapped qqc2-desktop-style ]; + propagatedBuildInputs = [ + unwrapped + qqc2-desktop-style + ]; dontUnpack = true; dontWrapQtApps = true; - passthru = { inherit unwrapped; }; + passthru = { + inherit unwrapped; + }; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kitemmodels/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kitemmodels/default.nix index 22476d21c4..9e81845733 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kitemmodels/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kitemmodels/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemmodels"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kitemviews/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kitemviews/default.nix index b9831f05ea..487d63092c 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kitemviews/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kitemviews/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemviews"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kjobwidgets/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kjobwidgets/default.nix index 27e9720d84..b8b494310f 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kjobwidgets/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kjobwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kjobwidgets"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/knewstuff/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/knewstuff/default.nix index 26e3207764..8bbc171f24 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/knewstuff/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/knewstuff/default.nix @@ -9,9 +9,12 @@ mkKdeDerivation { # Late resolve knsrcdir so other things install to their own prefix # FIXME(later): upstream - patches = [./delay-resolving-knsrcdir.patch]; + patches = [ ./delay-resolving-knsrcdir.patch ]; - extraBuildInputs = [qtdeclarative qttools]; - extraPropagatedBuildInputs = [kcmutils]; + extraBuildInputs = [ + qtdeclarative + qttools + ]; + extraPropagatedBuildInputs = [ kcmutils ]; meta.mainProgram = "knewstuff-dialog6"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/knotifications/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/knotifications/default.nix index 232d4469f0..08b8decea8 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/knotifications/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/knotifications/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "knotifications"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative libcanberra]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + libcanberra + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/knotifyconfig/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/knotifyconfig/default.nix index 9c778a322b..c0fb343c16 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/knotifyconfig/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/knotifyconfig/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "knotifyconfig"; - extraBuildInputs = [libcanberra]; + extraBuildInputs = [ libcanberra ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kpackage/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kpackage/default.nix index 19e4d7932a..f18b43d42d 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kpackage/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kpackage/default.nix @@ -1,9 +1,9 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpackage"; # Follow symlinks when resolving packages # FIXME(later): upstream - patches = [./follow-symlinks.patch]; + patches = [ ./follow-symlinks.patch ]; meta.mainProgram = "kpackagetool6"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kparts/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kparts/default.nix index 547e8b1b01..f3ae2c79ca 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kparts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kparts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kparts"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kpeople/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kpeople/default.nix index 18d56704c2..5f9ce156b1 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kpeople/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kpeople/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpeople"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kplotting/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kplotting/default.nix index b23c198fd8..27284e0006 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kplotting/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kplotting/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kplotting"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kpty/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kpty/default.nix index d60c2a5665..e0ba42a271 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kpty/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kpty/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpty"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kquickcharts/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kquickcharts/default.nix index 305df60004..736f065103 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kquickcharts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kquickcharts/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kquickcharts"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/krunner/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/krunner/default.nix index f817c1560c..fcdc91e68e 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/krunner/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/krunner/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "krunner"; - extraBuildInputs = [plasma-activities]; + extraBuildInputs = [ plasma-activities ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kservice/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kservice/default.nix index c21bab7c83..5a7bb7a588 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kservice/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kservice/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kservice"; diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kstatusnotifieritem/default.nix index bc3b255caa..e6845ef569 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kstatusnotifieritem/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kstatusnotifieritem/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kstatusnotifieritem"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/ksvg/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/ksvg/default.nix index 82dbce5c08..1d91aa3143 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/ksvg/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/ksvg/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksvg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/ktexteditor/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/ktexteditor/default.nix index 9a666c4e6a..e7c470c99d 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/ktexteditor/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/ktexteditor/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktexteditor"; - extraBuildInputs = [qtdeclarative qtspeech editorconfig-core-c]; + extraBuildInputs = [ + qtdeclarative + qtspeech + editorconfig-core-c + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/ktexttemplate/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/ktexttemplate/default.nix index 673a10863a..6fc59c7376 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/ktexttemplate/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/ktexttemplate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ktexttemplate"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kunitconversion/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kunitconversion/default.nix index 1d7cb52566..544aebb871 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kunitconversion/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kunitconversion/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kunitconversion"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kuserfeedback/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kuserfeedback/default.nix index 979362e6bf..7379061982 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kuserfeedback/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kuserfeedback/default.nix @@ -7,6 +7,12 @@ mkKdeDerivation { pname = "kuserfeedback"; # Disable server-side stuff we don't care about - extraCmakeFlags = ["-DENABLE_CONSOLE=0" "-DENABLE_CLI=0"]; - extraNativeBuildInputs = [qttools qtsvg]; + extraCmakeFlags = [ + "-DENABLE_CONSOLE=0" + "-DENABLE_CLI=0" + ]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kwallet/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kwallet/default.nix index 32fc161223..331bdee02b 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kwallet/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kwallet/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "kwallet"; - extraBuildInputs = [libgcrypt kcrash kdoctools]; + extraBuildInputs = [ + libgcrypt + kcrash + kdoctools + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kwidgetsaddons/default.nix index 09dfb3228d..00e9adca5b 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kwidgetsaddons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kwidgetsaddons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kwidgetsaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix index a5fb8eddb7..5ae167b1cc 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -8,6 +8,12 @@ mkKdeDerivation { pname = "kwindowsystem"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative qtwayland]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + qtwayland + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kxmlgui/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kxmlgui/default.nix index 64734cde5a..3b93b5b351 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kxmlgui/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kxmlgui/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kxmlgui"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/modemmanager-qt/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/modemmanager-qt/default.nix index 34a6f19548..5acc420a89 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/modemmanager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/modemmanager-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "modemmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraPropagatedBuildInputs = [modemmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraPropagatedBuildInputs = [ modemmanager ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/networkmanager-qt/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/networkmanager-qt/default.nix index bdec89a9ca..e276cb3a82 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/networkmanager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/networkmanager-qt/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "networkmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [networkmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ networkmanager ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/prison/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/prison/default.nix index 6411be8a34..4cde20f930 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/prison/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/prison/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "prison"; - extraBuildInputs = [qtdeclarative qtmultimedia qrencode libdmtx]; + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qrencode + libdmtx + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/purpose/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/purpose/default.nix index 8bf85ae19a..a515728a3a 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/purpose/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/purpose/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "purpose"; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [kaccounts-integration kdeclarative prison]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ + kaccounts-integration + kdeclarative + prison + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index 5ceb41012d..45f22d8fa5 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "qqc2-desktop-style"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative kirigami.unwrapped]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + kirigami.unwrapped + ]; - excludeDependencies = ["kirigami"]; + excludeDependencies = [ "kirigami" ]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix index 2c628b8dbc..6b767e9d43 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix @@ -13,7 +13,11 @@ mkKdeDerivation { ./fix-search-path.patch ]; - extraNativeBuildInputs = [qttools bison flex]; - extraBuildInputs = [libimobiledevice]; + extraNativeBuildInputs = [ + qttools + bison + flex + ]; + extraBuildInputs = [ libimobiledevice ]; meta.mainProgram = "solid-hardware6"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/sonnet/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/sonnet/default.nix index b5b82f6e67..fbeb8b10d5 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/sonnet/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/sonnet/default.nix @@ -9,7 +9,14 @@ mkKdeDerivation { pname = "sonnet"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative aspell hunspell]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + aspell + hunspell + ]; meta.mainProgram = "parsetrigrams6"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/syndication/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/syndication/default.nix index cec50a6777..444fec8614 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/syndication/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/syndication/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "syndication"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/syntax-highlighting/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/syntax-highlighting/default.nix index 1a5430901f..7985dcb957 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/syntax-highlighting/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/syntax-highlighting/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "syntax-highlighting"; - extraBuildInputs = [qtdeclarative]; - extraNativeBuildInputs = [qttools perl]; + extraBuildInputs = [ qtdeclarative ]; + extraNativeBuildInputs = [ + qttools + perl + ]; meta.mainProgram = "ksyntaxhighlighter6"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/threadweaver/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/threadweaver/default.nix index 9da07c2af2..dddae60d96 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/threadweaver/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/threadweaver/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "threadweaver"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/accessibility-inspector/default.nix b/third_party/nixpkgs/pkgs/kde/gear/accessibility-inspector/default.nix index 1197f29330..cb623e7ceb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/accessibility-inspector/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/accessibility-inspector/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "accessibility-inspector"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar-tools/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar-tools/default.nix index bc863c0267..0c0d88a425 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar-tools/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar-tools/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar-tools"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar/default.nix index 66c615e53b..10ef8e6ed0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-calendar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar"; meta.mainProgram = "kalendarac"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-contacts/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-contacts/default.nix index b8c1c5bf92..b93d750c0f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-contacts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-contacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-contacts"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-import-wizard/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-import-wizard/default.nix index 9037457ee8..ff7e72d540 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-import-wizard/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-import-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-import-wizard"; meta.mainProgram = "akonadiimportwizard"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-mime/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-mime/default.nix index 9db5272e6b..72cc1275af 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-mime/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-mime/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "akonadi-mime"; - extraNativeBuildInputs = [shared-mime-info libxslt]; + extraNativeBuildInputs = [ + shared-mime-info + libxslt + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-notes/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-notes/default.nix index a1cd161a51..01f572f8fb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-notes/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-notes/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-notes"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix index 4d7ec7aafc..5b8add9abb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix @@ -29,5 +29,8 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [corrosion xapian]; + extraBuildInputs = [ + corrosion + xapian + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi/default.nix index 64966c4fad..bb6d2f6099 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi/default.nix @@ -20,8 +20,16 @@ mkKdeDerivation { "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin" ]; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ + kaccounts-integration + accounts-qt + xz + mariadb + ]; # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically postFixup = '' diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadiconsole/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadiconsole/default.nix index ca11691001..dbed7d5564 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadiconsole/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadiconsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "akonadiconsole"; - extraBuildInputs = [xapian]; + extraBuildInputs = [ xapian ]; meta.mainProgram = "akonadiconsole"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/akregator/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akregator/default.nix index 4d52e4947b..17517816b7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akregator/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akregator/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "akregator"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/alligator/default.nix b/third_party/nixpkgs/pkgs/kde/gear/alligator/default.nix index c2f7a14734..f317a97e86 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/alligator/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/alligator/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "alligator"; meta.mainProgram = "alligator"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/analitza/default.nix b/third_party/nixpkgs/pkgs/kde/gear/analitza/default.nix index 318c0b6482..4402ab1d53 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/analitza/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/analitza/default.nix @@ -9,6 +9,13 @@ mkKdeDerivation { pname = "analitza"; - extraNativeBuildInputs = [qt5compat qtsvg qttools]; - extraBuildInputs = [qtdeclarative eigen]; + extraNativeBuildInputs = [ + qt5compat + qtsvg + qttools + ]; + extraBuildInputs = [ + qtdeclarative + eigen + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix b/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix index b9883c7c2a..f599178ad3 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix @@ -28,5 +28,10 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [qtsvg qtwebengine corrosion qcoro]; + extraBuildInputs = [ + qtsvg + qtwebengine + corrosion + qcoro + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ark/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ark/default.nix index fb9c3d8e59..6127e723dd 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ark/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ark/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "ark"; - extraBuildInputs = [libarchive libzip]; + extraBuildInputs = [ + libarchive + libzip + ]; meta.mainProgram = "ark"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/artikulate/default.nix b/third_party/nixpkgs/pkgs/kde/gear/artikulate/default.nix index c82db10260..60bd663852 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/artikulate/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/artikulate/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "artikulate"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; # FIXME(qt5) meta.broken = true; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/audex/default.nix b/third_party/nixpkgs/pkgs/kde/gear/audex/default.nix index c6043d6416..9a7c8fb0ea 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/audex/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/audex/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "audex"; - extraBuildInputs = [libcdio libcdio-paranoia]; + extraBuildInputs = [ + libcdio + libcdio-paranoia + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/audiocd-kio/default.nix b/third_party/nixpkgs/pkgs/kde/gear/audiocd-kio/default.nix index c2f5c25588..b4fa60026b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/audiocd-kio/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/audiocd-kio/default.nix @@ -20,5 +20,10 @@ mkKdeDerivation { }) ]; - extraBuildInputs = [cdparanoia flac libogg libvorbis]; + extraBuildInputs = [ + cdparanoia + flac + libogg + libvorbis + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/audiotube/default.nix b/third_party/nixpkgs/pkgs/kde/gear/audiotube/default.nix index c9ae14f3be..b27ab60155 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/audiotube/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/audiotube/default.nix @@ -14,41 +14,40 @@ purpose, qcoro, python3, -}: let +}: +let ps = python3.pkgs; pythonDeps = [ ps.yt-dlp ps.ytmusicapi ]; in - mkKdeDerivation { - pname = "audiotube"; +mkKdeDerivation { + pname = "audiotube"; - extraNativeBuildInputs = [ - ps.pybind11 - ]; + extraNativeBuildInputs = [ + ps.pybind11 + ]; - extraBuildInputs = - [ - qtdeclarative - qtmultimedia - qtsvg + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qtsvg - extra-cmake-modules - futuresql - kirigami - kirigami-addons - kcoreaddons - ki18n - kcrash - kwindowsystem - purpose - qcoro - ] - ++ pythonDeps; + extra-cmake-modules + futuresql + kirigami + kirigami-addons + kcoreaddons + ki18n + kcrash + kwindowsystem + purpose + qcoro + ] ++ pythonDeps; - qtWrapperArgs = [ - "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" - ]; - meta.mainProgram = "audiotube"; - } + qtWrapperArgs = [ + "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" + ]; + meta.mainProgram = "audiotube"; +} diff --git a/third_party/nixpkgs/pkgs/kde/gear/baloo-widgets/default.nix b/third_party/nixpkgs/pkgs/kde/gear/baloo-widgets/default.nix index 7e576348f0..9835c248ee 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/baloo-widgets/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/baloo-widgets/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "baloo-widgets"; meta.mainProgram = "baloo_filemetadata_temp_extractor"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/blinken/default.nix b/third_party/nixpkgs/pkgs/kde/gear/blinken/default.nix index 8b6fbc6806..92cb126b08 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/blinken/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/blinken/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "blinken"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "blinken"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/bomber/default.nix b/third_party/nixpkgs/pkgs/kde/gear/bomber/default.nix index 611edb5d2c..3e10833d32 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/bomber/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/bomber/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "bomber"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "bomber"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/bovo/default.nix b/third_party/nixpkgs/pkgs/kde/gear/bovo/default.nix index 5bafedfd1b..c3fef1c907 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/bovo/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/bovo/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "bovo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "bovo"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/calendarsupport/default.nix b/third_party/nixpkgs/pkgs/kde/gear/calendarsupport/default.nix index b6632a384d..9b80b02aa7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/calendarsupport/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/calendarsupport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "calendarsupport"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/calindori/default.nix b/third_party/nixpkgs/pkgs/kde/gear/calindori/default.nix index 41efa7a9e4..565ffe6d58 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/calindori/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/calindori/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "calindori"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/cantor/default.nix b/third_party/nixpkgs/pkgs/kde/gear/cantor/default.nix index 42963aabbb..80d11e576a 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/cantor/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/cantor/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "cantor"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; # FIXME(qt5) meta.broken = true; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/cervisia/default.nix b/third_party/nixpkgs/pkgs/kde/gear/cervisia/default.nix index d8546e9d8a..804cd7bed7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/cervisia/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/cervisia/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "cervisia"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/colord-kde/default.nix b/third_party/nixpkgs/pkgs/kde/gear/colord-kde/default.nix index 9e2aa630d6..e2ce75a98e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/colord-kde/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/colord-kde/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "colord-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [lcms2 xorg.libXrandr]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + lcms2 + xorg.libXrandr + ]; meta.mainProgram = "colord-kde-icc-importer"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/default.nix b/third_party/nixpkgs/pkgs/kde/gear/default.nix index 303e3dde5d..c296c82a8d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/default.nix @@ -1,252 +1,253 @@ -{callPackage}: { - accessibility-inspector = callPackage ./accessibility-inspector {}; - akonadi = callPackage ./akonadi {}; - akonadi-calendar = callPackage ./akonadi-calendar {}; - akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {}; - akonadi-contacts = callPackage ./akonadi-contacts {}; - akonadi-import-wizard = callPackage ./akonadi-import-wizard {}; - akonadi-mime = callPackage ./akonadi-mime {}; - akonadi-notes = callPackage ./akonadi-notes {}; - akonadi-search = callPackage ./akonadi-search {}; - akonadiconsole = callPackage ./akonadiconsole {}; - akregator = callPackage ./akregator {}; - alligator = callPackage ./alligator {}; - analitza = callPackage ./analitza {}; - angelfish = callPackage ./angelfish {}; - arianna = callPackage ./arianna {}; - ark = callPackage ./ark {}; - artikulate = callPackage ./artikulate {}; - audex = callPackage ./audex {}; - audiocd-kio = callPackage ./audiocd-kio {}; - audiotube = callPackage ./audiotube {}; - baloo-widgets = callPackage ./baloo-widgets {}; - blinken = callPackage ./blinken {}; - bomber = callPackage ./bomber {}; - bovo = callPackage ./bovo {}; - calendarsupport = callPackage ./calendarsupport {}; - calindori = callPackage ./calindori {}; - cantor = callPackage ./cantor {}; - cervisia = callPackage ./cervisia {}; - colord-kde = callPackage ./colord-kde {}; - dolphin = callPackage ./dolphin {}; - dolphin-plugins = callPackage ./dolphin-plugins {}; - dragon = callPackage ./dragon {}; - elisa = callPackage ./elisa {}; - eventviews = callPackage ./eventviews {}; - falkon = callPackage ./falkon {}; - ffmpegthumbs = callPackage ./ffmpegthumbs {}; - filelight = callPackage ./filelight {}; - francis = callPackage ./francis {}; - ghostwriter = callPackage ./ghostwriter {}; - granatier = callPackage ./granatier {}; - grantlee-editor = callPackage ./grantlee-editor {}; - grantleetheme = callPackage ./grantleetheme {}; - gwenview = callPackage ./gwenview {}; - incidenceeditor = callPackage ./incidenceeditor {}; - isoimagewriter = callPackage ./isoimagewriter {}; - itinerary = callPackage ./itinerary {}; - juk = callPackage ./juk {}; - k3b = callPackage ./k3b {}; - kaccounts-integration = callPackage ./kaccounts-integration {}; - kaccounts-providers = callPackage ./kaccounts-providers {}; - kaddressbook = callPackage ./kaddressbook {}; - kajongg = callPackage ./kajongg {}; - kalarm = callPackage ./kalarm {}; - kalgebra = callPackage ./kalgebra {}; - kalk = callPackage ./kalk {}; - kalm = callPackage ./kalm {}; - kalzium = callPackage ./kalzium {}; - kamera = callPackage ./kamera {}; - kamoso = callPackage ./kamoso {}; - kanagram = callPackage ./kanagram {}; - kapman = callPackage ./kapman {}; - kapptemplate = callPackage ./kapptemplate {}; - kasts = callPackage ./kasts {}; - kate = callPackage ./kate {}; - katomic = callPackage ./katomic {}; - kbackup = callPackage ./kbackup {}; - kblackbox = callPackage ./kblackbox {}; - kblocks = callPackage ./kblocks {}; - kbounce = callPackage ./kbounce {}; - kbreakout = callPackage ./kbreakout {}; - kbruch = callPackage ./kbruch {}; - kcachegrind = callPackage ./kcachegrind {}; - kcalc = callPackage ./kcalc {}; - kcalutils = callPackage ./kcalutils {}; - kcharselect = callPackage ./kcharselect {}; - kclock = callPackage ./kclock {}; - kcolorchooser = callPackage ./kcolorchooser {}; - kcron = callPackage ./kcron {}; - kde-dev-scripts = callPackage ./kde-dev-scripts {}; - kde-dev-utils = callPackage ./kde-dev-utils {}; - kde-inotify-survey = callPackage ./kde-inotify-survey {}; - kdebugsettings = callPackage ./kdebugsettings {}; - kdeconnect-kde = callPackage ./kdeconnect-kde {}; - kdeedu-data = callPackage ./kdeedu-data {}; - kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers {}; - kdenetwork-filesharing = callPackage ./kdenetwork-filesharing {}; - kdenlive = callPackage ./kdenlive {}; - kdepim-addons = callPackage ./kdepim-addons {}; - kdepim-runtime = callPackage ./kdepim-runtime {}; - kdesdk-kio = callPackage ./kdesdk-kio {}; - kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers {}; - kdev-php = callPackage ./kdev-php {}; - kdev-python = callPackage ./kdev-python {}; - kdevelop = callPackage ./kdevelop {}; - kdf = callPackage ./kdf {}; - kdialog = callPackage ./kdialog {}; - kdiamond = callPackage ./kdiamond {}; - keditbookmarks = callPackage ./keditbookmarks {}; - keysmith = callPackage ./keysmith {}; - kfind = callPackage ./kfind {}; - kfourinline = callPackage ./kfourinline {}; - kgeography = callPackage ./kgeography {}; - kget = callPackage ./kget {}; - kgoldrunner = callPackage ./kgoldrunner {}; - kgpg = callPackage ./kgpg {}; - kgraphviewer = callPackage ./kgraphviewer {}; - khangman = callPackage ./khangman {}; - khealthcertificate = callPackage ./khealthcertificate {}; - khelpcenter = callPackage ./khelpcenter {}; - kidentitymanagement = callPackage ./kidentitymanagement {}; - kig = callPackage ./kig {}; - kigo = callPackage ./kigo {}; - killbots = callPackage ./killbots {}; - kimagemapeditor = callPackage ./kimagemapeditor {}; - kimap = callPackage ./kimap {}; - kio-admin = callPackage ./kio-admin {}; - kio-extras = callPackage ./kio-extras {}; - kio-gdrive = callPackage ./kio-gdrive {}; - kio-zeroconf = callPackage ./kio-zeroconf {}; - kirigami-gallery = callPackage ./kirigami-gallery {}; - kiriki = callPackage ./kiriki {}; - kiten = callPackage ./kiten {}; - kitinerary = callPackage ./kitinerary {}; - kjournald = callPackage ./kjournald {}; - kjumpingcube = callPackage ./kjumpingcube {}; - kldap = callPackage ./kldap {}; - kleopatra = callPackage ./kleopatra {}; - klettres = callPackage ./klettres {}; - klickety = callPackage ./klickety {}; - klines = callPackage ./klines {}; - kmag = callPackage ./kmag {}; - kmahjongg = callPackage ./kmahjongg {}; - kmail = callPackage ./kmail {}; - kmail-account-wizard = callPackage ./kmail-account-wizard {}; - kmailtransport = callPackage ./kmailtransport {}; - kmbox = callPackage ./kmbox {}; - kmime = callPackage ./kmime {}; - kmines = callPackage ./kmines {}; - kmix = callPackage ./kmix {}; - kmousetool = callPackage ./kmousetool {}; - kmouth = callPackage ./kmouth {}; - kmplot = callPackage ./kmplot {}; - knavalbattle = callPackage ./knavalbattle {}; - knetwalk = callPackage ./knetwalk {}; - knights = callPackage ./knights {}; - koko = callPackage ./koko {}; - kolf = callPackage ./kolf {}; - kollision = callPackage ./kollision {}; - kolourpaint = callPackage ./kolourpaint {}; - kompare = callPackage ./kompare {}; - kongress = callPackage ./kongress {}; - konqueror = callPackage ./konqueror {}; - konquest = callPackage ./konquest {}; - konsole = callPackage ./konsole {}; - kontact = callPackage ./kontact {}; - kontactinterface = callPackage ./kontactinterface {}; - kontrast = callPackage ./kontrast {}; - konversation = callPackage ./konversation {}; - kopeninghours = callPackage ./kopeninghours {}; - korganizer = callPackage ./korganizer {}; - kosmindoormap = callPackage ./kosmindoormap {}; - kpat = callPackage ./kpat {}; - kpimtextedit = callPackage ./kpimtextedit {}; - kpkpass = callPackage ./kpkpass {}; - kpmcore = callPackage ./kpmcore {}; - kpublictransport = callPackage ./kpublictransport {}; - kqtquickcharts = callPackage ./kqtquickcharts {}; - krdc = callPackage ./krdc {}; - krecorder = callPackage ./krecorder {}; - kreversi = callPackage ./kreversi {}; - krfb = callPackage ./krfb {}; - kross-interpreters = callPackage ./kross-interpreters {}; - kruler = callPackage ./kruler {}; - ksanecore = callPackage ./ksanecore {}; - kshisen = callPackage ./kshisen {}; - ksirk = callPackage ./ksirk {}; - ksmtp = callPackage ./ksmtp {}; - ksnakeduel = callPackage ./ksnakeduel {}; - kspaceduel = callPackage ./kspaceduel {}; - ksquares = callPackage ./ksquares {}; - ksudoku = callPackage ./ksudoku {}; - ksystemlog = callPackage ./ksystemlog {}; - kteatime = callPackage ./kteatime {}; - ktimer = callPackage ./ktimer {}; - ktnef = callPackage ./ktnef {}; - ktorrent = callPackage ./ktorrent {}; - ktouch = callPackage ./ktouch {}; - ktrip = callPackage ./ktrip {}; - ktuberling = callPackage ./ktuberling {}; - kturtle = callPackage ./kturtle {}; - kubrick = callPackage ./kubrick {}; - kwalletmanager = callPackage ./kwalletmanager {}; - kwave = callPackage ./kwave {}; - kweather = callPackage ./kweather {}; - kweathercore = callPackage ./kweathercore {}; - kwordquiz = callPackage ./kwordquiz {}; - libgravatar = callPackage ./libgravatar {}; - libkcddb = callPackage ./libkcddb {}; - libkcompactdisc = callPackage ./libkcompactdisc {}; - libkdcraw = callPackage ./libkdcraw {}; - libkdegames = callPackage ./libkdegames {}; - libkdepim = callPackage ./libkdepim {}; - libkeduvocdocument = callPackage ./libkeduvocdocument {}; - libkexiv2 = callPackage ./libkexiv2 {}; - libkgapi = callPackage ./libkgapi {}; - libkleo = callPackage ./libkleo {}; - libkmahjongg = callPackage ./libkmahjongg {}; - libkomparediff2 = callPackage ./libkomparediff2 {}; - libksane = callPackage ./libksane {}; - libksieve = callPackage ./libksieve {}; - libktorrent = callPackage ./libktorrent {}; - lokalize = callPackage ./lokalize {}; - lskat = callPackage ./lskat {}; - mailcommon = callPackage ./mailcommon {}; - mailimporter = callPackage ./mailimporter {}; - marble = callPackage ./marble {}; - markdownpart = callPackage ./markdownpart {}; - massif-visualizer = callPackage ./massif-visualizer {}; - mbox-importer = callPackage ./mbox-importer {}; - merkuro = callPackage ./merkuro {}; - messagelib = callPackage ./messagelib {}; - mimetreeparser = callPackage ./mimetreeparser {}; - minuet = callPackage ./minuet {}; - neochat = callPackage ./neochat {}; - okular = callPackage ./okular {}; - palapeli = callPackage ./palapeli {}; - parley = callPackage ./parley {}; - partitionmanager = callPackage ./partitionmanager {}; - picmi = callPackage ./picmi {}; - pim-data-exporter = callPackage ./pim-data-exporter {}; - pim-sieve-editor = callPackage ./pim-sieve-editor {}; - pimcommon = callPackage ./pimcommon {}; - plasmatube = callPackage ./plasmatube {}; - poxml = callPackage ./poxml {}; - qmlkonsole = callPackage ./qmlkonsole {}; - rocs = callPackage ./rocs {}; - signon-kwallet-extension = callPackage ./signon-kwallet-extension {}; - skanlite = callPackage ./skanlite {}; - skanpage = callPackage ./skanpage {}; - skladnik = callPackage ./skladnik {}; - spectacle = callPackage ./spectacle {}; - step = callPackage ./step {}; - svgpart = callPackage ./svgpart {}; - sweeper = callPackage ./sweeper {}; - telly-skout = callPackage ./telly-skout {}; - tokodon = callPackage ./tokodon {}; - umbrello = callPackage ./umbrello {}; - yakuake = callPackage ./yakuake {}; - zanshin = callPackage ./zanshin {}; +{ callPackage }: +{ + accessibility-inspector = callPackage ./accessibility-inspector { }; + akonadi = callPackage ./akonadi { }; + akonadi-calendar = callPackage ./akonadi-calendar { }; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools { }; + akonadi-contacts = callPackage ./akonadi-contacts { }; + akonadi-import-wizard = callPackage ./akonadi-import-wizard { }; + akonadi-mime = callPackage ./akonadi-mime { }; + akonadi-notes = callPackage ./akonadi-notes { }; + akonadi-search = callPackage ./akonadi-search { }; + akonadiconsole = callPackage ./akonadiconsole { }; + akregator = callPackage ./akregator { }; + alligator = callPackage ./alligator { }; + analitza = callPackage ./analitza { }; + angelfish = callPackage ./angelfish { }; + arianna = callPackage ./arianna { }; + ark = callPackage ./ark { }; + artikulate = callPackage ./artikulate { }; + audex = callPackage ./audex { }; + audiocd-kio = callPackage ./audiocd-kio { }; + audiotube = callPackage ./audiotube { }; + baloo-widgets = callPackage ./baloo-widgets { }; + blinken = callPackage ./blinken { }; + bomber = callPackage ./bomber { }; + bovo = callPackage ./bovo { }; + calendarsupport = callPackage ./calendarsupport { }; + calindori = callPackage ./calindori { }; + cantor = callPackage ./cantor { }; + cervisia = callPackage ./cervisia { }; + colord-kde = callPackage ./colord-kde { }; + dolphin = callPackage ./dolphin { }; + dolphin-plugins = callPackage ./dolphin-plugins { }; + dragon = callPackage ./dragon { }; + elisa = callPackage ./elisa { }; + eventviews = callPackage ./eventviews { }; + falkon = callPackage ./falkon { }; + ffmpegthumbs = callPackage ./ffmpegthumbs { }; + filelight = callPackage ./filelight { }; + francis = callPackage ./francis { }; + ghostwriter = callPackage ./ghostwriter { }; + granatier = callPackage ./granatier { }; + grantlee-editor = callPackage ./grantlee-editor { }; + grantleetheme = callPackage ./grantleetheme { }; + gwenview = callPackage ./gwenview { }; + incidenceeditor = callPackage ./incidenceeditor { }; + isoimagewriter = callPackage ./isoimagewriter { }; + itinerary = callPackage ./itinerary { }; + juk = callPackage ./juk { }; + k3b = callPackage ./k3b { }; + kaccounts-integration = callPackage ./kaccounts-integration { }; + kaccounts-providers = callPackage ./kaccounts-providers { }; + kaddressbook = callPackage ./kaddressbook { }; + kajongg = callPackage ./kajongg { }; + kalarm = callPackage ./kalarm { }; + kalgebra = callPackage ./kalgebra { }; + kalk = callPackage ./kalk { }; + kalm = callPackage ./kalm { }; + kalzium = callPackage ./kalzium { }; + kamera = callPackage ./kamera { }; + kamoso = callPackage ./kamoso { }; + kanagram = callPackage ./kanagram { }; + kapman = callPackage ./kapman { }; + kapptemplate = callPackage ./kapptemplate { }; + kasts = callPackage ./kasts { }; + kate = callPackage ./kate { }; + katomic = callPackage ./katomic { }; + kbackup = callPackage ./kbackup { }; + kblackbox = callPackage ./kblackbox { }; + kblocks = callPackage ./kblocks { }; + kbounce = callPackage ./kbounce { }; + kbreakout = callPackage ./kbreakout { }; + kbruch = callPackage ./kbruch { }; + kcachegrind = callPackage ./kcachegrind { }; + kcalc = callPackage ./kcalc { }; + kcalutils = callPackage ./kcalutils { }; + kcharselect = callPackage ./kcharselect { }; + kclock = callPackage ./kclock { }; + kcolorchooser = callPackage ./kcolorchooser { }; + kcron = callPackage ./kcron { }; + kde-dev-scripts = callPackage ./kde-dev-scripts { }; + kde-dev-utils = callPackage ./kde-dev-utils { }; + kde-inotify-survey = callPackage ./kde-inotify-survey { }; + kdebugsettings = callPackage ./kdebugsettings { }; + kdeconnect-kde = callPackage ./kdeconnect-kde { }; + kdeedu-data = callPackage ./kdeedu-data { }; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket { }; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers { }; + kdenetwork-filesharing = callPackage ./kdenetwork-filesharing { }; + kdenlive = callPackage ./kdenlive { }; + kdepim-addons = callPackage ./kdepim-addons { }; + kdepim-runtime = callPackage ./kdepim-runtime { }; + kdesdk-kio = callPackage ./kdesdk-kio { }; + kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers { }; + kdev-php = callPackage ./kdev-php { }; + kdev-python = callPackage ./kdev-python { }; + kdevelop = callPackage ./kdevelop { }; + kdf = callPackage ./kdf { }; + kdialog = callPackage ./kdialog { }; + kdiamond = callPackage ./kdiamond { }; + keditbookmarks = callPackage ./keditbookmarks { }; + keysmith = callPackage ./keysmith { }; + kfind = callPackage ./kfind { }; + kfourinline = callPackage ./kfourinline { }; + kgeography = callPackage ./kgeography { }; + kget = callPackage ./kget { }; + kgoldrunner = callPackage ./kgoldrunner { }; + kgpg = callPackage ./kgpg { }; + kgraphviewer = callPackage ./kgraphviewer { }; + khangman = callPackage ./khangman { }; + khealthcertificate = callPackage ./khealthcertificate { }; + khelpcenter = callPackage ./khelpcenter { }; + kidentitymanagement = callPackage ./kidentitymanagement { }; + kig = callPackage ./kig { }; + kigo = callPackage ./kigo { }; + killbots = callPackage ./killbots { }; + kimagemapeditor = callPackage ./kimagemapeditor { }; + kimap = callPackage ./kimap { }; + kio-admin = callPackage ./kio-admin { }; + kio-extras = callPackage ./kio-extras { }; + kio-gdrive = callPackage ./kio-gdrive { }; + kio-zeroconf = callPackage ./kio-zeroconf { }; + kirigami-gallery = callPackage ./kirigami-gallery { }; + kiriki = callPackage ./kiriki { }; + kiten = callPackage ./kiten { }; + kitinerary = callPackage ./kitinerary { }; + kjournald = callPackage ./kjournald { }; + kjumpingcube = callPackage ./kjumpingcube { }; + kldap = callPackage ./kldap { }; + kleopatra = callPackage ./kleopatra { }; + klettres = callPackage ./klettres { }; + klickety = callPackage ./klickety { }; + klines = callPackage ./klines { }; + kmag = callPackage ./kmag { }; + kmahjongg = callPackage ./kmahjongg { }; + kmail = callPackage ./kmail { }; + kmail-account-wizard = callPackage ./kmail-account-wizard { }; + kmailtransport = callPackage ./kmailtransport { }; + kmbox = callPackage ./kmbox { }; + kmime = callPackage ./kmime { }; + kmines = callPackage ./kmines { }; + kmix = callPackage ./kmix { }; + kmousetool = callPackage ./kmousetool { }; + kmouth = callPackage ./kmouth { }; + kmplot = callPackage ./kmplot { }; + knavalbattle = callPackage ./knavalbattle { }; + knetwalk = callPackage ./knetwalk { }; + knights = callPackage ./knights { }; + koko = callPackage ./koko { }; + kolf = callPackage ./kolf { }; + kollision = callPackage ./kollision { }; + kolourpaint = callPackage ./kolourpaint { }; + kompare = callPackage ./kompare { }; + kongress = callPackage ./kongress { }; + konqueror = callPackage ./konqueror { }; + konquest = callPackage ./konquest { }; + konsole = callPackage ./konsole { }; + kontact = callPackage ./kontact { }; + kontactinterface = callPackage ./kontactinterface { }; + kontrast = callPackage ./kontrast { }; + konversation = callPackage ./konversation { }; + kopeninghours = callPackage ./kopeninghours { }; + korganizer = callPackage ./korganizer { }; + kosmindoormap = callPackage ./kosmindoormap { }; + kpat = callPackage ./kpat { }; + kpimtextedit = callPackage ./kpimtextedit { }; + kpkpass = callPackage ./kpkpass { }; + kpmcore = callPackage ./kpmcore { }; + kpublictransport = callPackage ./kpublictransport { }; + kqtquickcharts = callPackage ./kqtquickcharts { }; + krdc = callPackage ./krdc { }; + krecorder = callPackage ./krecorder { }; + kreversi = callPackage ./kreversi { }; + krfb = callPackage ./krfb { }; + kross-interpreters = callPackage ./kross-interpreters { }; + kruler = callPackage ./kruler { }; + ksanecore = callPackage ./ksanecore { }; + kshisen = callPackage ./kshisen { }; + ksirk = callPackage ./ksirk { }; + ksmtp = callPackage ./ksmtp { }; + ksnakeduel = callPackage ./ksnakeduel { }; + kspaceduel = callPackage ./kspaceduel { }; + ksquares = callPackage ./ksquares { }; + ksudoku = callPackage ./ksudoku { }; + ksystemlog = callPackage ./ksystemlog { }; + kteatime = callPackage ./kteatime { }; + ktimer = callPackage ./ktimer { }; + ktnef = callPackage ./ktnef { }; + ktorrent = callPackage ./ktorrent { }; + ktouch = callPackage ./ktouch { }; + ktrip = callPackage ./ktrip { }; + ktuberling = callPackage ./ktuberling { }; + kturtle = callPackage ./kturtle { }; + kubrick = callPackage ./kubrick { }; + kwalletmanager = callPackage ./kwalletmanager { }; + kwave = callPackage ./kwave { }; + kweather = callPackage ./kweather { }; + kweathercore = callPackage ./kweathercore { }; + kwordquiz = callPackage ./kwordquiz { }; + libgravatar = callPackage ./libgravatar { }; + libkcddb = callPackage ./libkcddb { }; + libkcompactdisc = callPackage ./libkcompactdisc { }; + libkdcraw = callPackage ./libkdcraw { }; + libkdegames = callPackage ./libkdegames { }; + libkdepim = callPackage ./libkdepim { }; + libkeduvocdocument = callPackage ./libkeduvocdocument { }; + libkexiv2 = callPackage ./libkexiv2 { }; + libkgapi = callPackage ./libkgapi { }; + libkleo = callPackage ./libkleo { }; + libkmahjongg = callPackage ./libkmahjongg { }; + libkomparediff2 = callPackage ./libkomparediff2 { }; + libksane = callPackage ./libksane { }; + libksieve = callPackage ./libksieve { }; + libktorrent = callPackage ./libktorrent { }; + lokalize = callPackage ./lokalize { }; + lskat = callPackage ./lskat { }; + mailcommon = callPackage ./mailcommon { }; + mailimporter = callPackage ./mailimporter { }; + marble = callPackage ./marble { }; + markdownpart = callPackage ./markdownpart { }; + massif-visualizer = callPackage ./massif-visualizer { }; + mbox-importer = callPackage ./mbox-importer { }; + merkuro = callPackage ./merkuro { }; + messagelib = callPackage ./messagelib { }; + mimetreeparser = callPackage ./mimetreeparser { }; + minuet = callPackage ./minuet { }; + neochat = callPackage ./neochat { }; + okular = callPackage ./okular { }; + palapeli = callPackage ./palapeli { }; + parley = callPackage ./parley { }; + partitionmanager = callPackage ./partitionmanager { }; + picmi = callPackage ./picmi { }; + pim-data-exporter = callPackage ./pim-data-exporter { }; + pim-sieve-editor = callPackage ./pim-sieve-editor { }; + pimcommon = callPackage ./pimcommon { }; + plasmatube = callPackage ./plasmatube { }; + poxml = callPackage ./poxml { }; + qmlkonsole = callPackage ./qmlkonsole { }; + rocs = callPackage ./rocs { }; + signon-kwallet-extension = callPackage ./signon-kwallet-extension { }; + skanlite = callPackage ./skanlite { }; + skanpage = callPackage ./skanpage { }; + skladnik = callPackage ./skladnik { }; + spectacle = callPackage ./spectacle { }; + step = callPackage ./step { }; + svgpart = callPackage ./svgpart { }; + sweeper = callPackage ./sweeper { }; + telly-skout = callPackage ./telly-skout { }; + tokodon = callPackage ./tokodon { }; + umbrello = callPackage ./umbrello { }; + yakuake = callPackage ./yakuake { }; + zanshin = callPackage ./zanshin { }; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/dolphin-plugins/default.nix b/third_party/nixpkgs/pkgs/kde/gear/dolphin-plugins/default.nix index cc88d73238..652158c2e0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/dolphin-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/dolphin-plugins/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin-plugins"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/dolphin/default.nix b/third_party/nixpkgs/pkgs/kde/gear/dolphin/default.nix index eb70e9c9d0..df4c4c3bda 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/dolphin/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/dolphin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/dragon/default.nix b/third_party/nixpkgs/pkgs/kde/gear/dragon/default.nix index 3b49b3372c..a825f60421 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/dragon/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/dragon/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dragon"; meta.mainProgram = "dragon"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/elisa/default.nix b/third_party/nixpkgs/pkgs/kde/gear/elisa/default.nix index 459fb24739..ee280ae931 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/elisa/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/elisa/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "elisa"; - extraBuildInputs = [qtmultimedia libvlc]; + extraBuildInputs = [ + qtmultimedia + libvlc + ]; meta.mainProgram = "elisa"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/eventviews/default.nix b/third_party/nixpkgs/pkgs/kde/gear/eventviews/default.nix index d9d0eeb7d7..dfdca9c5ce 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/eventviews/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/eventviews/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "eventviews"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/falkon/default.nix b/third_party/nixpkgs/pkgs/kde/gear/falkon/default.nix index bc8125b99e..daa26d9ce5 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/falkon/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/falkon/default.nix @@ -9,7 +9,16 @@ mkKdeDerivation { pname = "falkon"; - extraNativeBuildInputs = [qttools qtwebchannel qtwebengine]; - extraBuildInputs = [extra-cmake-modules qtwebchannel qtwebengine python3Packages.pyside6]; + extraNativeBuildInputs = [ + qttools + qtwebchannel + qtwebengine + ]; + extraBuildInputs = [ + extra-cmake-modules + qtwebchannel + qtwebengine + python3Packages.pyside6 + ]; meta.mainProgram = "falkon"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ffmpegthumbs/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ffmpegthumbs/default.nix index 62bd0e1037..71740192c4 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ffmpegthumbs/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ffmpegthumbs/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ffmpegthumbs"; - extraBuildInputs = [ffmpeg]; + extraBuildInputs = [ ffmpeg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/francis/default.nix b/third_party/nixpkgs/pkgs/kde/gear/francis/default.nix index 8e2494b65f..231eadcd85 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/francis/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/francis/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "francis"; - extraBuildInputs = [qtsvg knotifications]; + extraBuildInputs = [ + qtsvg + knotifications + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/granatier/default.nix b/third_party/nixpkgs/pkgs/kde/gear/granatier/default.nix index 1c8593258c..6f1f673c6f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/granatier/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/granatier/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "granatier"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "granatier"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/grantlee-editor/default.nix b/third_party/nixpkgs/pkgs/kde/gear/grantlee-editor/default.nix index a80ea7d8b9..4c82ad082c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/grantlee-editor/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/grantlee-editor/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "grantlee-editor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/grantleetheme/default.nix b/third_party/nixpkgs/pkgs/kde/gear/grantleetheme/default.nix index 5e21e92a54..5457d75b0f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/grantleetheme/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/grantleetheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "grantleetheme"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix b/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix index 4bbb5f98eb..71780b6bf9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "gwenview"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtwayland diff --git a/third_party/nixpkgs/pkgs/kde/gear/incidenceeditor/default.nix b/third_party/nixpkgs/pkgs/kde/gear/incidenceeditor/default.nix index cf8c1e7857..b5603c82ca 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/incidenceeditor/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/incidenceeditor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "incidenceeditor"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/isoimagewriter/default.nix b/third_party/nixpkgs/pkgs/kde/gear/isoimagewriter/default.nix index e9b41bcb84..e9dc082f32 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/isoimagewriter/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/isoimagewriter/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "isoimagewriter"; - extraBuildInputs = [qgpgme]; + extraBuildInputs = [ qgpgme ]; meta.mainProgram = "isoimagewriter"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/itinerary/default.nix b/third_party/nixpkgs/pkgs/kde/gear/itinerary/default.nix index ca1872662f..0b2292a2ad 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/itinerary/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/itinerary/default.nix @@ -10,9 +10,16 @@ mkKdeDerivation { pname = "itinerary"; # FIXME: this should really be fixed at ECM level somehow - patches = [./optional-runtime-dependencies.patch]; + patches = [ ./optional-runtime-dependencies.patch ]; - extraNativeBuildInputs = [pkg-config shared-mime-info]; - extraBuildInputs = [qtlocation qtpositioning libical]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + qtlocation + qtpositioning + libical + ]; meta.mainProgram = "itinerary"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/juk/default.nix b/third_party/nixpkgs/pkgs/kde/gear/juk/default.nix index 53eff6a9cc..c0bc805639 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/juk/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/juk/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "juk"; - extraBuildInputs = [qtsvg taglib]; + extraBuildInputs = [ + qtsvg + taglib + ]; meta.mainProgram = "juk"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/k3b/default.nix b/third_party/nixpkgs/pkgs/kde/gear/k3b/default.nix index ba4a1fc6aa..a11f03a633 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/k3b/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/k3b/default.nix @@ -25,7 +25,10 @@ mkKdeDerivation { pname = "k3b"; - extraNativeBuildInputs = [pkg-config shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; # FIXME: Musicbrainz 2.x???, musepack extraBuildInputs = [ @@ -40,20 +43,27 @@ mkKdeDerivation { ]; qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - cdrdao - cdrtools - dvdplusrwtools - libburn - normalize - sox - transcode - vcdimager - flac - ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + cdrdao + cdrtools + dvdplusrwtools + libburn + normalize + sox + transcode + vcdimager + flac + ] + }" # FIXME: this should really be done with patchelf --add-rpath, but it breaks the binary somehow - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ cdparanoia libdvdcss ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + cdparanoia + libdvdcss + ] + }" ]; meta.mainProgram = "k3b"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kaccounts-integration/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kaccounts-integration/default.nix index 1b927d3e01..06a4436ba1 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kaccounts-integration/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kaccounts-integration/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kaccounts-integration"; - propagatedNativeBuildInputs = [intltool]; + propagatedNativeBuildInputs = [ intltool ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kaccounts-providers/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kaccounts-providers/default.nix index 6cd2fd7e33..bf0ecf6783 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kaccounts-providers/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kaccounts-providers/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kaccounts-providers"; - extraNativeBuildInputs = [intltool]; - extraBuildInputs = [qtdeclarative qtwebengine]; + extraNativeBuildInputs = [ intltool ]; + extraBuildInputs = [ + qtdeclarative + qtwebengine + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kaddressbook/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kaddressbook/default.nix index a5ef9c659f..56039912bb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kaddressbook/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kaddressbook/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kaddressbook"; meta.mainProgram = "kaddressbook"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kajongg/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kajongg/default.nix index 651ac3b311..555c384b60 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kajongg/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kajongg/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "kajongg"; - extraBuildInputs = [qtsvg python3 python3.pkgs.twisted]; + extraBuildInputs = [ + qtsvg + python3 + python3.pkgs.twisted + ]; # FIXME: completely horked, is actually a Python app, needs a lot of fixing meta.broken = true; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kalarm/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kalarm/default.nix index f795cd3bf6..0a1dc35244 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kalarm/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kalarm/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kalarm"; - extraBuildInputs = [libcanberra libvlc]; + extraBuildInputs = [ + libcanberra + libvlc + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kalgebra/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kalgebra/default.nix index 89aaafc04c..1b3cd47fc9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kalgebra/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kalgebra/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "kalgebra"; - extraBuildInputs = [qtsvg qtwebengine ncurses readline]; + extraBuildInputs = [ + qtsvg + qtwebengine + ncurses + readline + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kalk/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kalk/default.nix index 511b0bdf06..6f339fe609 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kalk/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kalk/default.nix @@ -12,7 +12,11 @@ mkKdeDerivation { pname = "kalk"; - extraNativeBuildInputs = [pkg-config bison flex]; + extraNativeBuildInputs = [ + pkg-config + bison + flex + ]; extraBuildInputs = [ qtdeclarative kirigami-addons diff --git a/third_party/nixpkgs/pkgs/kde/gear/kalm/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kalm/default.nix index 0c4eee90bc..295084a63d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kalm/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kalm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kalm"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix index 1c45498294..7cdcd1efec 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kalzium/default.nix @@ -11,7 +11,15 @@ mkKdeDerivation { pname = "kalzium"; # FIXME: look into how to make it find libfacile - extraNativeBuildInputs = [pkg-config ocaml]; - extraBuildInputs = [eigen openbabel qtsvg qtscxml]; + extraNativeBuildInputs = [ + pkg-config + ocaml + ]; + extraBuildInputs = [ + eigen + openbabel + qtsvg + qtscxml + ]; meta.mainProgram = "kalzium"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kamera/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kamera/default.nix index 3ab21c99f4..d6f9be0bc9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kamera/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kamera/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kamera"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libgphoto2]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libgphoto2 ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kamoso/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kamoso/default.nix index b83e193f31..fa86b87f2f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kamoso/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kamoso/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kamoso"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/kanagram/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kanagram/default.nix index e7d3d7b443..aec99c0f32 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kanagram/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kanagram/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kanagram"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kanagram"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kapman/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kapman/default.nix index 61cfb1fdf3..abae489b60 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kapman/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kapman/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kapman"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kapman"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kapptemplate/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kapptemplate/default.nix index 9b4f350b1b..49b8dab441 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kapptemplate/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kapptemplate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapptemplate"; meta.mainProgram = "kapptemplate"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix index 2375bb00af..f95ea1c808 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix @@ -9,7 +9,7 @@ mkKdeDerivation { pname = "kasts"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtmultimedia diff --git a/third_party/nixpkgs/pkgs/kde/gear/kate/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kate/default.nix index 044b7b35e8..622787ac38 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kate/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kate"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/katomic/default.nix b/third_party/nixpkgs/pkgs/kde/gear/katomic/default.nix index e9dcd6ebe0..61d3d6e653 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/katomic/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/katomic/default.nix @@ -1,11 +1,11 @@ { mkKdeDerivation, - _7zz + _7zz, }: mkKdeDerivation { pname = "katomic"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "katomic"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kbackup/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kbackup/default.nix index 49e43996b9..4ccab6e8ca 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kbackup/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kbackup/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kbackup"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qt5compat libarchive]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ + qt5compat + libarchive + ]; meta.mainProgram = "kbackup"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kblackbox/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kblackbox/default.nix index 26156c9195..5d1147074e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kblackbox/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kblackbox/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kblackbox"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblackbox"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kblocks/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kblocks/default.nix index 1e4628b030..228e02beb8 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kblocks/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kblocks/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kblocks"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblocks"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kbounce/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kbounce/default.nix index e93c9e50d6..d816a91632 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kbounce/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kbounce/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kbounce"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kbounce"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kbreakout/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kbreakout/default.nix index 541ae0789e..29fb4eeadd 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kbreakout/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kbreakout/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kbreakout"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kbreakout"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kbruch/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kbruch/default.nix index 9533db2c30..d4e4c40b20 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kbruch/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kbruch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kbruch"; meta.mainProgram = "kbruch"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kcachegrind/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kcachegrind/default.nix index 52de8a88e6..d657c059ca 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kcachegrind/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kcachegrind/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "kcachegrind"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ graphviz ]}" diff --git a/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix index 28f1d314ce..645ececef8 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix @@ -8,6 +8,11 @@ mkKdeDerivation { pname = "kcalc"; - extraBuildInputs = [qt5compat gmp mpfr kdoctools]; + extraBuildInputs = [ + qt5compat + gmp + mpfr + kdoctools + ]; meta.mainProgram = "kcalc"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kcalutils/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kcalutils/default.nix index 1b58cce9ff..38f9951477 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kcalutils/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kcalutils/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcalutils"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kcharselect/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kcharselect/default.nix index 9ee054d933..3dae9bdfa8 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kcharselect/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kcharselect/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcharselect"; meta.mainProgram = "kcharselect"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kclock/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kclock/default.nix index 97db5fd92f..56ec55e885 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kclock/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kclock/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kclock"; - extraBuildInputs = [qtsvg qtmultimedia]; + extraBuildInputs = [ + qtsvg + qtmultimedia + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kcolorchooser/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kcolorchooser/default.nix index f4c5132800..f4f51cf516 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kcolorchooser/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kcolorchooser/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorchooser"; meta.mainProgram = "kcolorchooser"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kcron/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kcron/default.nix index b1707101d4..9278e6672d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kcron/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kcron/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcron"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kde-dev-scripts/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kde-dev-scripts/default.nix index 7e82f80b81..41dcc71d8c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kde-dev-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kde-dev-scripts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-dev-scripts"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kde-dev-utils/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kde-dev-utils/default.nix index 6efce8354e..98365e9f0c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kde-dev-utils/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kde-dev-utils/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-dev-utils"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kde-inotify-survey/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kde-inotify-survey/default.nix index 6e319b60c8..5ecc800aa9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kde-inotify-survey/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kde-inotify-survey/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-inotify-survey"; meta.mainProgram = "kde-inotify-survey"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdebugsettings/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdebugsettings/default.nix index 21477c6656..c2cceb3838 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdebugsettings/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdebugsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdebugsettings"; meta.mainProgram = "kdebugsettings"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix index c8575ee51e..3bc3abd422 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -27,8 +27,15 @@ mkKdeDerivation { echo "${sshfs}" > $out/nix-support/depends ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtconnectivity qtmultimedia qtwayland wayland wayland-protocols libfakekey]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtconnectivity + qtmultimedia + qtwayland + wayland + wayland-protocols + libfakekey + ]; extraCmakeFlags = [ "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdeedu-data/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdeedu-data/default.nix index 74bc392138..d47f41510a 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdeedu-data/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdeedu-data/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdeedu-data"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdegraphics-mobipocket/default.nix index 7636cbe1dd..56596b0537 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdegraphics-mobipocket/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdegraphics-mobipocket/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdegraphics-mobipocket"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdenetwork-filesharing/default.nix index a91dc25295..35292d554e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdenetwork-filesharing/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -5,10 +5,10 @@ mkKdeDerivation { pname = "kdenetwork-filesharing"; - patches = [./smbd-path.patch]; + patches = [ ./smbd-path.patch ]; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to - extraCmakeFlags = ["-DSAMBA_INSTALL=OFF"]; + extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix index 8c08272cd9..b9a6e32153 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix @@ -17,13 +17,11 @@ mkKdeDerivation { pname = "kdenlive"; patches = [ - ( - substituteAll { - src = ./dependency-paths.patch; - inherit mediainfo mlt glaxnimate; - ffmpeg = ffmpeg-full; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + inherit mediainfo mlt glaxnimate; + ffmpeg = ffmpeg-full; + }) ]; extraNativeBuildInputs = [ shared-mime-info ]; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix index 4c59f3f551..4b800b7c19 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix @@ -31,5 +31,9 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [discount corrosion alpaka]; + extraBuildInputs = [ + discount + corrosion + alpaka + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdepim-runtime/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdepim-runtime/default.nix index a4c2f81afb..e3cd581afc 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdepim-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdepim-runtime/default.nix @@ -14,11 +14,26 @@ mkKdeDerivation { pname = "kdepim-runtime"; - extraNativeBuildInputs = [pkg-config shared-mime-info libxslt]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + libxslt + ]; # FIXME: libkolabxml - extraBuildInputs = [qtnetworkauth qtspeech qtwebengine cyrus_sasl libetebase]; + extraBuildInputs = [ + qtnetworkauth + qtspeech + qtwebengine + cyrus_sasl + libetebase + ]; qtWrapperArgs = [ - "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl.out libkgapi ]}" + "--prefix SASL_PATH : ${ + lib.makeSearchPath "lib/sasl2" [ + cyrus_sasl.out + libkgapi + ] + }" ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdesdk-kio/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdesdk-kio/default.nix index 1ec970a818..24a4601ddb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdesdk-kio/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdesdk-kio/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdesdk-kio"; - extraNativeBuildInputs = [perl]; + extraNativeBuildInputs = [ perl ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdesdk-thumbnailers/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdesdk-thumbnailers/default.nix index 727fff83b3..47673f9bed 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdesdk-thumbnailers/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdesdk-thumbnailers/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesdk-thumbnailers"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdev-php/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdev-php/default.nix index 861bc9615b..285c51170c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdev-php/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdev-php/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdev-php"; - extraNativeBuildInputs = [kdevelop-pg-qt]; + extraNativeBuildInputs = [ kdevelop-pg-qt ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdev-python/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdev-python/default.nix index 6ddeff1b58..23901bb4d7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdev-python/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdev-python/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdev-python"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdf/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdf/default.nix index 8021e701cb..f4350dc606 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdf/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdf"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdialog/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdialog/default.nix index 2ef1266505..c1f96a49b1 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdialog/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdialog/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdialog"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdiamond/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdiamond/default.nix index 1636a80fd7..11e0dbf40f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdiamond/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdiamond/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdiamond"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kdiamond"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/keditbookmarks/default.nix b/third_party/nixpkgs/pkgs/kde/gear/keditbookmarks/default.nix index 8eec9c76ec..4308c79cce 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/keditbookmarks/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/keditbookmarks/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "keditbookmarks"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/keysmith/default.nix b/third_party/nixpkgs/pkgs/kde/gear/keysmith/default.nix index 4d96f630a6..e01b7a61e2 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/keysmith/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/keysmith/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "keysmith"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg libsodium]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + libsodium + ]; meta.mainProgram = "keysmith"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kfind/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kfind/default.nix index b652b790eb..d1e8159132 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kfind/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kfind/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kfind"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "kfind"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kfourinline/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kfourinline/default.nix index 2c77d372fc..1bd6606b2c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kfourinline/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kfourinline/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kfourinline"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kgeography/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kgeography/default.nix index 560faec8e0..c2c04553c2 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kgeography/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kgeography/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kgeography"; meta.mainProgram = "kgeography"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kget/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kget/default.nix index e88cd601bb..412d0a3c0b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kget/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kget/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kget"; - extraBuildInputs = [qgpgme libmms]; + extraBuildInputs = [ + qgpgme + libmms + ]; meta.mainProgram = "kget"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kgoldrunner/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kgoldrunner/default.nix index ba82b55ccc..10a0634e1b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kgoldrunner/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kgoldrunner/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kgoldrunner"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kgoldrunner"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kgpg/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kgpg/default.nix index 2b974de512..d2979a933a 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kgpg/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kgpg/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kgpg"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [gpgme]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ gpgme ]; meta.mainProgram = "kgpg"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kgraphviewer/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kgraphviewer/default.nix index de47a29cb6..560d468592 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kgraphviewer/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kgraphviewer/default.nix @@ -10,5 +10,10 @@ mkKdeDerivation { pname = "kgraphviewer"; extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ qt5compat qtsvg boost graphviz ]; + extraBuildInputs = [ + qt5compat + qtsvg + boost + graphviz + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/khangman/default.nix b/third_party/nixpkgs/pkgs/kde/gear/khangman/default.nix index e3f95b7a6a..460baf5276 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/khangman/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/khangman/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "khangman"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "khangman"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/khealthcertificate/default.nix b/third_party/nixpkgs/pkgs/kde/gear/khealthcertificate/default.nix index 6d5461bffc..ef4b1ab166 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/khealthcertificate/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/khealthcertificate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "khealthcertificate"; - extraNativeBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/khelpcenter/default.nix b/third_party/nixpkgs/pkgs/kde/gear/khelpcenter/default.nix index 231d1036b0..2348754b71 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/khelpcenter/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/khelpcenter/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "khelpcenter"; - extraBuildInputs = [qtwebengine xapian]; + extraBuildInputs = [ + qtwebengine + xapian + ]; meta.mainProgram = "khelpcenter"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kidentitymanagement/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kidentitymanagement/default.nix index c66c416fd7..bfcfa3f196 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kidentitymanagement/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kidentitymanagement/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kidentitymanagement"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kig/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kig/default.nix index a3e4de99e6..8a17616443 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kig/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kig/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kig"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/kigo/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kigo/default.nix index 4fd00e721f..6c2f4a1793 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kigo/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kigo/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kigo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kigo"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/killbots/default.nix b/third_party/nixpkgs/pkgs/kde/gear/killbots/default.nix index 592cb97ba6..71853ae6eb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/killbots/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/killbots/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "killbots"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "killbots"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kimagemapeditor/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kimagemapeditor/default.nix index 71efc86fd2..9341cf5ab4 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kimagemapeditor/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kimagemapeditor/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kimagemapeditor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; meta.mainProgram = "kimagemapeditor"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kimap/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kimap/default.nix index d106166ec4..3f5bc44960 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kimap/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kimap/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kimap"; - extraBuildInputs = [cyrus_sasl]; + extraBuildInputs = [ cyrus_sasl ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kio-admin/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kio-admin/default.nix index 0422539789..7734ac0492 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kio-admin/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kio-admin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-admin"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix index 79a5cb405a..2260feeac6 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix @@ -19,7 +19,11 @@ mkKdeDerivation { pname = "kio-extras"; - extraNativeBuildInputs = [pkg-config gperf shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + gperf + shared-mime-info + ]; extraBuildInputs = [ qt5compat qtsvg diff --git a/third_party/nixpkgs/pkgs/kde/gear/kio-gdrive/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kio-gdrive/default.nix index 1c28dd3dcd..3fc930a316 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kio-gdrive/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kio-gdrive/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-gdrive"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kio-zeroconf/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kio-zeroconf/default.nix index 0b731162af..8a1d91bbb1 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kio-zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kio-zeroconf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-zeroconf"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kirigami-gallery/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kirigami-gallery/default.nix index d9e1e12367..bb739046ba 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kirigami-gallery/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kirigami-gallery/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kirigami-gallery"; - extraNativeBuildInputs = [qtsvg qttools]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kiriki/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kiriki/default.nix index 50d04e49e9..91290cbc3a 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kiriki/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kiriki/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiriki"; meta.mainProgram = "kiriki"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kiten/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kiten/default.nix index 5f87c6c66b..d6eeab96eb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kiten/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kiten/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiten"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kitinerary/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kitinerary/default.nix index de3f4ef000..28710c095f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kitinerary/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kitinerary/default.nix @@ -10,7 +10,7 @@ mkKdeDerivation { pname = "kitinerary"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; extraBuildInputs = [ qtsvg qtdeclarative diff --git a/third_party/nixpkgs/pkgs/kde/gear/kjournald/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kjournald/default.nix index 879e698db4..f902fba1e0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kjournald/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kjournald/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kjournald"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtdeclarative + systemd + ]; meta.mainProgram = "kjournaldbrowser"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix index 0141748b39..65ae1386cf 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kjumpingcube"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kjumpingcube"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kldap/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kldap/default.nix index 99c17b1691..7c3e9b9600 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kldap/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kldap/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kldap"; - extraBuildInputs = [cyrus_sasl openldap]; + extraBuildInputs = [ + cyrus_sasl + openldap + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kleopatra/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kleopatra/default.nix index 58d3f4b5a9..560ab8fb71 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kleopatra/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kleopatra/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kleopatra"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [akonadi-mime]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ akonadi-mime ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/klettres/default.nix b/third_party/nixpkgs/pkgs/kde/gear/klettres/default.nix index ef6305d0f1..b01e228783 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/klettres/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/klettres/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "klettres"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "klettres"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/klickety/default.nix b/third_party/nixpkgs/pkgs/kde/gear/klickety/default.nix index 339fa31003..a0d214f3e7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/klickety/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/klickety/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klickety"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klickety"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/klines/default.nix b/third_party/nixpkgs/pkgs/kde/gear/klines/default.nix index 52bb95c0d7..fe39ba8544 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/klines/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/klines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klines"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmag/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmag/default.nix index 3d8046715d..0650d3bd76 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmag/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmag/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmag"; meta.mainProgram = "kmag"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmahjongg/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmahjongg/default.nix index 9d01f435be..1816b16f28 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmahjongg/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmahjongg/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kmahjongg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkmahjongg}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkmahjongg}/share" ]; meta.mainProgram = "kmahjongg"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmail-account-wizard/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmail-account-wizard/default.nix index acd23f72d6..88e790f1a9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmail-account-wizard/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmail-account-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail-account-wizard"; meta.mainProgram = "accountwizard"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmail/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmail/default.nix index f3f659fbaf..ce38c7d15f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmail/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmail/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmailtransport/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmailtransport/default.nix index cf1bf8c1b2..7953ec021b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmailtransport/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmailtransport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmailtransport"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmbox/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmbox/default.nix index ef840d3eda..9f1a0ef7c4 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmbox/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmbox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmbox"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmime/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmime/default.nix index a2beb4fdf5..3001856434 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmime/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmime/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kmime"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [ki18n]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ ki18n ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmines/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmines/default.nix index 687cf0d294..243fd722e9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmines/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kmines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kmines"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmix/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmix/default.nix index b83392baa7..8c6e1a3c4b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmix/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmix/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmix"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmousetool/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmousetool/default.nix index 78a73e4576..7eca9ab12c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmousetool/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmousetool/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kmousetool"; - extraBuildInputs = [qtmultimedia xorg.libXt]; + extraBuildInputs = [ + qtmultimedia + xorg.libXt + ]; meta.mainProgram = "kmousetool"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmouth/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmouth/default.nix index 9abffa1d2d..098f8a5ec3 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmouth/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmouth/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmouth"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kmouth"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kmplot/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kmplot/default.nix index b389417657..6830d3edea 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kmplot/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kmplot/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmplot"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kmplot"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix b/third_party/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix index abd9281ff5..a04c8dee5b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "knavalbattle"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knavalbattle"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/knetwalk/default.nix b/third_party/nixpkgs/pkgs/kde/gear/knetwalk/default.nix index 265e6d32f5..36305d57cc 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/knetwalk/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/knetwalk/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "knetwalk"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knetwalk"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/knights/default.nix b/third_party/nixpkgs/pkgs/kde/gear/knights/default.nix index 4deca218d0..2fd61dc79f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/knights/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/knights/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "knights"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg qtspeech]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + qtspeech + ]; meta.mainProgram = "knights"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix b/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix index 1241f68e12..e823a6cff1 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix @@ -7,7 +7,8 @@ qtsvg, exiv2, kirigami-addons, -}: let +}: +let # URLs snapshotted through # https://web.archive.org/save/$url # Update when stale enough I guess? @@ -24,22 +25,22 @@ sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; }; in - mkKdeDerivation { - pname = "koko"; +mkKdeDerivation { + pname = "koko"; - prePatch = '' - ln -s ${admin1} src/admin1CodesASCII.txt - ln -s ${admin2} src/admin2Codes.txt - ln -s ${cities1000} src/cities1000.zip - ''; + prePatch = '' + ln -s ${admin1} src/admin1CodesASCII.txt + ln -s ${admin2} src/admin2Codes.txt + ln -s ${cities1000} src/cities1000.zip + ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtmultimedia - qtpositioning - qtsvg - exiv2 - kirigami-addons - ]; - meta.mainProgram = "koko"; - } + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtpositioning + qtsvg + exiv2 + kirigami-addons + ]; + meta.mainProgram = "koko"; +} diff --git a/third_party/nixpkgs/pkgs/kde/gear/kolf/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kolf/default.nix index 39657f077a..020ffdad5c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kolf/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kolf/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kolf"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kolf"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kollision/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kollision/default.nix index 299549d475..f8924cb689 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kollision/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kollision/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kollision"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kollision"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kolourpaint/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kolourpaint/default.nix index 7cf5583345..752be8e2bd 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kolourpaint/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kolourpaint/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kolourpaint"; meta.mainProgram = "kolourpaint"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kompare/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kompare/default.nix index 32bcaf2401..223db62393 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kompare/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kompare/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kompare"; meta.mainProgram = "kompare"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kongress/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kongress/default.nix index e91c9cf590..c82cb663f3 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kongress/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kongress/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "kongress"; - extraBuildInputs = [kcontacts qtsvg qtlocation]; + extraBuildInputs = [ + kcontacts + qtsvg + qtlocation + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/konqueror/default.nix b/third_party/nixpkgs/pkgs/kde/gear/konqueror/default.nix index 9ae274fc84..5bd29359e9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/konqueror/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/konqueror/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "konqueror"; - extraNativeBuildInputs = [hunspell]; - extraBuildInputs = [qtwebengine]; + extraNativeBuildInputs = [ hunspell ]; + extraBuildInputs = [ qtwebengine ]; extraCmakeFlags = [ "-DWebEngineDictConverter_EXECUTABLE=${qtwebengine}/libexec/qwebengine_convert_dict" diff --git a/third_party/nixpkgs/pkgs/kde/gear/konquest/default.nix b/third_party/nixpkgs/pkgs/kde/gear/konquest/default.nix index 538428d84c..3b7cfbf59e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/konquest/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/konquest/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "konquest"; - extraBuildInputs = [qtscxml qtsvg]; + extraBuildInputs = [ + qtscxml + qtsvg + ]; meta.mainProgram = "konquest"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/konsole/default.nix b/third_party/nixpkgs/pkgs/kde/gear/konsole/default.nix index 65a94bb190..0e95e6a045 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/konsole/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/konsole/default.nix @@ -6,7 +6,10 @@ mkKdeDerivation { pname = "konsole"; - extraBuildInputs = [qt5compat qtmultimedia]; + extraBuildInputs = [ + qt5compat + qtmultimedia + ]; meta.mainProgram = "konsole"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kontactinterface/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kontactinterface/default.nix index 4c7d6acab1..1f81eda91e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kontactinterface/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kontactinterface/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kontactinterface"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kontrast/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kontrast/default.nix index 1ad85ad648..6d3ef5d3ad 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kontrast/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kontrast/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kontrast"; - extraBuildInputs = [qtsvg qcoro]; + extraBuildInputs = [ + qtsvg + qcoro + ]; meta.mainProgram = "kontrast"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/konversation/default.nix b/third_party/nixpkgs/pkgs/kde/gear/konversation/default.nix index ba58215e30..b78bb62f62 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/konversation/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/konversation/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "konversation"; - extraBuildInputs = [qt5compat]; - extraNativeBuildInputs = [qtmultimedia qttools]; + extraBuildInputs = [ qt5compat ]; + extraNativeBuildInputs = [ + qtmultimedia + qttools + ]; meta.mainProgram = "konversation"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix index 7ba5214ac0..7cb81e62ee 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix @@ -9,7 +9,10 @@ mkKdeDerivation { pname = "kopeninghours"; - extraNativeBuildInputs = [bison flex]; + extraNativeBuildInputs = [ + bison + flex + ]; extraBuildInputs = [ qtdeclarative (boost.override { diff --git a/third_party/nixpkgs/pkgs/kde/gear/korganizer/default.nix b/third_party/nixpkgs/pkgs/kde/gear/korganizer/default.nix index c20e6625e1..1733124818 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/korganizer/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/korganizer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "korganizer"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; meta.mainProgram = "korganizer"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kosmindoormap/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kosmindoormap/default.nix index 37f991a7ad..26ad094274 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kosmindoormap/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kosmindoormap/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kosmindoormap"; - extraNativeBuildInputs = [bison flex]; - extraBuildInputs = [recastnavigation]; + extraNativeBuildInputs = [ + bison + flex + ]; + extraBuildInputs = [ recastnavigation ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kpat/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kpat/default.nix index e770f59357..0462c8c4f9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kpat/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kpat/default.nix @@ -10,13 +10,16 @@ mkKdeDerivation { pname = "kpat"; - extraNativeBuildInputs = [_7zz shared-mime-info]; + extraNativeBuildInputs = [ + _7zz + shared-mime-info + ]; extraBuildInputs = [ qtsvg black-hole-solver freecell-solver ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkdegames}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkdegames}/share" ]; meta.mainProgram = "kpat"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kpimtextedit/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kpimtextedit/default.nix index 0c33280cc0..f24c126f46 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kpimtextedit/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kpimtextedit/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpimtextedit"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kpkpass/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kpkpass/default.nix index a2f116f67d..6628733004 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kpkpass/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kpkpass/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpkpass"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix index 9dfa4f3d68..3da512e170 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kpmcore/default.nix @@ -24,7 +24,8 @@ udftools, xfsprogs, zfs, -}: let +}: +let # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h runtimeDeps = [ cryptsetup @@ -54,21 +55,23 @@ # FIXME: audit to see if these are all still required ]; - trustedprefixes = writeText "kpmcore-trustedprefixes" (lib.concatStringsSep "\n" (map lib.getBin runtimeDeps)); + trustedprefixes = writeText "kpmcore-trustedprefixes" ( + lib.concatStringsSep "\n" (map lib.getBin runtimeDeps) + ); in - mkKdeDerivation { - pname = "kpmcore"; +mkKdeDerivation { + pname = "kpmcore"; - postPatch = '' - cp ${trustedprefixes} src/util/trustedprefixes - ''; + postPatch = '' + cp ${trustedprefixes} src/util/trustedprefixes + ''; - preConfigure = '' - substituteInPlace src/util/CMakeLists.txt \ - --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions - substituteInPlace src/backend/corebackend.cpp \ - --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy - ''; + preConfigure = '' + substituteInPlace src/util/CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + substituteInPlace src/backend/corebackend.cpp \ + --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy + ''; - extraNativeBuildInputs = [pkg-config]; - } + extraNativeBuildInputs = [ pkg-config ]; +} diff --git a/third_party/nixpkgs/pkgs/kde/gear/kpublictransport/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kpublictransport/default.nix index bc1a663b77..40f0587d30 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kpublictransport/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kpublictransport/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kpublictransport"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kqtquickcharts/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kqtquickcharts/default.nix index 682cd0531b..310b50170b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kqtquickcharts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kqtquickcharts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kqtquickcharts"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/krdc/default.nix b/third_party/nixpkgs/pkgs/kde/gear/krdc/default.nix index e589de328b..f54d123644 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/krdc/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/krdc/default.nix @@ -9,8 +9,13 @@ mkKdeDerivation { pname = "krdc"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libssh libvncserver freerdp]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libssh + libvncserver + freerdp + ]; meta.mainProgram = "krdc"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/krecorder/default.nix b/third_party/nixpkgs/pkgs/kde/gear/krecorder/default.nix index a975f1b956..04d9d4c058 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/krecorder/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/krecorder/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "krecorder"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "krecorder"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kreversi/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kreversi/default.nix index 3f5591c299..4b15b9c1a8 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kreversi/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kreversi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kreversi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kreversi"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/krfb/default.nix b/third_party/nixpkgs/pkgs/kde/gear/krfb/default.nix index 3ab41fcc4f..808067fb00 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/krfb/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/krfb/default.nix @@ -13,6 +13,11 @@ mkKdeDerivation { "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libvncserver + pipewire + xorg.libXdamage + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kross-interpreters/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kross-interpreters/default.nix index 4040fa401e..186c4bc67c 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kross-interpreters/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kross-interpreters/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kross-interpreters"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; # FIXME(qt5) meta.broken = true; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kruler/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kruler/default.nix index 9eb9a917fc..9a21899a18 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kruler/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kruler/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kruler"; meta.mainProgram = "kruler"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/ksanecore/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ksanecore/default.nix index 7f7e63fb2c..36b7b1b458 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ksanecore/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ksanecore/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksanecore"; - extraBuildInputs = [sane-backends]; + extraBuildInputs = [ sane-backends ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kshisen/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kshisen/default.nix index 3859610e0f..7d41717f9b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kshisen/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kshisen/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kshisen"; meta.mainProgram = "kshisen"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/ksirk/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ksirk/default.nix index 5c4196a7af..2123d3d54a 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ksirk/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ksirk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksirk"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ksmtp/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ksmtp/default.nix index c098ddd49c..290456b327 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ksmtp/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ksmtp/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksmtp"; - extraBuildInputs = [qt5compat cyrus_sasl]; + extraBuildInputs = [ + qt5compat + cyrus_sasl + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ksnakeduel/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ksnakeduel/default.nix index 3f07eaa0e4..a5e656fa42 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ksnakeduel/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ksnakeduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ksnakeduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "ksnakeduel"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kspaceduel/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kspaceduel/default.nix index 34194d2322..28e0f9f256 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kspaceduel/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kspaceduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kspaceduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kspaceduel"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ksquares/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ksquares/default.nix index 8dfbcf0024..b13cd0c56f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ksquares/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ksquares/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksquares"; meta.mainProgram = "ksquares"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/ksudoku/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ksudoku/default.nix index 15ac4e2ce4..4b6841bf1b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ksudoku/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ksudoku/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "ksudoku"; - extraBuildInputs = [qtsvg]; - extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "ksudoku"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ksystemlog/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ksystemlog/default.nix index 772a4f54b0..6594c685e1 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ksystemlog/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ksystemlog/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "ksystemlog"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qt5compat audit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qt5compat + audit + ]; meta.mainProgram = "ksystemlog"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kteatime/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kteatime/default.nix index 408bc14883..ac7056109d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kteatime/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kteatime/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kteatime"; meta.mainProgram = "kteatime"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/ktimer/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ktimer/default.nix index 1b46f8b72c..714643cc40 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ktimer/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ktimer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktimer"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "ktimer"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ktnef/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ktnef/default.nix index 7fcd568ade..81bd5c70b6 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ktnef/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ktnef/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktnef"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ktorrent/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ktorrent/default.nix index 92e0646e69..ae1d8aedfd 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ktorrent/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ktorrent/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktorrent"; - extraBuildInputs = [qtwebengine taglib libmaxminddb]; + extraBuildInputs = [ + qtwebengine + taglib + libmaxminddb + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ktouch/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ktouch/default.nix index 7f744a9f79..6955dc3f04 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ktouch/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ktouch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktouch"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/ktrip/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ktrip/default.nix index 0f8b001c7d..feb8f5c54a 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ktrip/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ktrip/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktrip"; meta.mainProgram = "ktrip"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/ktuberling/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ktuberling/default.nix index 100301670b..278f7f823d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ktuberling/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ktuberling/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktuberling"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "ktuberling"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kturtle/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kturtle/default.nix index 8997c051b1..aa628c1121 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kturtle/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kturtle/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kturtle"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kturtle"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kubrick/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kubrick/default.nix index a194ebae5b..27648efe83 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kubrick/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kubrick/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kubrick"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg libGLU]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + libGLU + ]; meta.mainProgram = "kubrick"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kwalletmanager/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kwalletmanager/default.nix index 4ce00339a2..466d42129e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kwalletmanager/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kwalletmanager/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwalletmanager"; meta.mainProgram = "kwalletmanager5"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kwave/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kwave/default.nix index 1c0f82ac7b..0c0fa7aca5 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kwave/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kwave/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwave"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/kweather/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kweather/default.nix index 53e122c98f..20d4c8a1e6 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kweather/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kweather/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "kweather"; - extraBuildInputs = [qtsvg qtcharts kholidays]; + extraBuildInputs = [ + qtsvg + qtcharts + kholidays + ]; meta.mainProgram = "kweather"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libgravatar/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libgravatar/default.nix index ddbdfa6dc6..fe2fddb9f0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libgravatar/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libgravatar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libgravatar"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkcddb/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkcddb/default.nix index 8325f19ced..fea14f50c6 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkcddb/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkcddb/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcddb"; - extraBuildInputs = [libmusicbrainz5]; + extraBuildInputs = [ libmusicbrainz5 ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkcompactdisc/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkcompactdisc/default.nix index 66615d3791..bbe58fc00a 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkcompactdisc/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkcompactdisc/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcompactdisc"; - extraBuildInputs = [alsa-lib]; + extraBuildInputs = [ alsa-lib ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkdcraw/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkdcraw/default.nix index df6717b22d..883d86f3b1 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkdcraw/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkdcraw/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "libkdcraw"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libraw]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libraw ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkdegames/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkdegames/default.nix index 95a0265f08..81325c1283 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkdegames/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkdegames/default.nix @@ -10,6 +10,14 @@ mkKdeDerivation { pname = "libkdegames"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [openal libsndfile qtdeclarative qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ + openal + libsndfile + qtdeclarative + qtsvg + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkdepim/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkdepim/default.nix index d682c45225..fc9d3f3d63 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkdepim/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkdepim/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkdepim"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkeduvocdocument/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkeduvocdocument/default.nix index f67c4e0ba4..3a68dabf46 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkeduvocdocument/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkeduvocdocument/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libkeduvocdocument"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkexiv2/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkexiv2/default.nix index fa5cb7851e..c6d1d034e5 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkexiv2/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkexiv2"; - extraBuildInputs = [qt5compat exiv2]; - extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qt5compat + exiv2 + ]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkgapi/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkgapi/default.nix index 87d3beb23c..43322955a2 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkgapi/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkgapi/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libkgapi"; - extraBuildInputs = [qttools cyrus_sasl]; + extraBuildInputs = [ + qttools + cyrus_sasl + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkleo/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkleo/default.nix index 47cd88fee5..e6a01bfdc7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkleo/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkleo/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkleo"; - extraBuildInputs = [qt5compat boost]; - extraPropagatedBuildInputs = [qgpgme]; + extraBuildInputs = [ + qt5compat + boost + ]; + extraPropagatedBuildInputs = [ qgpgme ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkmahjongg/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkmahjongg/default.nix index f411605318..5a736622be 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkmahjongg/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkmahjongg/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkmahjongg"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libkomparediff2/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libkomparediff2/default.nix index 43cccc1960..c7b15720d8 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libkomparediff2/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libkomparediff2/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkomparediff2"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libksane/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libksane/default.nix index 319d47b8b2..a5a67b0123 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libksane/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libksane/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libksane"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libksieve/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libksieve/default.nix index cec2f027b7..e36d899568 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libksieve/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libksieve/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libksieve"; - extraBuildInputs = [qtwebengine cyrus_sasl]; + extraBuildInputs = [ + qtwebengine + cyrus_sasl + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/libktorrent/default.nix b/third_party/nixpkgs/pkgs/kde/gear/libktorrent/default.nix index 263cbb3cad..c802f01111 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/libktorrent/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/libktorrent/default.nix @@ -9,7 +9,11 @@ mkKdeDerivation { pname = "libktorrent"; - extraNativeBuildInputs = [doxygen]; - extraBuildInputs = [qt5compat]; - extraPropagatedBuildInputs = [boost gmp libgcrypt]; + extraNativeBuildInputs = [ doxygen ]; + extraBuildInputs = [ qt5compat ]; + extraPropagatedBuildInputs = [ + boost + gmp + libgcrypt + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/lokalize/default.nix b/third_party/nixpkgs/pkgs/kde/gear/lokalize/default.nix index b92c8e9fb5..28fd327349 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/lokalize/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/lokalize/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "lokalize"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [hunspell]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ hunspell ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/lskat/default.nix b/third_party/nixpkgs/pkgs/kde/gear/lskat/default.nix index eefb95f9e1..84b7c2715d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/lskat/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/lskat/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "lskat"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "lskat"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/mailcommon/default.nix b/third_party/nixpkgs/pkgs/kde/gear/mailcommon/default.nix index a82e6adb26..51a702ac9d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/mailcommon/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/mailcommon/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "mailcommon"; - extraNativeBuildInputs = [libxslt]; - extraBuildInputs = [qtwebengine qttools]; + extraNativeBuildInputs = [ libxslt ]; + extraBuildInputs = [ + qtwebengine + qttools + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/mailimporter/default.nix b/third_party/nixpkgs/pkgs/kde/gear/mailimporter/default.nix index d43e0a2288..f9b3c490b9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/mailimporter/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/mailimporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mailimporter"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/marble/default.nix b/third_party/nixpkgs/pkgs/kde/gear/marble/default.nix index 1f6e574ed3..d2ecc7ae50 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/marble/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/marble/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "marble"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/markdownpart/default.nix b/third_party/nixpkgs/pkgs/kde/gear/markdownpart/default.nix index e40b6d03f8..962be3a91b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/markdownpart/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/markdownpart/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "markdownpart"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/massif-visualizer/default.nix b/third_party/nixpkgs/pkgs/kde/gear/massif-visualizer/default.nix index 27eb0515ee..04b958217e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/massif-visualizer/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/massif-visualizer/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "massif-visualizer"; - extraBuildInputs = [ qt5compat qtsvg ]; + extraBuildInputs = [ + qt5compat + qtsvg + ]; extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/mbox-importer/default.nix b/third_party/nixpkgs/pkgs/kde/gear/mbox-importer/default.nix index 44092f401a..3e28187b3d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/mbox-importer/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/mbox-importer/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mbox-importer"; meta.mainProgram = "mboximporter"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/merkuro/default.nix b/third_party/nixpkgs/pkgs/kde/gear/merkuro/default.nix index 7ad2c3637f..ec149aea4b 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/merkuro/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/merkuro/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "merkuro"; - extraBuildInputs = [qtsvg libplasma]; + extraBuildInputs = [ + qtsvg + libplasma + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/messagelib/default.nix b/third_party/nixpkgs/pkgs/kde/gear/messagelib/default.nix index 47058be348..db8f4e04f0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/messagelib/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/messagelib/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "messagelib"; - extraPropagatedBuildInputs = [qtwebengine]; + extraPropagatedBuildInputs = [ qtwebengine ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/mimetreeparser/default.nix b/third_party/nixpkgs/pkgs/kde/gear/mimetreeparser/default.nix index 3bebd8aee7..67c271ad26 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/mimetreeparser/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/mimetreeparser/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "mimetreeparser"; - extraBuildInputs = [qt5compat qtdeclarative qgpgme]; + extraBuildInputs = [ + qt5compat + qtdeclarative + qgpgme + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/minuet/default.nix b/third_party/nixpkgs/pkgs/kde/gear/minuet/default.nix index 05e80a5901..347d2cd7e9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/minuet/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/minuet/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "minuet"; - extraBuildInputs = [qtdeclarative qtsvg fluidsynth]; + extraBuildInputs = [ + qtdeclarative + qtsvg + fluidsynth + ]; meta.mainProgram = "minuet"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/neochat/default.nix b/third_party/nixpkgs/pkgs/kde/gear/neochat/default.nix index a45aa2c328..56c96f2245 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/neochat/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/neochat/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "neochat"; - extraBuildInputs = [qtlocation qtwebview kunifiedpush]; + extraBuildInputs = [ + qtlocation + qtwebview + kunifiedpush + ]; meta.mainProgram = "neochat"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/okular/default.nix b/third_party/nixpkgs/pkgs/kde/gear/okular/default.nix index e500709a28..b6048d9611 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/okular/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/okular/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "okular"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtspeech qtsvg diff --git a/third_party/nixpkgs/pkgs/kde/gear/palapeli/default.nix b/third_party/nixpkgs/pkgs/kde/gear/palapeli/default.nix index 144ef589e5..f6a96aed4f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/palapeli/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/palapeli/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "palapeli"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "palapeli"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/parley/default.nix b/third_party/nixpkgs/pkgs/kde/gear/parley/default.nix index 35342dd958..e2a275c4c0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/parley/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/parley/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "parley"; - extraBuildInputs = [qtsvg qtmultimedia qtwebengine]; + extraBuildInputs = [ + qtsvg + qtmultimedia + qtwebengine + ]; meta.mainProgram = "parley"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/partitionmanager/default.nix b/third_party/nixpkgs/pkgs/kde/gear/partitionmanager/default.nix index 68cb09a01a..9f36e91df5 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/partitionmanager/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/partitionmanager/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "partitionmanager"; - propagatedUserEnvPkgs = [kpmcore]; + propagatedUserEnvPkgs = [ kpmcore ]; passthru = { inherit kpmcore; diff --git a/third_party/nixpkgs/pkgs/kde/gear/picmi/default.nix b/third_party/nixpkgs/pkgs/kde/gear/picmi/default.nix index 341cd3922a..aa7bf73fe9 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/picmi/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/picmi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "picmi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "picmi"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/pim-data-exporter/default.nix b/third_party/nixpkgs/pkgs/kde/gear/pim-data-exporter/default.nix index da2097f467..162a2524f8 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/pim-data-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/pim-data-exporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-data-exporter"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/pim-sieve-editor/default.nix b/third_party/nixpkgs/pkgs/kde/gear/pim-sieve-editor/default.nix index 5cc193d0d7..323ec35e76 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/pim-sieve-editor/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/pim-sieve-editor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-sieve-editor"; meta.mainProgram = "sieveeditor"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/pimcommon/default.nix b/third_party/nixpkgs/pkgs/kde/gear/pimcommon/default.nix index 9ef947dde6..853c6e0afb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/pimcommon/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/pimcommon/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "pimcommon"; - extraBuildInputs = [qttools]; - extraNativeBuildInputs = [libxslt]; + extraBuildInputs = [ qttools ]; + extraNativeBuildInputs = [ libxslt ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix b/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix index 63236fe00d..46b32c5790 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix @@ -10,9 +10,18 @@ mkKdeDerivation { pname = "plasmatube"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + qtsvg + mpv-unwrapped + ]; - qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])]; + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ yt-dlp ]) + ]; meta.mainProgram = "plasmatube"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/poxml/default.nix b/third_party/nixpkgs/pkgs/kde/gear/poxml/default.nix index 963f050296..508d311dbc 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/poxml/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/poxml/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "poxml"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/qmlkonsole/default.nix b/third_party/nixpkgs/pkgs/kde/gear/qmlkonsole/default.nix index 9be6552020..470752ffd7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/qmlkonsole/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/qmlkonsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "qmlkonsole"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "qmlkonsole"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/rocs/default.nix b/third_party/nixpkgs/pkgs/kde/gear/rocs/default.nix index 73e7143f8d..0e368461a7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/rocs/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/rocs/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "rocs"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; # FIXME(qt5) meta.broken = true; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/signon-kwallet-extension/default.nix b/third_party/nixpkgs/pkgs/kde/gear/signon-kwallet-extension/default.nix index 15900552d5..ec954b9873 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/signon-kwallet-extension/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/signon-kwallet-extension/default.nix @@ -6,11 +6,11 @@ mkKdeDerivation { pname = "signon-kwallet-extension"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [signond]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ signond ]; # NB: not actually broken, just makes it install to $out instead of $signon/lib/extensions # This is useless without a wrapped signond. # FIXME: wrap signond with SSO_EXTENSIONS_DIR=$wrapper/lib/extensions - extraCmakeFlags = ["-DINSTALL_BROKEN_SIGNON_EXTENSION=1"]; + extraCmakeFlags = [ "-DINSTALL_BROKEN_SIGNON_EXTENSION=1" ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/skanlite/default.nix b/third_party/nixpkgs/pkgs/kde/gear/skanlite/default.nix index 4a9c26e415..20fff8d8c1 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/skanlite/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/skanlite/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "skanlite"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "skanlite"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/skanpage/default.nix b/third_party/nixpkgs/pkgs/kde/gear/skanpage/default.nix index c855041220..4c9e104220 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/skanpage/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/skanpage/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, qtwebengine, - tesseractLanguages ? [], + tesseractLanguages ? [ ], tesseract5, leptonica, }: @@ -10,7 +10,7 @@ mkKdeDerivation { extraBuildInputs = [ qtwebengine - (tesseract5.override {enableLanguages = tesseractLanguages;}) + (tesseract5.override { enableLanguages = tesseractLanguages; }) leptonica ]; meta.mainProgram = "skanpage"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/skladnik/default.nix b/third_party/nixpkgs/pkgs/kde/gear/skladnik/default.nix index ae4dd03f3e..6c574514db 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/skladnik/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/skladnik/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "skladnik"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/spectacle/default.nix b/third_party/nixpkgs/pkgs/kde/gear/spectacle/default.nix index dba026d22f..c5c71a1bea 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/spectacle/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/spectacle/default.nix @@ -11,9 +11,12 @@ mkKdeDerivation { qtwayland qtmultimedia (opencv.override { - enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport - enabledModules = [ "core" "imgproc" ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 - runAccuracyTests = false; # tests will fail because of missing plugins but that's okay + enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport + enabledModules = [ + "core" + "imgproc" + ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 + runAccuracyTests = false; # tests will fail because of missing plugins but that's okay }) ]; meta.mainProgram = "spectacle"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/step/default.nix b/third_party/nixpkgs/pkgs/kde/gear/step/default.nix index f921df1991..983755d211 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/step/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/step/default.nix @@ -11,7 +11,16 @@ mkKdeDerivation { pname = "step"; - extraNativeBuildInputs = [qttools qtsvg pkg-config shared-mime-info]; - extraBuildInputs = [eigen gsl libqalculate]; + extraNativeBuildInputs = [ + qttools + qtsvg + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + eigen + gsl + libqalculate + ]; meta.mainProgram = "step"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/svgpart/default.nix b/third_party/nixpkgs/pkgs/kde/gear/svgpart/default.nix index 44f25d0312..b79a9053a0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/svgpart/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/svgpart/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "svgpart"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix b/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix index 24e75b7c53..99aad7379d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sweeper"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/telly-skout/default.nix b/third_party/nixpkgs/pkgs/kde/gear/telly-skout/default.nix index 9bcae06c90..d179f8d5be 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/telly-skout/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/telly-skout/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "telly-skout"; meta.mainProgram = "telly-skout"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix b/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix index fd47144eda..47411b5e37 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix @@ -11,7 +11,14 @@ mkKdeDerivation { pname = "tokodon"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped sonnet]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtsvg + qtwebsockets + qtwebview + mpv-unwrapped + sonnet + ]; meta.mainProgram = "tokodon"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/umbrello/default.nix b/third_party/nixpkgs/pkgs/kde/gear/umbrello/default.nix index 6aca83a9e8..836ae577c7 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/umbrello/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/umbrello/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "umbrello"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/gear/yakuake/default.nix b/third_party/nixpkgs/pkgs/kde/gear/yakuake/default.nix index a5955e5c2e..fb7fc1ecf0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/yakuake/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/yakuake/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "yakuake"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "yakuake"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/zanshin/default.nix b/third_party/nixpkgs/pkgs/kde/gear/zanshin/default.nix index 357b6963ff..2b81469644 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/zanshin/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/zanshin/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "zanshin"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; } diff --git a/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix b/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix index b32e79295f..37921f4421 100644 --- a/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix +++ b/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix @@ -1,21 +1,22 @@ -self: { +self: +{ lib, stdenv, makeSetupHook, fetchurl, cmake, qt6, -}: let +}: +let dependencies = (lib.importJSON ../generated/dependencies.json).dependencies; projectInfo = lib.importJSON ../generated/projects.json; licenseInfo = lib.importJSON ../generated/licenses.json; licensesBySpdxId = (lib.mapAttrs' (_: v: { - name = v.spdxId or "unknown"; - value = v; - }) - lib.licenses) + name = v.spdxId or "unknown"; + value = v; + }) lib.licenses) // { # https://community.kde.org/Policies/Licensing_Policy "LicenseRef-KDE-Accepted-GPL" = lib.licenses.gpl3Plus; @@ -71,78 +72,89 @@ self: { None = null; }; - moveDevHook = makeSetupHook {name = "kf6-move-dev-hook";} ./move-dev-hook.sh; + moveDevHook = makeSetupHook { name = "kf6-move-dev-hook"; } ./move-dev-hook.sh; in - { - pname, - version ? self.sources.${pname}.version, - src ? self.sources.${pname}, - extraBuildInputs ? [], - extraNativeBuildInputs ? [], - extraPropagatedBuildInputs ? [], - extraCmakeFlags ? [], - excludeDependencies ? [], - ... - } @ args: let - depNames = dependencies.${pname} or []; - filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; +{ + pname, + version ? self.sources.${pname}.version, + src ? self.sources.${pname}, + extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], + extraPropagatedBuildInputs ? [ ], + extraCmakeFlags ? [ ], + excludeDependencies ? [ ], + ... +}@args: +let + depNames = dependencies.${pname} or [ ]; + filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; - # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, - # but cross is currently very broken anyway, so we can figure this out later. - deps = map (dep: self.${dep}) filteredDepNames; + # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, + # but cross is currently very broken anyway, so we can figure this out later. + deps = map (dep: self.${dep}) filteredDepNames; - traceDuplicateDeps = attrName: attrValue: - let - pretty = lib.generators.toPretty {}; - duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; - in - if duplicates != [] - then lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" - else lib.id; + traceDuplicateDeps = + attrName: attrValue: + let + pretty = lib.generators.toPretty { }; + duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; + in + if duplicates != [ ] then + lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" + else + lib.id; - traceAllDuplicateDeps = lib.flip lib.pipe [ - (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) - (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + traceAllDuplicateDeps = lib.flip lib.pipe [ + (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) + (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + ]; + + defaultArgs = { + inherit version src; + + outputs = [ + "out" + "dev" + "devtools" ]; - defaultArgs = { - inherit version src; + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + moveDevHook + ] ++ extraNativeBuildInputs; + buildInputs = [ qt6.qtbase ] ++ extraBuildInputs; - outputs = ["out" "dev" "devtools"]; + # FIXME: figure out what to propagate here + propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; + strictDeps = true; - nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; - buildInputs = [qt6.qtbase] ++ extraBuildInputs; + dontFixCmake = true; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ] ++ extraCmakeFlags; - # FIXME: figure out what to propagate here - propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; - strictDeps = true; + separateDebugInfo = true; - dontFixCmake = true; - cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags; + env.LANG = "C.UTF-8"; + }; - separateDebugInfo = true; + cleanArgs = builtins.removeAttrs args [ + "extraBuildInputs" + "extraNativeBuildInputs" + "extraPropagatedBuildInputs" + "extraCmakeFlags" + "excludeDependencies" + "meta" + ]; - env.LANG = "C.UTF-8"; - }; + meta = { + description = projectInfo.${pname}.description; + homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; + license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); + maintainers = lib.teams.qt-kde.members; + # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. + platforms = lib.platforms.linux ++ lib.platforms.freebsd; + } // (args.meta or { }); - cleanArgs = builtins.removeAttrs args [ - "extraBuildInputs" - "extraNativeBuildInputs" - "extraPropagatedBuildInputs" - "extraCmakeFlags" - "excludeDependencies" - "meta" - ]; - - meta = { - description = projectInfo.${pname}.description; - homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; - license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); - maintainers = lib.teams.qt-kde.members; - # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - } // (args.meta or { }); - - pos = builtins.unsafeGetAttrPos "pname" args; - in - traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) + pos = builtins.unsafeGetAttrPos "pname" args; +in +traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) diff --git a/third_party/nixpkgs/pkgs/kde/misc/kdevelop-pg-qt/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kdevelop-pg-qt/default.nix index cca569099b..5347335167 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kdevelop-pg-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kdevelop-pg-qt/default.nix @@ -10,14 +10,17 @@ mkKdeDerivation rec { version = "2.3.0"; # Breaks with split -dev - outputs = ["out"]; + outputs = [ "out" ]; src = fetchurl { url = "mirror://kde/stable/kdevelop-pg-qt/${version}/src/kdevelop-pg-qt-${version}.tar.xz"; hash = "sha256-PT7zyzlelnDmDDmepthlzHluAOUsNV7tlD++yn2nEg0="; }; - extraNativeBuildInputs = [ bison flex ]; + extraNativeBuildInputs = [ + bison + flex + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/third_party/nixpkgs/pkgs/kde/misc/kdiagram/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kdiagram/default.nix index f5d6d9d8bc..48355004b7 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kdiagram/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kdiagram/default.nix @@ -14,7 +14,10 @@ mkKdeDerivation rec { hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0="; }; - extraNativeBuildInputs = [qttools qtsvg]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; - meta.license = [lib.licenses.gpl2Only]; + meta.license = [ lib.licenses.gpl2Only ]; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix index f4c2637a96..aead489e80 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix @@ -13,7 +13,7 @@ mkKdeDerivation rec { hash = "sha256-LNJHwBPnX0EGWbrDcq/5PSLXHFpUwFnhN7lESvizQno="; }; - extraNativeBuildInputs = [doxygen]; + extraNativeBuildInputs = [ doxygen ]; - meta.license = [lib.licenses.gpl3Plus]; + meta.license = [ lib.licenses.gpl3Plus ]; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/kio-fuse/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kio-fuse/default.nix index b5461fd02d..cf28083b08 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kio-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kio-fuse/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-fRBFgSJ9Whm0JLM/QWjRgVVrEBXW3yIY4BqI1kRJ6Us="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [fuse3]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ fuse3 ]; - meta.license = with lib.licenses; [gpl3Plus]; + meta.license = with lib.licenses; [ gpl3Plus ]; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix index 5930357a7e..d23cc7175b 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-VuPOtSBVtWAzIOoIsn02c9MqORqNWGRtmYIn2LUfCpM="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; meta.license = with lib.licenses; [ bsd2 diff --git a/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix b/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix index ae37770e99..4ca047e52f 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix @@ -15,7 +15,11 @@ mkKdeDerivation rec { hash = "sha256-ZLgGAuhLJekWRiCvP2NB+oZbhegmq49eAgYa4koneyA="; }; - extraBuildInputs = [qtspeech qttools kxmlgui]; + extraBuildInputs = [ + qtspeech + qttools + kxmlgui + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix index 9e7cb57ba3..5e9ac62a97 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kunifiedpush/default.nix @@ -18,8 +18,17 @@ mkKdeDerivation { hash = "sha256-bhlsEP7cLuA6Rj6nrpp5iC3uolc02twNMLsWl+d/BXo="; }; - extraBuildInputs = [qtwebsockets kdeclarative kpackage]; + extraBuildInputs = [ + qtwebsockets + kdeclarative + kpackage + ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc0 lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc0 + lgpl2Plus + ]; meta.mainProgram = "kunifiedpush-distributor"; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/kup/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kup/default.nix index 420b6bc72c..60ae6db479 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kup/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kup/default.nix @@ -1,7 +1,8 @@ -{ lib -, mkKdeDerivation -, fetchFromGitLab -, libgit2 +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + libgit2, }: mkKdeDerivation rec { pname = "kup"; diff --git a/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix b/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix index 84d78e26bc..c7bd84f174 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix @@ -17,8 +17,17 @@ mkKdeDerivation rec { hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [mpv-unwrapped]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ mpv-unwrapped ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc-by-sa-40 + cc0 + lgpl21Only + lgpl3Only + lgpl3Plus + mit + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/oxygen-icons/default.nix b/third_party/nixpkgs/pkgs/kde/misc/oxygen-icons/default.nix index 91144f0c0b..b556bd989e 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/oxygen-icons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/oxygen-icons/default.nix @@ -14,5 +14,5 @@ mkKdeDerivation rec { dontStrip = true; - meta.license = [lib.licenses.lgpl3Plus]; + meta.license = [ lib.licenses.lgpl3Plus ]; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/phonon-vlc/default.nix b/third_party/nixpkgs/pkgs/kde/misc/phonon-vlc/default.nix index bd828172bf..88f278d929 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/phonon-vlc/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/phonon-vlc/default.nix @@ -14,10 +14,13 @@ mkKdeDerivation rec { hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU="; }; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [libvlc]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ libvlc ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus]; + meta.license = with lib.licenses; [ lgpl21Plus ]; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/phonon/default.nix b/third_party/nixpkgs/pkgs/kde/misc/phonon/default.nix index ed0aad0527..76e57f30b3 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/phonon/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/phonon/default.nix @@ -30,8 +30,14 @@ mkKdeDerivation rec { qttools ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus gpl2Plus]; + meta.license = with lib.licenses; [ + lgpl21Plus + gpl2Plus + ]; meta.mainProgram = "phononsettings"; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/polkit-qt-1/default.nix b/third_party/nixpkgs/pkgs/kde/misc/polkit-qt-1/default.nix index 432cc5da80..78ce60455d 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/polkit-qt-1/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/polkit-qt-1/default.nix @@ -15,10 +15,17 @@ mkKdeDerivation rec { sha256 = "sha256-XTthHAYtK3apN1C7EMkHv9IdH/CNChXcLPY+J44Wd/s="; }; - patches = [./full-paths.patch]; + patches = [ ./full-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [glib polkit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + glib + polkit + ]; - meta.license = with lib.licenses; [bsd3 gpl2Plus lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd3 + gpl2Plus + lgpl2Plus + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix b/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix index d5a69da692..108824c87f 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/pulseaudio-qt/default.nix @@ -14,8 +14,11 @@ mkKdeDerivation rec { hash = "sha256-zY9RyHAAc9D9kNV4QIOs63PnK6mnBOYF4KZ5CUJqhSA="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ pulseaudio ]; - meta.license = with lib.licenses; [lgpl21Only lgpl3Only]; + meta.license = with lib.licenses; [ + lgpl21Only + lgpl3Only + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/bluedevil/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/bluedevil/default.nix index 993d121d1f..3a66958336 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/bluedevil/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/bluedevil/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluedevil"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix index 5dd3d199e4..033e2a3480 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix @@ -1,12 +1,12 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "breeze-grub"; # doesn't actually use cmake or anything - nativeBuildInputs = []; - buildInputs = []; + nativeBuildInputs = [ ]; + buildInputs = [ ]; - outputs = ["out"]; + outputs = [ "out" ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/kde/plasma/breeze-gtk/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/breeze-gtk/default.nix index fc0bc4759d..88c424d0fd 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/breeze-gtk/default.nix @@ -8,7 +8,11 @@ mkKdeDerivation { pname = "breeze-gtk"; # FIXME(later): upstream - patches = [./0001-fix-add-executable-bit.patch]; + patches = [ ./0001-fix-add-executable-bit.patch ]; - extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; + extraNativeBuildInputs = [ + sass + python3 + python3Packages.pycairo + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/breeze-plymouth/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/breeze-plymouth/default.nix index 7551eca94e..97abe3948a 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -12,41 +12,58 @@ osVersion ? null, topColor ? "black", bottomColor ? "black", -}: let - validColors = ["black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green"]; +}: +let + validColors = [ + "black" + "cardboard_grey" + "charcoal_grey" + "icon_blue" + "paper_white" + "plasma_blue" + "neon_blue" + "neon_green" + ]; resolvedLogoName = - if (logoFile != null && logoName == null) - then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) - else logoName; + if (logoFile != null && logoName == null) then + lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) + else + logoName; in - assert lib.asserts.assertOneOf "topColor" topColor validColors; - assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; - mkKdeDerivation { - pname = "breeze-plymouth"; +assert lib.asserts.assertOneOf "topColor" topColor validColors; +assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; +mkKdeDerivation { + pname = "breeze-plymouth"; - # FIXME(later): discuss with upstream - patches = [./install-paths.patch]; + # FIXME(later): discuss with upstream + patches = [ ./install-paths.patch ]; - extraNativeBuildInputs = [pkg-config] ++ lib.optionals (logoFile != null) [imagemagick netpbm perl]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = + [ pkg-config ] + ++ lib.optionals (logoFile != null) [ + imagemagick + netpbm + perl + ]; + extraBuildInputs = [ plymouth ]; - extraCmakeFlags = - [] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" - ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; + extraCmakeFlags = + [ ] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; - postPatch = - '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out - '' - + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + postPatch = + '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + '' + + lib.optionalString (logoFile != null) '' + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png - ''; - } + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + ''; +} diff --git a/third_party/nixpkgs/pkgs/kde/plasma/breeze/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/breeze/default.nix index 3b6fed6221..6768ffb94e 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/breeze/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/breeze/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "breeze"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/third_party/nixpkgs/pkgs/kde/plasma/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/default.nix index 6fa4d2383f..4610811b35 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/default.nix @@ -1,66 +1,67 @@ -{callPackage}: { - bluedevil = callPackage ./bluedevil {}; - breeze = callPackage ./breeze {}; - breeze-grub = callPackage ./breeze-grub {}; - breeze-gtk = callPackage ./breeze-gtk {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - discover = callPackage ./discover {}; - drkonqi = callPackage ./drkonqi {}; - flatpak-kcm = callPackage ./flatpak-kcm {}; - kactivitymanagerd = callPackage ./kactivitymanagerd {}; - kde-cli-tools = callPackage ./kde-cli-tools {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; - kdecoration = callPackage ./kdecoration {}; - kdeplasma-addons = callPackage ./kdeplasma-addons {}; - kgamma = callPackage ./kgamma {}; - kglobalacceld = callPackage ./kglobalacceld {}; - kinfocenter = callPackage ./kinfocenter {}; - kmenuedit = callPackage ./kmenuedit {}; - kpipewire = callPackage ./kpipewire {}; - krdp = callPackage ./krdp {}; - kscreen = callPackage ./kscreen {}; - kscreenlocker = callPackage ./kscreenlocker {}; - ksshaskpass = callPackage ./ksshaskpass {}; - ksystemstats = callPackage ./ksystemstats {}; - kwallet-pam = callPackage ./kwallet-pam {}; - kwayland = callPackage ./kwayland {}; - kwayland-integration = callPackage ./kwayland-integration {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited {}; - layer-shell-qt = callPackage ./layer-shell-qt {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - libplasma = callPackage ./libplasma {}; - milou = callPackage ./milou {}; - ocean-sound-theme = callPackage ./ocean-sound-theme {}; - oxygen = callPackage ./oxygen {}; - oxygen-sounds = callPackage ./oxygen-sounds {}; - plasma-activities = callPackage ./plasma-activities {}; - plasma-activities-stats = callPackage ./plasma-activities-stats {}; - plasma-browser-integration = callPackage ./plasma-browser-integration {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-disks = callPackage ./plasma-disks {}; - plasma-firewall = callPackage ./plasma-firewall {}; - plasma-integration = callPackage ./plasma-integration {}; - plasma-mobile = callPackage ./plasma-mobile {}; - plasma-nano = callPackage ./plasma-nano {}; - plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa {}; - plasma-sdk = callPackage ./plasma-sdk {}; - plasma-systemmonitor = callPackage ./plasma-systemmonitor {}; - plasma-thunderbolt = callPackage ./plasma-thunderbolt {}; - plasma-vault = callPackage ./plasma-vault {}; - plasma-welcome = callPackage ./plasma-welcome {}; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; - plasma5support = callPackage ./plasma5support {}; - plymouth-kcm = callPackage ./plymouth-kcm {}; - polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; - powerdevil = callPackage ./powerdevil {}; - print-manager = callPackage ./print-manager {}; - qqc2-breeze-style = callPackage ./qqc2-breeze-style {}; - sddm-kcm = callPackage ./sddm-kcm {}; - systemsettings = callPackage ./systemsettings {}; - wacomtablet = callPackage ./wacomtablet {}; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde {}; +{ callPackage }: +{ + bluedevil = callPackage ./bluedevil { }; + breeze = callPackage ./breeze { }; + breeze-grub = callPackage ./breeze-grub { }; + breeze-gtk = callPackage ./breeze-gtk { }; + breeze-plymouth = callPackage ./breeze-plymouth { }; + discover = callPackage ./discover { }; + drkonqi = callPackage ./drkonqi { }; + flatpak-kcm = callPackage ./flatpak-kcm { }; + kactivitymanagerd = callPackage ./kactivitymanagerd { }; + kde-cli-tools = callPackage ./kde-cli-tools { }; + kde-gtk-config = callPackage ./kde-gtk-config { }; + kdecoration = callPackage ./kdecoration { }; + kdeplasma-addons = callPackage ./kdeplasma-addons { }; + kgamma = callPackage ./kgamma { }; + kglobalacceld = callPackage ./kglobalacceld { }; + kinfocenter = callPackage ./kinfocenter { }; + kmenuedit = callPackage ./kmenuedit { }; + kpipewire = callPackage ./kpipewire { }; + krdp = callPackage ./krdp { }; + kscreen = callPackage ./kscreen { }; + kscreenlocker = callPackage ./kscreenlocker { }; + ksshaskpass = callPackage ./ksshaskpass { }; + ksystemstats = callPackage ./ksystemstats { }; + kwallet-pam = callPackage ./kwallet-pam { }; + kwayland = callPackage ./kwayland { }; + kwayland-integration = callPackage ./kwayland-integration { }; + kwin = callPackage ./kwin { }; + kwrited = callPackage ./kwrited { }; + layer-shell-qt = callPackage ./layer-shell-qt { }; + libkscreen = callPackage ./libkscreen { }; + libksysguard = callPackage ./libksysguard { }; + libplasma = callPackage ./libplasma { }; + milou = callPackage ./milou { }; + ocean-sound-theme = callPackage ./ocean-sound-theme { }; + oxygen = callPackage ./oxygen { }; + oxygen-sounds = callPackage ./oxygen-sounds { }; + plasma-activities = callPackage ./plasma-activities { }; + plasma-activities-stats = callPackage ./plasma-activities-stats { }; + plasma-browser-integration = callPackage ./plasma-browser-integration { }; + plasma-desktop = callPackage ./plasma-desktop { }; + plasma-disks = callPackage ./plasma-disks { }; + plasma-firewall = callPackage ./plasma-firewall { }; + plasma-integration = callPackage ./plasma-integration { }; + plasma-mobile = callPackage ./plasma-mobile { }; + plasma-nano = callPackage ./plasma-nano { }; + plasma-nm = callPackage ./plasma-nm { }; + plasma-pa = callPackage ./plasma-pa { }; + plasma-sdk = callPackage ./plasma-sdk { }; + plasma-systemmonitor = callPackage ./plasma-systemmonitor { }; + plasma-thunderbolt = callPackage ./plasma-thunderbolt { }; + plasma-vault = callPackage ./plasma-vault { }; + plasma-welcome = callPackage ./plasma-welcome { }; + plasma-workspace = callPackage ./plasma-workspace { }; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers { }; + plasma5support = callPackage ./plasma5support { }; + plymouth-kcm = callPackage ./plymouth-kcm { }; + polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 { }; + powerdevil = callPackage ./powerdevil { }; + print-manager = callPackage ./print-manager { }; + qqc2-breeze-style = callPackage ./qqc2-breeze-style { }; + sddm-kcm = callPackage ./sddm-kcm { }; + systemsettings = callPackage ./systemsettings { }; + wacomtablet = callPackage ./wacomtablet { }; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix index d25a4fc6ea..89d3df6818 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/discover/default.nix @@ -9,10 +9,15 @@ mkKdeDerivation { pname = "discover"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwebview discount flatpak fwupd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwebview + discount + flatpak + fwupd + ]; # The PackageKit backend doesn't work for us and causes Discover # to freak out when loading. Disable it to not confuse users. - excludeDependencies = ["packagekit-qt"]; + excludeDependencies = [ "packagekit-qt" ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/default.nix index 2fa13f09d0..6e936a23cd 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/drkonqi/default.nix @@ -5,7 +5,8 @@ gdb, python3, substituteAll, -}: let +}: +let gdb' = gdb.override { hostCpuOnly = true; python3 = python3.withPackages (ps: [ @@ -15,21 +16,21 @@ ]); }; in - mkKdeDerivation { - pname = "drkonqi"; +mkKdeDerivation { + pname = "drkonqi"; - patches = [ - (substituteAll { - src = ./gdb-path.patch; - gdb = "${gdb'}/bin/gdb"; - }) - ]; + patches = [ + (substituteAll { + src = ./gdb-path.patch; + gdb = "${gdb'}/bin/gdb"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ systemd ]; - extraCmakeFlags = [ - "-DWITH_GDB12=1" - "-DWITH_PYTHON_VENDORING=0" - ]; - } + extraCmakeFlags = [ + "-DWITH_GDB12=1" + "-DWITH_PYTHON_VENDORING=0" + ]; +} diff --git a/third_party/nixpkgs/pkgs/kde/plasma/flatpak-kcm/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/flatpak-kcm/default.nix index a43447a154..1afd87240d 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/flatpak-kcm/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/flatpak-kcm/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "flatpak-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [flatpak qtsvg]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + flatpak + qtsvg + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kactivitymanagerd/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kactivitymanagerd/default.nix index b0d2fea109..48c539521d 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kactivitymanagerd/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kactivitymanagerd/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kactivitymanagerd"; - extraBuildInputs = [qt5compat boost]; + extraBuildInputs = [ + qt5compat + boost + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kde-cli-tools/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kde-cli-tools/default.nix index cbaddad841..45b3040e6d 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kde-cli-tools/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kde-cli-tools/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-cli-tools"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix index 045358ffbd..c9b5a827ee 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix @@ -17,24 +17,26 @@ mkKdeDerivation { # aren't found. patches = [ ./0001-gsettings-schemas-path.patch - ( - substituteAll { - src = ./dependency-paths.patch; - pgrep = lib.getExe' procps "pgrep"; - xsettingsd = lib.getExe xsettingsd; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + pgrep = lib.getExe' procps "pgrep"; + xsettingsd = lib.getExe xsettingsd; + }) ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; - extraNativeBuildInputs = [pkg-config wrapGAppsHook3 sass]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + sass + ]; + extraBuildInputs = [ qtsvg ]; dontWrapGApps = true; # There is nothing to wrap - extraCmakeFlags = ["-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"]; + extraCmakeFlags = [ "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kdecoration/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kdecoration/default.nix index 9f879b1cea..21025a6678 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kdecoration/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kdecoration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdecoration"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kdeplasma-addons/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kdeplasma-addons/default.nix index afb0708e8e..e23fdacdf1 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kdeplasma-addons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdeplasma-addons"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kgamma/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kgamma/default.nix index dcd119ace8..607a04a945 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kgamma/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kgamma/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kgamma"; - extraBuildInputs = [xorg.libXxf86vm]; + extraBuildInputs = [ xorg.libXxf86vm ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kglobalacceld/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kglobalacceld/default.nix index caafb6c913..afe98e7fa6 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kglobalacceld/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kglobalacceld/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kglobalacceld"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kinfocenter/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kinfocenter/default.nix index 2ef5008905..8911e77cf4 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kinfocenter/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kinfocenter/default.nix @@ -40,9 +40,12 @@ mkKdeDerivation { patches = [ # fwupdmgr is provided through NixOS' module - (substituteAll ({ - src = ./0001-tool-paths.patch; - } // tools)) + (substituteAll ( + { + src = ./0001-tool-paths.patch; + } + // tools + )) ]; postPatch = '' @@ -50,7 +53,7 @@ mkKdeDerivation { --replace-fail " aha " " ${lib.getExe aha} " ''; - extraBuildInputs = [libusb1]; + extraBuildInputs = [ libusb1 ]; # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in # the same directory, while it is actually located in a completely different diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kmenuedit/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kmenuedit/default.nix index 4f88e80131..85e56a3de6 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kmenuedit/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kmenuedit/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmenuedit"; meta.mainProgram = "kmenuedit"; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kpipewire/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d..eb604d1a61 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kpipewire/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kpipewire/default.nix @@ -10,6 +10,12 @@ mkKdeDerivation { pname = "kpipewire"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + pipewire + ffmpeg + mesa + libva + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/krdp/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/krdp/default.nix index 38208475ca..8dd95c1a76 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/krdp/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/krdp/default.nix @@ -20,7 +20,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtkeychain qtwayland diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kscreen/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kscreen/default.nix index 3ceedb860d..379e13d561 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kscreen/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kscreen/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kscreen"; - extraBuildInputs = [qtsensors]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace $out/share/kglobalaccel/org.kde.kscreen.desktop \ diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kscreenlocker/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kscreenlocker/default.nix index cab85f5e68..edf549ef75 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kscreenlocker/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kscreenlocker/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kscreenlocker"; - extraNativeBuildInputs = [wayland-scanner]; - extraBuildInputs = [pam qqc2-breeze-style]; + extraNativeBuildInputs = [ wayland-scanner ]; + extraBuildInputs = [ + pam + qqc2-breeze-style + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/ksshaskpass/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/ksshaskpass/default.nix index dee8ae1e2c..4a148489a1 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/ksshaskpass/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/ksshaskpass/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksshaskpass"; meta.mainProgram = "ksshaskpass"; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/ksystemstats/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/ksystemstats/default.nix index 1d098b10b0..5582de47cb 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/ksystemstats/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/ksystemstats/default.nix @@ -9,8 +9,14 @@ mkKdeDerivation { pname = "ksystemstats"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [networkmanager-qt lm_sensors libnl]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + networkmanager-qt + lm_sensors + libnl + ]; - cmakeFlags = ["-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml"]; + cmakeFlags = [ + "-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml" + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwallet-pam/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwallet-pam/default.nix index a540f54a85..4dc35d59f4 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwallet-pam/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwallet-pam/default.nix @@ -13,6 +13,9 @@ mkKdeDerivation { sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pam libgcrypt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + pam + libgcrypt + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwayland-integration/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwayland-integration/default.nix index 0274068f7f..8de6d3fae8 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwayland-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwayland-integration"; # FIXME(qt5) diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix index 86713b834b..f456e94dc3 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kwayland"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix index ffa7e146ec..85679de861 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix @@ -41,7 +41,10 @@ mkKdeDerivation { "--set-default TZDIR /etc/zoneinfo" ]; - extraNativeBuildInputs = [pkg-config python3]; + extraNativeBuildInputs = [ + pkg-config + python3 + ]; extraBuildInputs = [ qtquick3d qtsensors diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwrited/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwrited/default.nix index c9bb0ff6e6..2b66791b16 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwrited/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwrited/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwrited"; meta.mainProgram = "kwrited"; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix index dd7290379c..009b2633b6 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "layer-shell-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/libkscreen/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/libkscreen/default.nix index ccd11318e2..fa969f46a5 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/libkscreen/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/libkscreen/default.nix @@ -8,7 +8,12 @@ mkKdeDerivation { pname = "libkscreen"; - extraNativeBuildInputs = [qttools qtwayland jq wayland]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ + qttools + qtwayland + jq + wayland + ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kscreen-doctor"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/libksysguard/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/libksysguard/default.nix index 9dae888737..5f6ecce543 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/libksysguard/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/libksysguard/default.nix @@ -10,5 +10,12 @@ mkKdeDerivation { pname = "libksysguard"; - extraBuildInputs = [qtwebchannel qtwebengine qttools libpcap libnl lm_sensors]; + extraBuildInputs = [ + qtwebchannel + qtwebengine + qttools + libpcap + libnl + lm_sensors + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/libplasma/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/libplasma/default.nix index 1ff05b92ef..348bd4cb2b 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/libplasma/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/libplasma/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "libplasma"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg qtwayland wayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland + wayland + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/lightdm-greeter-kde/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/lightdm-greeter-kde/default.nix index 9d508409f9..e6b7b64f92 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/lightdm-greeter-kde/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/lightdm-greeter-kde/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "lightdm-greeter-kde"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/milou/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/milou/default.nix index 555c7cbee2..69a69e1475 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/milou/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/milou/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "milou"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/ocean-sound-theme/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/ocean-sound-theme/default.nix index 72adf43e36..784e80f599 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/ocean-sound-theme/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/ocean-sound-theme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ocean-sound-theme"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/oxygen-sounds/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/oxygen-sounds/default.nix index 68ee47d20e..8153b0d757 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/oxygen-sounds/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/oxygen-sounds/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "oxygen-sounds"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/oxygen/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/oxygen/default.nix index 718a9737a8..7d4eb0c378 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/oxygen/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/oxygen/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "oxygen"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities-stats/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities-stats/default.nix index dff496e4f6..3e25cdb196 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities-stats/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities-stats/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-activities-stats"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities/default.nix index c9fdd08211..01354b5a6a 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-activities/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "plasma-activities"; - extraBuildInputs = [qtdeclarative boost]; + extraBuildInputs = [ + qtdeclarative + boost + ]; meta.mainProgram = "plasma-activities-cli6"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-browser-integration/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-browser-integration/default.nix index e069d067f2..b4fb1c2b03 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-browser-integration/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-browser-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-browser-integration"; meta.mainProgram = "plasma-browser-integration-host"; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-desktop/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-desktop/default.nix index a84a55779d..46a0a73fb4 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-desktop/default.nix @@ -18,55 +18,56 @@ libcanberra, libxkbfile, ibus, -}: let +}: +let # run gsettings with desktop schemas for using in "kcm_access" kcm # and in kaccess - gsettings-wrapper = runCommandLocal "gsettings-wrapper" {nativeBuildInputs = [makeWrapper];} '' + gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name} ''; in - mkKdeDerivation { - pname = "plasma-desktop"; +mkKdeDerivation { + pname = "plasma-desktop"; - patches = [ - (substituteAll { - src = ./hwclock-path.patch; - hwclock = "${lib.getBin util-linux}/bin/hwclock"; - }) - (substituteAll { - src = ./kcm-access.patch; - gsettings = "${gsettings-wrapper}/bin/gsettings"; - }) - ./tzdir.patch - ./no-discover-shortcut.patch - (substituteAll { - src = ./wallpaper-paths.patch; - wallpapers = "${lib.getBin breeze}/share/wallpapers"; - }) - ]; + patches = [ + (substituteAll { + src = ./hwclock-path.patch; + hwclock = "${lib.getBin util-linux}/bin/hwclock"; + }) + (substituteAll { + src = ./kcm-access.patch; + gsettings = "${gsettings-wrapper}/bin/gsettings"; + }) + ./tzdir.patch + ./no-discover-shortcut.patch + (substituteAll { + src = ./wallpaper-paths.patch; + wallpapers = "${lib.getBin breeze}/share/wallpapers"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtsvg - qtwayland + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland - kaccounts-integration + kaccounts-integration - SDL2 - libcanberra - libxkbfile - xkeyboard_config + SDL2 + libcanberra + libxkbfile + xkeyboard_config - xorg.libXcursor - xorg.libXft - xorg.xf86inputlibinput - xorg.xf86inputevdev - xorg.xorgserver + xorg.libXcursor + xorg.libXft + xorg.xf86inputlibinput + xorg.xf86inputevdev + xorg.xorgserver - ibus - ]; + ibus + ]; - # wrap kaccess with wrapped gsettings so it can access accessibility schemas - qtWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [gsettings-wrapper]}"]; - } + # wrap kaccess with wrapped gsettings so it can access accessibility schemas + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ gsettings-wrapper ]}" ]; +} diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-firewall/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-firewall/default.nix index 202d3ea089..b777de3bb6 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-firewall/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-firewall/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-firewall"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-integration/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-integration/default.nix index a626b94479..55c1bb7ee1 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-integration/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-integration/default.nix @@ -9,9 +9,13 @@ mkKdeDerivation { pname = "plasma-integration"; # force it to check our custom import path too - patches = [./qml-path.patch]; + patches = [ ./qml-path.patch ]; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. @@ -57,7 +61,10 @@ mkKdeDerivation { "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" ]; - extraBuildInputs = [qtwayland xorg.libXcursor]; + extraBuildInputs = [ + qtwayland + xorg.libXcursor + ]; # Move Qt5 plugin to Qt5 plugin path postInstall = '' diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-mobile/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-mobile/default.nix index 8c6766e13b..18654f28dc 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-mobile/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-mobile/default.nix @@ -7,8 +7,8 @@ mkKdeDerivation { pname = "plasma-mobile"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsensors]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \ --replace-fail \ diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-nano/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-nano/default.nix index 9cdb24f013..2d16f3085f 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-nano/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-nano/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-nano"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-nm/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-nm/default.nix index a53ec99a8b..6d93b62347 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-nm/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-nm/default.nix @@ -17,7 +17,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebengine mobile-broadband-provider-info diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-pa/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-pa/default.nix index 4d721ecc71..8213000dc4 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-pa/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-pa/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "plasma-pa"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcanberra pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libcanberra + pulseaudio + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-sdk/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-sdk/default.nix index 68f5a30fc9..52e3f6859e 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-sdk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-sdk"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-systemmonitor/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-systemmonitor/default.nix index a8e20716ed..0aceb98496 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-systemmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-systemmonitor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-systemmonitor"; meta.mainProgram = "plasma-systemmonitor"; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-thunderbolt/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-thunderbolt/default.nix index 5b1b682ac9..6a1a963710 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-thunderbolt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-thunderbolt/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-thunderbolt"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-vault/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-vault/default.nix index 9ab545ab87..f933687143 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-vault/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-vault/default.nix @@ -25,5 +25,5 @@ mkKdeDerivation { ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"'' ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-welcome/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-welcome/default.nix index 7265a3f3f1..3786b3d0c8 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-welcome/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-welcome/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "plasma-welcome"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "plasma-welcome"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix index af8c892492..5d661c1c94 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-workspace-wallpapers"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix index a8dfdd9a9e..2bb51422b0 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma-workspace/default.nix @@ -36,7 +36,10 @@ mkKdeDerivation { chmod -x $out/libexec/plasma-sourceenv.sh ''; - extraNativeBuildInputs = [pkg-config spirv-tools]; + extraNativeBuildInputs = [ + pkg-config + spirv-tools + ]; extraBuildInputs = [ qtsvg qtwayland @@ -61,5 +64,8 @@ mkKdeDerivation { echo "${lsof} ${xorg.xmessage} ${xorg.xsetroot}" > $out/nix-support/depends ''; - passthru.providedSessions = ["plasma" "plasmax11"]; + passthru.providedSessions = [ + "plasma" + "plasmax11" + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plasma5support/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plasma5support/default.nix index 385626aeed..f1c0632fdc 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plasma5support/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plasma5support/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma5support"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/plymouth-kcm/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/plymouth-kcm/default.nix index ccb117f11a..b5f7f65780 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/plymouth-kcm/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/plymouth-kcm/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "plymouth-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ plymouth ]; meta.mainProgram = "kplymouththemeinstaller"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/polkit-kde-agent-1/default.nix index 6c4bf0653f..53f7f2959d 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/polkit-kde-agent-1/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/polkit-kde-agent-1/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "polkit-kde-agent-1"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix index 8b0c270e85..3faa5c3841 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/powerdevil/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "powerdevil"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcap]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libcap ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/print-manager/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/print-manager/default.nix index fce60dcb96..dd06f52176 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/print-manager/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/print-manager/default.nix @@ -6,5 +6,5 @@ mkKdeDerivation { pname = "print-manager"; # FIXME: cups-smb? - extraBuildInputs = [cups]; + extraBuildInputs = [ cups ]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/qqc2-breeze-style/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/qqc2-breeze-style/default.nix index 2d950f63e0..97a7da9567 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/qqc2-breeze-style/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/qqc2-breeze-style/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "qqc2-breeze-style"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/sddm-kcm/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/sddm-kcm/default.nix index d21ea6ac58..e6ba4bb608 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/sddm-kcm/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/sddm-kcm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sddm-kcm"; meta.mainProgram = "sddmthemeinstaller"; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/systemsettings/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/systemsettings/default.nix index 10feafc859..7902e83710 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/systemsettings/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/systemsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "systemsettings"; meta.mainProgram = "systemsettings"; diff --git a/third_party/nixpkgs/pkgs/kde/plasma/wacomtablet/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/wacomtablet/default.nix index 58b80fa957..c4482a6896 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/wacomtablet/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/wacomtablet/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "wacomtablet"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libwacom xf86_input_wacom]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libwacom + xf86_input_wacom + ]; meta.mainProgram = "kde_wacom_tabletfinder"; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index 7563e934e5..0614c0c191 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "xdg-desktop-portal-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland cups]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + cups + ]; } diff --git a/third_party/nixpkgs/pkgs/kde/third-party/applet-window-buttons6/default.nix b/third_party/nixpkgs/pkgs/kde/third-party/applet-window-buttons6/default.nix index 3f157eb2f5..282978fbc3 100644 --- a/third_party/nixpkgs/pkgs/kde/third-party/applet-window-buttons6/default.nix +++ b/third_party/nixpkgs/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -1,13 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, extra-cmake-modules -, kcoreaddons -, kdeclarative -, kdecoration -, libplasma +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + extra-cmake-modules, + kcoreaddons, + kdeclarative, + kdecoration, + libplasma, }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/kde/third-party/koi/default.nix b/third_party/nixpkgs/pkgs/kde/third-party/koi/default.nix new file mode 100644 index 0000000000..1c1d3c9217 --- /dev/null +++ b/third_party/nixpkgs/pkgs/kde/third-party/koi/default.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kconfig, + kcoreaddons, + kwidgetsaddons, + wrapQtAppsHook, +}: +stdenv.mkDerivation rec { + pname = "koi"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "baduhai"; + repo = "Koi"; + rev = version; + sha256 = "sha256-dhpuKIY/Xi62hzJlnVCIOF0k6uoQ3zH129fLq/r+Kmg"; + }; + + # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix + sourceRoot = "source/src"; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + buildInputs = [ + kconfig + kcoreaddons + kwidgetsaddons + ]; + + meta = with lib; { + description = "Scheduling LIGHT/DARK Theme Converter for the KDE Plasma Desktop"; + longDescription = '' + Koi is a program designed to provide the KDE Plasma Desktop functionality to automatically switch between light and dark themes. Koi is under semi-active development, and while it is stable enough to use daily, expect bugs. Koi is designed to be used with Plasma, and while some features may function under different desktop environments, they are unlikely to work and untested. + + Features: + + - Toggle between light and dark presets based on time + - Change Plasma style + - Change Qt colour scheme + - Change Icon theme + - Change GTK theme + - Change wallpaper + - Hide application to system tray + - Toggle between LIGHT/DARK themes by clicking mouse wheel + ''; + license = licenses.lgpl3; + platforms = platforms.linux; + homepage = "https://github.com/baduhai/Koi"; + maintainers = with lib.maintainers; [ fnune ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix b/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix index f4120816cb..b4bd9d9d41 100644 --- a/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix +++ b/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { diff --git a/third_party/nixpkgs/pkgs/misc/calaos/installer/default.nix b/third_party/nixpkgs/pkgs/misc/calaos/installer/default.nix index fc312b1d51..853c187d38 100644 --- a/third_party/nixpkgs/pkgs/misc/calaos/installer/default.nix +++ b/third_party/nixpkgs/pkgs/misc/calaos/installer/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { qmakeFlags = [ "REVISION=${version}" ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp -a calaos_installer.app $out/Applications '' else '' diff --git a/third_party/nixpkgs/pkgs/misc/cbeams/default.nix b/third_party/nixpkgs/pkgs/misc/cbeams/default.nix deleted file mode 100644 index 928b03df09..0000000000 --- a/third_party/nixpkgs/pkgs/misc/cbeams/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildPythonApplication, fetchPypi, isPy3k, blessings, docopt }: - -buildPythonApplication rec { - pname = "cbeams"; - version = "1.0.3"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1agcjg6kmcyvk834xd2j60mi349qi9iw3dc2vwpd7pqwq1daq3gi"; - }; - - propagatedBuildInputs = [ blessings docopt ]; - - meta = with lib; { - homepage = "https://github.com/tartley/cbeams"; - description = "Command-line program to draw animated colored circles in the terminal"; - license = licenses.bsd3; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/misc/cliscord/default.nix b/third_party/nixpkgs/pkgs/misc/cliscord/default.nix index bdfa620ef3..0617b0f806 100644 --- a/third_party/nixpkgs/pkgs/misc/cliscord/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cliscord/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dmR49yyErahOUxR9pGW1oYy8Wq5SWOprK317u+JPBv4="; }; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix index 194074ce9c..4c9d2de108 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/default.nix @@ -48,21 +48,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] - ++ lib.optionals stdenv.isLinux [ avahi pam dbus acl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ avahi pam dbus acl ] ++ lib.optional enableSystemd systemd - ++ lib.optionals stdenv.isDarwin (with darwin; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); propagatedBuildInputs = [ gmp ]; - configurePlatforms = lib.optionals stdenv.isLinux [ "build" "host" ]; + configurePlatforms = lib.optionals stdenv.hostPlatform.isLinux [ "build" "host" ]; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--enable-raw-printing" "--enable-threads" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "--with-systemd=$out/lib/systemd/system" - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' "--with-bundledir=$out" ''} ) @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - libexec=${if stdenv.isDarwin then "libexec/cups" else "lib/cups"} + libexec=${if stdenv.hostPlatform.isDarwin then "libexec/cups" else "lib/cups"} moveToOutput $libexec "$out" # $lib contains references to $out/share/cups. @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { for f in "$out"/lib/systemd/system/*; do substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec" done - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Use xdg-open when on Linux substituteInPlace "$out"/share/applications/cups.desktop \ --replace "Exec=htmlview" "Exec=xdg-open" diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index d683e80b28..98116903ec 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -30,7 +30,7 @@ let myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; in diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix index 8ebcccbaa2..2b265498ac 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix @@ -1,5 +1,4 @@ { lib -, findutils , stdenv , fetchurl , dpkg diff --git a/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix index 47ff004599..e2f117e1e8 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, libftdi -, infnoise, testers }: +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "infnoise"; version = "0.3.2"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { }) ]; - GIT_COMMIT = src.rev; - GIT_VERSION = version; + GIT_COMMIT = finalAttrs.src.rev; + GIT_VERSION = finalAttrs.version; GIT_DATE = "2019-08-12"; buildInputs = [ libftdi ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; passthru = { - tests.version = testers.testVersion { package = infnoise; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ StijnDW zhaofengli ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix index eb2fc165cc..27ea69943c 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libX11 ] - ++ lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; configureFlags = [ "--disable-debug" ]; diff --git a/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix b/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix index f37826501d..653c4747c9 100644 --- a/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix +++ b/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix @@ -56,7 +56,7 @@ python311Packages.buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sepi ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/frescobaldi.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/frescobaldi.x86_64-darwin mainProgram = "frescobaldi"; }; } diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index 466bd1c909..c5cb69bea4 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -21,7 +21,7 @@ , bash , buildPackages , openjpeg -, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin) +, cupsSupport ? config.ghostscript.cups or (!stdenv.hostPlatform.isDarwin) , cups , x11Support ? cupsSupport , xorg # with CUPS, X11 only adds very little @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { buildFlags = [ "so" ] # without -headerpad, the following error occurs on Darwin when compiling with X11 support (as of 10.02.0) # error: install_name_tool: changing install names or rpaths can't be redone for: [...]libgs.dylib.10 (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) - ++ lib.optional (x11Support && stdenv.isDarwin) "LDFLAGS=-headerpad_max_install_names"; + ++ lib.optional (x11Support && stdenv.hostPlatform.isDarwin) "LDFLAGS=-headerpad_max_install_names"; installTargets = [ "soinstall" ]; postInstall = '' @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { mkdir -p $fonts/share/fonts cp -rv ${fonts}/* "$fonts/share/fonts/" ln -s "$fonts/share/fonts" "$out/share/ghostscript/fonts" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.dylib* ; do install_name_tool -id "$file" $file done @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { # dynamic library name only contains maj.min, eg. '9.53' dylib_version = lib.versions.majorMinor version; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gs install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gsx ''; diff --git a/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix b/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix index 376c4c409c..9660ad613b 100644 --- a/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , stdenv , fetchpatch , ninja diff --git a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix index 09e158da3a..54827497f8 100644 --- a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -20,7 +20,7 @@ let libOnly = prefix == "lib"; - optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus; + optDbus = if stdenv.hostPlatform.isDarwin then null else shouldUsePkg dbus; optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; optLibffado = if libOnly then null else shouldUsePkg libffado; optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ aften AudioUnit CoreAudio Accelerate libobjc ]; diff --git a/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix index 428bb9685f..d50f21f53f 100644 --- a/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix +++ b/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; license = with licenses; [ gpl2Plus lgpl21 ]; diff --git a/third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix index e0e51a0ba4..76826d30ca 100644 --- a/third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix +++ b/third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix @@ -16,7 +16,7 @@ , zita-alsa-pcmi , zita-resampler -, enableAlsa ? stdenv.isLinux +, enableAlsa ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation (final: { diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix index 327882951d..95bc57227e 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; - FONTCONFIG_FILE = lib.optional stdenv.isDarwin (makeFontsConf { + FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf { fontDirectories = [ freefont_ttf ]; }); } diff --git a/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix b/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix index d6a994ac3e..67e5f12992 100644 --- a/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix +++ b/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix @@ -54,7 +54,7 @@ in rustPlatform.buildRustPackage { buildInputs = [ ncurses sqlite - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); diff --git a/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix b/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix index c37568cfc9..2266970603 100644 --- a/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix +++ b/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ copyDesktopItems wrapQtAppsHook ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" diff --git a/third_party/nixpkgs/pkgs/misc/opensbi/default.nix b/third_party/nixpkgs/pkgs/misc/opensbi/default.nix index 172e28c056..dae75b546c 100644 --- a/third_party/nixpkgs/pkgs/misc/opensbi/default.nix +++ b/third_party/nixpkgs/pkgs/misc/opensbi/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - hash = "sha256-vK14P97FcaVz4GDr/0055Z6s/k7BPKPQGZ/MQxbOWu0="; + hash = "sha256-qb3orbmZJtesIBj9F2OX+BhrlctymZA1ZIbV/GVa0lU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix b/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix index eb243aa4f9..9e73b77c59 100644 --- a/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix +++ b/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix @@ -58,7 +58,7 @@ # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${lib.optionalString stdenv.isLinux "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;"} + ${lib.optionalString stdenv.hostPlatform.isLinux "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;"} ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE diff --git a/third_party/nixpkgs/pkgs/misc/stabber/default.nix b/third_party/nixpkgs/pkgs/misc/stabber/default.nix index fd64b3942b..5ca07007d1 100644 --- a/third_party/nixpkgs/pkgs/misc/stabber/default.nix +++ b/third_party/nixpkgs/pkgs/misc/stabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib expat libmicrohttpd ] ++ - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Stubbed XMPP Server"; diff --git a/third_party/nixpkgs/pkgs/misc/t-rec/default.nix b/third_party/nixpkgs/pkgs/misc/t-rec/default.nix index ac99abb7e5..c67a8d6055 100644 --- a/third_party/nixpkgs/pkgs/misc/t-rec/default.nix +++ b/third_party/nixpkgs/pkgs/misc/t-rec/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ imagemagick ] - ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; postInstall = '' wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 7af81347e8..d8da9f1016 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -242,29 +242,8 @@ in rec { }; }; - fingers = mkTmuxPlugin rec { - pluginName = "tmux-fingers"; - rtpFilePath = "load-config.tmux"; - version = "2.1.1"; - src = fetchFromGitHub { - owner = "Morantron"; - repo = "tmux-fingers"; - rev = "${version}"; - sha256 = "sha256-1YMh6m8M6FKf8RPXsOfWCVC5CXSr/MynguwkG7O+oEY="; - }; - nativeBuildInputs = [ pkgs.makeWrapper pkgs.crystal pkgs.shards ]; - postInstall = '' - shards build --production - rm -rf $target/* $target/.* - cp -r bin $target/bin - echo "$target/bin/${pluginName} load-config" > $target/${rtpFilePath} - chmod +x $target/${rtpFilePath} - - wrapProgram $target/${rtpFilePath} \ - --prefix PATH : ${with pkgs; lib.makeBinPath ( - [ gawk ] ++ lib.optionals stdenv.isDarwin [ reattach-to-user-namespace ] - )} - ''; + fingers = pkgs.callPackage ./tmux-fingers { + inherit mkTmuxPlugin; }; fpp = mkTmuxPlugin { @@ -614,7 +593,7 @@ in rec { rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; }; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux ''; }; diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/default.nix new file mode 100644 index 0000000000..bb415d7693 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/default.nix @@ -0,0 +1,46 @@ +{ + mkTmuxPlugin, + substituteAll, + fetchFromGitHub, + crystal, +}: +let + fingers = crystal.buildCrystalPackage rec { + format = "shards"; + version = "2.2.2"; + pname = "fingers"; + src = fetchFromGitHub { + owner = "Morantron"; + repo = "tmux-fingers"; + rev = "${version}"; + sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I="; + }; + + shardsFile = ./shards.nix; + crystalBinaries.tmux-fingers.src = "src/fingers.cr"; + + postInstall = '' + shopt -s dotglob extglob + rm -rv !("tmux-fingers.tmux"|"bin") + shopt -u dotglob extglob + ''; + + # TODO: Needs starting a TMUX session to run tests + # Unhandled exception: Missing ENV key: "TMUX" (KeyError) + doCheck = false; + doInstallCheck = false; + }; +in +mkTmuxPlugin { + inherit (fingers) version src meta; + + pluginName = fingers.src.repo; + rtpFilePath = "tmux-fingers.tmux"; + + patches = [ + (substituteAll { + src = ./fix.patch; + tmuxFingersDir = "${fingers}/bin"; + }) + ]; +} diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch b/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch new file mode 100644 index 0000000000..34014441eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch @@ -0,0 +1,41 @@ +diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux +index f15b509..a14e312 100755 +--- a/tmux-fingers.tmux ++++ b/tmux-fingers.tmux +@@ -1,35 +1,4 @@ + #!/usr/bin/env bash + +-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +- +-if command -v "tmux-fingers" &>/dev/null; then +- FINGERS_BINARY="tmux-fingers" +-elif [[ -f "$CURRENT_DIR/bin/tmux-fingers" ]]; then +- FINGERS_BINARY="$CURRENT_DIR/bin/tmux-fingers" +-fi +- +-if [[ -z "$FINGERS_BINARY" ]]; then +- tmux run-shell -b "bash $CURRENT_DIR/install-wizard.sh" +- exit 0 +-fi +- +-CURRENT_FINGERS_VERSION="$($FINGERS_BINARY version)" +- +-pushd $CURRENT_DIR &> /dev/null +-CURRENT_GIT_VERSION=$(cat shard.yml | grep "^version" | cut -f2 -d':' | sed "s/ //g") +-popd &> /dev/null +- +-SKIP_WIZARD=$(tmux show-option -gqv @fingers-skip-wizard) +-SKIP_WIZARD=${SKIP_WIZARD:-0} +- +-if [ "$SKIP_WIZARD" = "0" ] && [ "$CURRENT_FINGERS_VERSION" != "$CURRENT_GIT_VERSION" ]; then +- tmux run-shell -b "FINGERS_UPDATE=1 bash $CURRENT_DIR/install-wizard.sh" +- +- if [[ "$?" != "0" ]]; then +- echo "Something went wrong while updating tmux-fingers. Please try again." +- exit 1 +- fi +-fi +- +-tmux run "$FINGERS_BINARY load-config" ++tmux run "@tmuxFingersDir@/tmux-fingers load-config" + exit $? diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix new file mode 100644 index 0000000000..9367ddf7b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix @@ -0,0 +1,12 @@ +{ + cling = { + url = "https://github.com/devnote-dev/cling.git"; + rev = "v3.0.0"; + sha256 = "0mj5xvpiif1vhg4qds938p9zb5a47qzl397ybz1l1jks0gg361wq"; + }; + xdg_base_directory = { + url = "https://github.com/tijn/xdg_base_directory.git"; + rev = "60bf28dc060c221d5af52727927e92b840022eb0"; + sha256 = "1sa8bw8mzsz0pbj3m8v0w1pnk1q86zjivr0jndfg77wa33ki34y0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/urbit/default.nix b/third_party/nixpkgs/pkgs/misc/urbit/default.nix index aa78c949e5..955b16bf69 100644 --- a/third_party/nixpkgs/pkgs/misc/urbit/default.nix +++ b/third_party/nixpkgs/pkgs/misc/urbit/default.nix @@ -4,8 +4,8 @@ }: let - os = if stdenv.isDarwin then "macos" else "linux"; - arch = if stdenv.isAarch64 then "aarch64" else "x86_64"; + os = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; + arch = if stdenv.hostPlatform.isAarch64 then "aarch64" else "x86_64"; platform = "${os}-${arch}"; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix index 1724fe435f..4d96c78cb5 100644 --- a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix +++ b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0="; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix index ecf231c304..a622e25f7a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix @@ -13,7 +13,7 @@ mkDerivation { export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" \ --replace '-Wl,--warn-shared-textrel' "" diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index 302270f4ed..1a3b0f8232 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,7 +2,7 @@ lib, stdenv, stdenvNoCC, - stdenvNoLibc, + stdenvNoLibs, overrideCC, buildPackages, stdenvNoLibcxx ? overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx, @@ -28,7 +28,7 @@ lib.makeOverridable ( if attrs.noCC or false then stdenvNoCC else if attrs.noLibc or false then - stdenvNoLibc + stdenvNoLibs else if attrs.noLibcxx or false then stdenvNoLibcxx else @@ -89,14 +89,14 @@ lib.makeOverridable ( # Since STRIP in `makeFlags` has to be a flag, not the binary itself STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip"; } - // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; } // lib.optionalAttrs (stdenv'.cc.isClang or false) { HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); } - // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase"; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix index bbcaff3a1c..f1cf4f9bd2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix @@ -18,7 +18,7 @@ mkDerivation { libmd libnetbsd ] - ++ lib.optional (stdenv.isFreeBSD) libutil; + ++ lib.optional (stdenv.hostPlatform.isFreeBSD) libutil; postPatch = '' ln -s $BSDSRCDIR/contrib/mknod/*.c $BSDSRCDIR/contrib/mknod/*.h $BSDSRCDIR/contrib/mtree @@ -32,7 +32,7 @@ mkDerivation { "-lnetbsd" ] ++ lib.optional compatIsNeeded "-legacy" - ++ lib.optional stdenv.isFreeBSD "-lutil" + ++ lib.optional stdenv.hostPlatform.isFreeBSD "-lutil" ) }" ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index 40113028bb..ad83b06502 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -118,7 +118,7 @@ mkDerivation ( install -D $BSDSRCDIR/common/include/rpc/types.h $dev/include/rpc/types.h sed -i '1s;^;#include "nbtool_config.h"\n;' $dev/include/rpc/types.h '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $dev/include/ssp touch $dev/include/ssp/ssp.h '' diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix index 8d61bcfdf7..75ca446b70 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix @@ -16,12 +16,12 @@ mkDerivation { "-D__va_list=va_list" "-D__warn_references(a,b)=" ] - ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)=" + ++ lib.optional stdenv.hostPlatform.isDarwin "-D__strong_alias(a,b)=" ); propagatedBuildInputs = compatIfNeeded; MKDOC = "no"; # missing vfontedpr makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${libterminfo}/lib" ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace $COMPONENT_PATH/printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix index eb010749ad..e926557fc4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -104,14 +104,14 @@ lib.makeOverridable ( # TODO should CC wrapper set this? CPP = "${stdenv'.cc.targetPrefix}cpp"; } - // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; } // lib.optionalAttrs (stdenv'.cc.isClang or false) { HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); } - // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase"; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix index 1e58df16ce..da3c9bb05d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix @@ -6,6 +6,6 @@ mkDerivation { path = "usr.bin/uudecode"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-DNO_BASE64"; + NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-lresolv"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 7262400c3e..c64f011c05 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -127,7 +127,7 @@ let }) bindgenHook; }; - callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { + callPackage = newScope (lib.optionalAttrs stdenv.hostPlatform.isDarwin (stdenvs // rec { inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index b642b993df..787fc93da1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -2,8 +2,8 @@ , libutil }: let - xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; - arch = if stdenv.isAarch64 then "arm" else "i386"; + xnu-src = if stdenv.hostPlatform.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; + arch = if stdenv.hostPlatform.isAarch64 then "arm" else "i386"; in appleDerivation { patches = [ # Fixes a build failure with newer versions of clang that make implicit int an error. diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 1ba9a278ec..20a34e814d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -5,7 +5,7 @@ }: appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( - let arch = if stdenv.isx86_64 then "x86_64" else "arm64"; + let arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64"; in { depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix index 13aadfce24..4babe83c63 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "goku"; version = "0.6.0"; - src = if stdenv.isAarch64 then + src = if stdenv.hostPlatform.isAarch64 then fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { joker ]; - sourceRoot = if stdenv.isAarch64 then "goku" else "."; + sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; installPhase = '' chmod +x goku diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix index 502a165c33..ed20f67e48 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.darwin; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix index d28ed49428..dbbd94fe43 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix @@ -2,7 +2,7 @@ let inherit (swiftPackages) apple_sdk stdenv swift; - arch = if stdenv.isAarch64 then "arm64" else "x86_64"; + arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; in stdenv.mkDerivation rec { pname = "openwith"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix index 5d27c9a72c..3c384ee359 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.82.5"; + version = "1.83.1"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-wqX61h6iF3yhZePLvtGL+gsGOrRIwZ1w2i1F7M52bsw="; + hash = "sha256-3EJAhjMEkQgyGMshCeV7Ci//tflEbhcOOFIdAsTIfh0="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix index df64c0d1f5..33d950b76c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed substituteInPlace configure.ac --replace \ 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index f70ba4c7aa..3fef396208 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -152,7 +152,7 @@ let ]; propagatedBuildInputs = [ - libapparmor.python + (libapparmor.python or null) # Used by aa-notify python.pkgs.notify2 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index 3fd703c7ce..f49a723e2b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -6,8 +6,8 @@ , withExamples ? [] , shared ? false , machine ? ( - if stdenv.isx86_64 then "nehalem" - else if stdenv.isAarch64 then "generic" + if stdenv.hostPlatform.isx86_64 then "nehalem" + else if stdenv.hostPlatform.isAarch64 then "generic" else null ) }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 3f1a0ed04b..0393174d88 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation { "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy" "OBJDUMP7=${stdenv.cc.targetPrefix}objdump" ] - ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] - ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] + ++ optionals (stdenv.hostPlatform.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] + ++ optionals (stdenv.hostPlatform.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] ; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 5dede06d92..58e532e6ab 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20240902"; + version = "1.20240924"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - hash = "sha256-DN+NlesZ8YfuVwLKQSHckvpNZxqsbKRflOcS3ShO3Ss="; + hash = "sha256-r6kte+rZQliLEQMNMT1ZqbvE0oCWjkCYk8NfVHl5lQY="; }; installPhase = '' @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ dezgeg ]; # Hash mismatch on source, mystery. # Maybe due to https://github.com/NixOS/nix/issues/847 - broken = stdenvNoCC.isDarwin; + broken = stdenvNoCC.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix index f4b8bfc566..cadf176b7c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { patches = lib.optional - (!isFuse3 && (stdenv.isAarch64 || stdenv.hostPlatform.isLoongArch64)) + (!isFuse3 && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64)) (fetchpatch { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix index e41f5c8e3c..52a71d5719 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix @@ -13,7 +13,7 @@ , gsl , libpng , sfml -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio ? null , useQt ? false , qtbase ? null diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 2a7672465d..d3226b7670 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -33,15 +33,12 @@ let debug = { # Necessary for BTF - DEBUG_INFO = lib.mkMerge [ - (whenOlder "5.2" (if (features.debug or false) then yes else no)) - (whenBetween "5.2" "5.18" yes) - ]; + DEBUG_INFO = whenOlder "5.18" yes; DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes; # Reduced debug info conflict with BTF and have been enabled in # aarch64 defconfig since 5.13 DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no); - DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); + DEBUG_INFO_BTF = option yes; # Allow loading modules with mismatched BTFs # FIXME: figure out how to actually make BTFs reproducible instead # See https://github.com/NixOS/nixpkgs/pull/181456 for details. @@ -86,7 +83,7 @@ let # ACPI Firmware Performance Data Table Support ACPI_FPDT = whenAtLeast "5.12" (option yes); # ACPI Heterogeneous Memory Attribute Table Support - ACPI_HMAT = whenAtLeast "5.2" (option yes); + ACPI_HMAT = option yes; # ACPI Platform Error Interface ACPI_APEI = (option yes); # APEI Generic Hardware Error Source @@ -128,7 +125,7 @@ let PWM = yes; } // lib.optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; - INTEL_RAPL = whenAtLeast "5.3" module; + INTEL_RAPL = module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; X86_AMD_PSTATE = whenAtLeast "5.17" yes; @@ -185,7 +182,7 @@ let # Collect ECC errors and retire pages that fail too often RAS_CEC = yes; - } // lib.optionalAttrs (stdenv.is32bit) { + } // lib.optionalAttrs (stdenv.hostPlatform.is32bit) { # Enable access to the full memory range (aka PAE) on 32-bit architectures # This check isn't super accurate but it's close enough HIGHMEM = option yes; @@ -202,22 +199,22 @@ let IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1 BLK_CGROUP = yes; # required by CFQ" BLK_CGROUP_IOLATENCY = yes; - BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes; + BLK_CGROUP_IOCOST = yes; IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1 MQ_IOSCHED_DEADLINE = yes; BFQ_GROUP_IOSCHED = yes; MQ_IOSCHED_KYBER = yes; IOSCHED_BFQ = module; # Enable CPU utilization clamping for RT tasks - UCLAMP_TASK = whenAtLeast "5.3" yes; - UCLAMP_TASK_GROUP = whenAtLeast "5.4" yes; + UCLAMP_TASK = yes; + UCLAMP_TASK_GROUP = yes; }; timer = { # Enable Full Dynticks System. # NO_HZ_FULL depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT - NO_HZ_FULL = lib.mkIf stdenv.is64bit yes; + NO_HZ_FULL = lib.mkIf stdenv.hostPlatform.is64bit yes; }; # Enable NUMA. @@ -244,7 +241,7 @@ let HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes; BPF_STREAM_PARSER = yes; XDP_SOCKETS = yes; - XDP_SOCKETS_DIAG = whenAtLeast "5.1" yes; + XDP_SOCKETS_DIAG = yes; WAN = yes; TCP_CONG_ADVANCED = yes; TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19 @@ -306,8 +303,7 @@ let # IPv6: Netfilter Configuration NF_TABLES_IPV6 = yes; # Bridge Netfilter Configuration - NF_TABLES_BRIDGE = lib.mkMerge [ (whenOlder "5.3" yes) - (whenAtLeast "5.3" module) ]; + NF_TABLES_BRIDGE = module; # Expose some debug info NF_CONNTRACK_PROCFS = yes; NF_FLOW_TABLE_PROCFS = whenAtLeast "6.0" yes; @@ -377,9 +373,9 @@ let ATH10K_DFS_CERTIFIED = option yes; B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; - RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; - RTW88_8822CE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88 = module; + RTW88_8822BE = lib.mkMerge [ (whenOlder "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = lib.mkMerge [ (whenOlder "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { @@ -415,7 +411,7 @@ let }; video = let - whenHasDevicePrivate = lib.mkIf (!stdenv.isx86_32 && lib.versionAtLeast version "5.1"); + whenHasDevicePrivate = lib.mkIf (!stdenv.hostPlatform.isx86_32); in { # compile in DRM so simpledrm can load before initrd if necessary AGP = yes; @@ -423,7 +419,7 @@ let DRM_LEGACY = whenOlder "6.8" no; - NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no; + NOUVEAU_LEGACY_CTX_SUPPORT = whenOlder "6.3" no; # Enable simpledrm and use it for generic framebuffer # Technically added in 5.14, but adding more complex configuration is not worth it @@ -446,8 +442,8 @@ let DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes; # amdgpu display core (DC) support DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes; - DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes; - DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes; + DRM_AMD_DC_DCN2_0 = whenOlder "5.6" yes; + DRM_AMD_DC_DCN2_1 = whenOlder "5.6" yes; DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes; DRM_AMD_DC_DCN = whenBetween "5.11" "6.4" yes; DRM_AMD_DC_FP = whenAtLeast "6.4" yes; @@ -578,7 +574,7 @@ let TMPFS = yes; TMPFS_POSIX_ACL = yes; - FS_ENCRYPTION = if (lib.versionAtLeast version "5.1") then yes else option module; + FS_ENCRYPTION = yes; EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; @@ -589,7 +585,6 @@ let EXT4_FS_POSIX_ACL = yes; EXT4_FS_SECURITY = yes; - EXT4_ENCRYPTION = whenOlder "5.1" yes; NTFS_FS = whenBetween "5.15" "6.9" no; NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes; @@ -618,7 +613,6 @@ let F2FS_FS = module; F2FS_FS_SECURITY = option yes; - F2FS_FS_ENCRYPTION = whenOlder "5.1" yes; F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; @@ -640,7 +634,6 @@ let CIFS_FSCACHE = yes; CIFS_WEAK_PW_HASH = whenOlder "5.15" yes; CIFS_UPCALL = yes; - CIFS_ACL = whenOlder "5.3" yes; CIFS_DFS_UPCALL = yes; CEPH_FSCACHE = yes; @@ -668,7 +661,7 @@ let DEVTMPFS = yes; - UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems + UNICODE = yes; # Casefolding support for filesystems }; security = { @@ -687,7 +680,6 @@ let STRICT_MODULE_RWX = yes; STRICT_DEVMEM = lib.mkDefault yes; # Filter access to /dev/mem IO_STRICT_DEVMEM = lib.mkDefault yes; - SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; @@ -705,17 +697,17 @@ let SECURITY_DMESG_RESTRICT = yes; RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG - RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules # and enforce signatures which we don't do by default. - SECURITY_LOCKDOWN_LSM = whenAtLeast "5.4" no; + SECURITY_LOCKDOWN_LSM = no; # provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis PERSISTENT_KEYRINGS = yes; # enable temporary caching of the last request_key() result - KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes; + KEYS_REQUEST_CACHE = yes; # randomized slab caches RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes; @@ -732,9 +724,9 @@ let # Enable support for page poisoning. Still needs to be enabled on the command line to actually work. PAGE_POISONING = yes; # Randomize page allocator when page_alloc.shuffle=1 - SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; + SHUFFLE_PAGE_ALLOCATOR = yes; - INIT_ON_ALLOC_DEFAULT_ON = whenAtLeast "5.3" yes; + INIT_ON_ALLOC_DEFAULT_ON = yes; # Enable stack smashing protections in schedule() # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f @@ -844,11 +836,11 @@ let KSM = yes; VIRT_DRIVERS = yes; # We need 64 GB (PAE) support for Xen guest support - HIGHMEM64G = { optional = true; tristate = lib.mkIf (!stdenv.is64bit) "y";}; + HIGHMEM64G = { optional = true; tristate = lib.mkIf (!stdenv.hostPlatform.is64bit) "y";}; - VFIO_PCI_VGA = lib.mkIf stdenv.is64bit yes; + VFIO_PCI_VGA = lib.mkIf stdenv.hostPlatform.is64bit yes; - UDMABUF = whenAtLeast "4.20" yes; + UDMABUF = yes; # VirtualBox guest drivers in the kernel conflict with the ones in the # official additions package and prevent the vboxsf module from loading, @@ -872,7 +864,6 @@ let XEN_PVH = option yes; XEN_PVHVM = option yes; XEN_SAVE_RESTORE = option yes; - XEN_SELFBALLOONING = whenOlder "5.3" yes; # Enable device detection on virtio-mmio hypervisors VIRTIO_MMIO_CMDLINE_DEVICES = yes; @@ -949,7 +940,7 @@ let # Allows soft-dirty tracking on pages, used by CRIU. # See https://docs.kernel.org/admin-guide/mm/soft-dirty.html - MEM_SOFT_DIRTY = lib.mkIf (!stdenv.isx86_32) yes; + MEM_SOFT_DIRTY = lib.mkIf (!stdenv.hostPlatform.isx86_32) yes; }; misc = let @@ -1034,7 +1025,7 @@ let SERIAL_DEV_BUS = yes; # enables support for serial devices SERIAL_DEV_CTRL_TTYPORT = yes; # enables support for TTY serial devices - BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support + BT_HCIBTUSB_MTK = yes; # MediaTek protocol support BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390) BT_HCIUART_BCM = option yes; # Broadcom Bluetooth support @@ -1074,12 +1065,10 @@ let IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; - JOYSTICK_IFORCE_232 = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force USB joysticks and wheels JOYSTICK_XPAD_FF = option yes; # X-Box gamepad rumble support JOYSTICK_XPAD_LEDS = option yes; # LED Support for Xbox360 controller 'BigX' LED - KEYBOARD_APPLESPI = whenAtLeast "5.3" module; + KEYBOARD_APPLESPI = module; KEXEC_FILE = option yes; KEXEC_JUMP = option yes; @@ -1109,9 +1098,9 @@ let NVME_TARGET_AUTH = whenAtLeast "6.0" yes; NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes; - PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit && lib.versionAtLeast version "4.20") yes; + PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit) yes; - PSI = whenAtLeast "4.20" yes; + PSI = yes; MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension @@ -1168,17 +1157,17 @@ let # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK = option no; - FW_LOADER_COMPRESS = whenAtLeast "5.3" yes; + FW_LOADER_COMPRESS = yes; FW_LOADER_COMPRESS_ZSTD = whenAtLeast "5.19" yes; HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support # Enable AMD's ROCm GPU compute stack - HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes); - ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes); - HMM_MIRROR = whenAtLeast "5.3" yes; - DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes; + HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (yes); + ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (yes); + HMM_MIRROR = yes; + DRM_AMDGPU_USERPTR = yes; PREEMPT = no; PREEMPT_VOLUNTARY = yes; @@ -1239,13 +1228,13 @@ let NR_CPUS = freeform "384"; # Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces) - LED_TRIGGER_PHY = whenAtLeast "4.10" yes; + LED_TRIGGER_PHY = yes; } // lib.optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 SUN8I_DE2_CCU = yes; # See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647 - CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no; + CRYPTO_AEGIS128_SIMD = no; # Distros should configure the default as a kernel option. # We previously defined it on the kernel command line as cma= @@ -1279,7 +1268,7 @@ let # differently when run under aarch64 kernels compared to when # it is run under an aarch32 kernel. COMPAT_ALIGNMENT_FIXUPS = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes); - } // lib.optionalAttrs (lib.versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Required for various hardware features on Chrome OS devices CHROME_PLATFORMS = yes; CHROMEOS_TBMC = module; @@ -1294,10 +1283,10 @@ let CROS_KBD_LED_BACKLIGHT = module; TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes; - } // lib.optionalAttrs (lib.versionAtLeast version "5.4" && stdenv.hostPlatform.system == "x86_64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { CHROMEOS_LAPTOP = module; CHROMEOS_PSTORE = module; - } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + # Enable x86 resource control X86_CPU_RESCTRL = whenAtLeast "5.0" yes; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix index 74e6036234..fdfc782352 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix @@ -84,7 +84,7 @@ lib.makeOverridable ({ # The kernel source tarball. # cgit) that are needed here should be included directly in Nixpkgs as # files. -assert stdenv.isLinux; +assert stdenv.hostPlatform.isLinux; let # Dirty hack to make sure that `version` & `src` have diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 62f1fcdda2..dc3b43a4d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,82 +1,62 @@ { - "4.19": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-4.19.315-hardened1.patch", - "sha256": "1w17mwsv618pw5bkahmz6in0i5zjjxd3d14gggafqdd3dgfr1h8q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.315-hardened1/linux-hardened-4.19.315-hardened1.patch" - }, - "sha256": "1j1j8awy0237jp2r211qpa305c10y7rlcbkxkzdvzbgyhwy4spkc", - "version": "4.19.315" - }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.218-hardened1.patch", - "sha256": "1ah4pznha17ngg3w7l0j74h4910gjv8qj503adrap7plvapf82m4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.218-hardened1/linux-hardened-5.10.218-hardened1.patch" + "name": "linux-hardened-v5.10.226-hardened1.patch", + "sha256": "1vxcr0f3ikkg10wcvq76djxzmhlc6h5fv34xf8vm48wfi7ryajbk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.226-hardened1/linux-hardened-v5.10.226-hardened1.patch" }, - "sha256": "1mmj5hwm5i16gc1y4nzr1cs882vi6vrihrincdcivv63x11v4dlw", - "version": "5.10.218" + "sha256": "19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn", + "version": "5.10.226" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.160-hardened1.patch", - "sha256": "1r10ylx886rslsmrixlijjm4crhwzkl3wj6kpyn2344qik1gxpqr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.160-hardened1/linux-hardened-5.15.160-hardened1.patch" + "name": "linux-hardened-v5.15.167-hardened1.patch", + "sha256": "1mwww490bf5i1njzyprnamfn8n471r94klgn7wghwi2f5vsn6j9g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.167-hardened1/linux-hardened-v5.15.167-hardened1.patch" }, - "sha256": "018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl", - "version": "5.15.160" + "sha256": "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi", + "version": "5.15.167" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.277-hardened1.patch", - "sha256": "1zjw5wl8lj69j402qm8dg3m4dxgq3ppx2jyz8jks976vyhh8fsg4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.277-hardened1/linux-hardened-5.4.277-hardened1.patch" + "name": "linux-hardened-v5.4.284-hardened1.patch", + "sha256": "1skqaq90bigrxg0w075nssqbdq868ii62r8asx0m6wcvd5cl50af", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.284-hardened1/linux-hardened-v5.4.284-hardened1.patch" }, - "sha256": "0l8zq3k07hdprfpvw69ykkf2pdg8wiv28xz733yxsjcfb0l5n7vy", - "version": "5.4.277" + "sha256": "0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp", + "version": "5.4.284" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.92-hardened1.patch", - "sha256": "0cw87ygmisi823y3f7xrck12b6zh3mq1qmb7lcmr3hg6w3xskmn3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.92-hardened1/linux-hardened-6.1.92-hardened1.patch" + "name": "linux-hardened-v6.1.110-hardened1.patch", + "sha256": "1v43n3h9d3y3xjjyf6r8n7a3fh3zpqw4f925bn2z5vwzblmg4bhf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.110-hardened1/linux-hardened-v6.1.110-hardened1.patch" }, - "sha256": "1j9n8gk76nn4gw42iba5zgghr360gb9n1mslr5dyv76wpwkz86ch", - "version": "6.1.92" + "sha256": "0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly", + "version": "6.1.110" + }, + "6.10": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-v6.10.10-hardened1.patch", + "sha256": "13hlk1qd9inq711bz2sw4rq6r2lcagdl7mwxkx6rq8iimic758f2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.10-hardened1/linux-hardened-v6.10.10-hardened1.patch" + }, + "sha256": "1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6", + "version": "6.10.10" }, "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.6.32-hardened1.patch", - "sha256": "19362a6lxs3cnaw19jvda7n791y95lfgn9ki4wmaxnw2qbpi0bgg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.32-hardened1/linux-hardened-6.6.32-hardened1.patch" + "name": "linux-hardened-v6.6.51-hardened1.patch", + "sha256": "03m82lylflnk466ixz3dywnj7scp6ynif4qhbx67ak3f0n44f738", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.51-hardened1/linux-hardened-v6.6.51-hardened1.patch" }, - "sha256": "1qbc8dqmk2xs1cz968rysw5xvhq3lj8g0pxp48fr2qbzy3m29a5a", - "version": "6.6.32" - }, - "6.8": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.8.11-hardened1.patch", - "sha256": "08i03dmri9h6jxcjd9g6s7pv0spqi3f4fgch1ars68cgngikvbpq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.8.11-hardened1/linux-hardened-6.8.11-hardened1.patch" - }, - "sha256": "1di8kr596sf68sm61kp5rz6bn3sb0q5ag1qc5hm8f9dpyq4wv3dp", - "version": "6.8.11" - }, - "6.9": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.9.2-hardened1.patch", - "sha256": "0ph1m0pnlqrhvddz2mjgcwvs0ddcpzigz8kgi9zi063qinlfbm3q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.9.2-hardened1/linux-hardened-6.9.2-hardened1.patch" - }, - "sha256": "1yg5j284y1gz7zwxjz2abvlnas259m1y1vzd9lmcqqar5kgmnv6l", - "version": "6.9.2" + "sha256": "1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w", + "version": "6.6.51" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py index 8b46137afb..0603812124 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py @@ -145,7 +145,7 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]: if not sig_ok: return None - kernel_ver = re.sub(r"(.*)(-hardened[\d]+)$", r'\1', release_info.release.tag_name) + kernel_ver = re.sub(r"v?(.*)(-hardened[\d]+)$", r'\1', release_info.release.tag_name) major = kernel_ver.split('.')[0] sha256_kernel, _ = nix_prefetch_url(f"mirror://kernel/linux/kernel/v{major}.x/linux-{kernel_ver}.tar.xz") @@ -157,8 +157,11 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]: def parse_version(version_str: str) -> Version: + # There have been two variants v6.10[..] and 6.10[..], drop the v + version_str_without_v = version_str[1:] if not version_str[0].isdigit() else version_str version: Version = [] - for component in re.split(r'\.|\-', version_str): + + for component in re.split(r'\.|\-', version_str_without_v): try: version.append(int(component)) except ValueError: @@ -227,7 +230,7 @@ for release in repo.get_releases(): # It's not reliable to exit earlier because not every kernel minor may # have hardened patches, hence the naive search below. i += 1 - if i > 500: + if i > 100: break version = parse_version(release.tag_name) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json index ba862f9551..2eb28ea420 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json @@ -19,22 +19,10 @@ "version": "5.4.284", "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, - "4.19": { - "version": "4.19.322", - "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf" - }, "6.6": { "version": "6.6.52", "hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m" }, - "6.8": { - "version": "6.8.12", - "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" - }, - "6.9": { - "version": "6.9.12", - "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" - }, "6.10": { "version": "6.10.11", "hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix index 8ea483fc25..54c5ace091 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -72,7 +72,7 @@ lib.overrideDerivation (buildLinux (args // { # Make copies of the DTBs named after the upstream names so that U-Boot finds them. # This is ugly as heck, but I don't know a better solution so far. postFixup = '' - dtbDir=${if stdenv.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"} + dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"} rm $dtbDir/bcm283*.dtb copyDTB() { cp -v "$dtbDir/$1" "$dtbDir/$2" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch deleted file mode 100644 index 58a9191989..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst -index 07650ee..934a7a8 100644 ---- a/scripts/Makefile.modinst -+++ b/scripts/Makefile.modinst -@@ -9,7 +9,8 @@ include scripts/Kbuild.include - - # - --__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -+__modules := $(sort $(foreach f,$(wildcard $(MODVERDIR)/*.mod),$(shell \ -+ grep -h '\.ko$$' '$f'))) - modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) - - PHONY += $(modules) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index 5d4ebc214d..9e15991dd6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -39,11 +39,6 @@ patch = ./request-key-helper-updated.patch; }; - modinst_arg_list_too_long = - { name = "modinst-arglist-too-long"; - patch = ./modinst-arg-list-too-long.patch; - }; - hardened = let mkPatch = kernelVersion: { version, sha256, patch }: let src = patch; in { name = lib.removeSuffix ".patch" src.name; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix index 15f92157e1..0d639531e8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix @@ -57,13 +57,12 @@ in stdenv.mkDerivation { pname = "perf-linux"; - version = kernel.version; + inherit (kernel) version src; - inherit (kernel) src; - - # Fix 6.10.0 holding pkg-config completely wrong. - # Patches from perf-tools-next, should be in 6.11 or hopefully backported. - patches = lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [ + patches = [ + # fix wrong path to dmesg + ./fix-dmesg-path.diff + ] ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [ (fetchpatch { url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b"; hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM="; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff new file mode 100644 index 0000000000..0bc3300a2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff @@ -0,0 +1,11 @@ +--- a/tools/perf/util/evsel.c 2023-10-20 15:50:53.011023294 +0200 ++++ b/tools/perf/util/evsel.c 2023-10-20 15:51:03.205997633 +0200 +@@ -3076,7 +3076,7 @@ + + return scnprintf(msg, size, + "The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n" +- "/bin/dmesg | grep -i perf may provide additional information.\n", ++ "\"dmesg | grep -i perf\" may provide additional information.\n", + err, str_error_r(err, sbuf, sizeof(sbuf)), evsel__name(evsel)); + } + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a9e75b6511..5b6f24ae31 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,12 +7,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.51"; - hash = "sha256-dNUTePfL6cAA0EmEG/D36dNJUobDRBHR5+BYrLIYot4="; + version = "6.6.52"; + hash = "sha256-bTsxESXY0uhx9/UjUg9cATC1ErfkxF1gH8TXimYVzX4="; }; main = { - version = "6.10.10"; - hash = "sha256-abxhlF0zmY9WvcQ+FnkR5fNMvrw+oTCIMaCs8DFJ+oA="; + version = "6.10.11"; + hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8="; }; }; @@ -59,7 +59,7 @@ let branch = lib.versions.majorMinor version; maintainers = with lib.maintainers; [ moni lovesegfault atemu shawn8901 zzzsy ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } // (args.argsOverride or { })); in diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 113627e0fd..9b1dbc3c9b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -120,7 +120,7 @@ let maintainers = with lib.maintainers; [ thiagokokada jerrysm64 ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." + lib.optionalString isLqx " (Same as linux_zen, but less aggressive release schedule and additional extra config)"; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } // (args.argsOverride or { })); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix index 4986f0abf4..080571ad71 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "prefix=${placeholder "out"}" ] ++ lib.optional stdenv.hostPlatform.isStatic "ENABLE_SHARED=0"; - hardeningDisable = lib.optional (stdenv.isi686) "stackprotector"; + hardeningDisable = lib.optional (stdenv.hostPlatform.isi686) "stackprotector"; checkTarget = "partcheck"; # "check" needs root diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix index 10da88b691..aab36459ae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ Luflosi ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix index b0513f5663..c83596a1fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix @@ -2,7 +2,7 @@ let bits = - if stdenv.is64bit then "64" + if stdenv.hostPlatform.is64bit then "64" else "32"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/new-lg4ff/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/new-lg4ff/default.nix index a92ee9ae64..8eed8edbc1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/new-lg4ff/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/new-lg4ff/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ matthiasbenaets ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix index 89f4ae7c97..5f0e62b1b8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, libxml2 +, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, cyrus_sasl, libxml2 , enablePython ? true, enableLdap ? true }: @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { libtirpc libcap libevent sqlite lvm2 libuuid keyutils libkrb5 tcp_wrappers libxml2 ] ++ lib.optional enablePython python3 - ++ lib.optional enableLdap openldap; + ++ lib.optionals enableLdap [ + openldap + cyrus_sasl + ]; enableParallelBuilding = true; @@ -48,7 +51,7 @@ stdenv.mkDerivation rec { "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" "--with-modprobedir=${placeholder "out"}/etc/modprobe.d" - ] ++ lib.optional enableLdap "--with-ldap"; + ] ++ lib.optional enableLdap "--enable-ldap"; patches = lib.optionals stdenv.hostPlatform.isMusl [ # http://openwall.com/lists/musl/2015/08/18/10 @@ -103,7 +106,7 @@ stdenv.mkDerivation rec { ''; # One test fails on mips. - # doCheck = !stdenv.isMips; + # doCheck = !stdenv.hostPlatform.isMips; # https://bugzilla.kernel.org/show_bug.cgi?id=203793 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 957f03c5fc..023bdde5b9 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -548,6 +548,26 @@ getNixDrv() { fi } +getVersion() { + local dir="$1" + local rev= + local gitDir="$dir/.git" + if [ -e "$gitDir" ]; then + if [ -z "$(type -P git)" ]; then + echo "warning: Git not found; cannot figure out revision of $dir" >&2 + return + fi + cd "$dir" + rev=$(git --git-dir="$gitDir" rev-parse --short HEAD) + if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then + rev+=M + fi + fi + + echo ".git.$rev" +} + + if [[ -n $buildNix && -z $flake ]]; then log "building Nix..." getNixDrv @@ -569,7 +589,7 @@ fi # nixos-version shows something useful). if [[ -n $canRun && -z $flake ]]; then if nixpkgs=$(runCmd nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$(runCmd $SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) + suffix=$(getVersion "$nixpkgs" || true) if [ -n "$suffix" ]; then echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix index 9acef3cd93..4e0b76dac2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage { picnoir ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index 61ea120772..79dd6c1e8c 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -185,20 +185,27 @@ installPhase() { patchelf --set-rpath "$out/lib:$libPath" "$libname" fi - libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` + # Manually create the right symlinks for the libraries. + # + # We can't just use ldconfig, because it does not create libfoo.so symlinks, + # only libfoo.so.1. + # Also, the symlink chain must be libfoo.so -> libfoo.so.1 -> libfoo.so.123.45, + # or ldconfig will explode. + # See: https://github.com/bminor/glibc/blob/6f3f6c506cdaf981a4374f1f12863b98ac7fea1a/elf/ldconfig.c#L854-L877 - if [[ "$libname" != "$libname_short" ]]; then - ln -srnf "$libname" "$libname_short" - fi + libbase=$(basename "$libname") + libdir=$(dirname "$libname") + soname=$(patchelf --print-soname "$libname") + unversioned=${libbase/\.so\.[0-9\.]*/.so} - if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so || $libname_short =~ libGLX.so || $libname_short =~ libGLX_nvidia.so ]]; then - major=0 - else - major=1 - fi + if [[ -n "$soname" ]]; then + if [[ "$soname" != "$libbase" ]]; then + ln -s "$libbase" "$libdir/$soname" + fi - if [[ "$libname" != "$libname_short.$major" ]]; then - ln -srnf "$libname" "$libname_short.$major" + if [[ "$soname" != "$unversioned" ]]; then + ln -s "$soname" "$libdir/$unversioned" + fi fi done diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index dd4cd3d94a..8165ea08f2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,12 +33,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.107.02"; - sha256_64bit = "sha256-+XwcpN8wYCjYjHrtYx+oBhtVxXxMI02FO1ddjM5sAWg="; - sha256_aarch64 = "sha256-mVEeFWHOFyhl3TGx1xy5EhnIS/nRMooQ3+LdyGe69TQ="; - openSha256 = "sha256-Po+pASZdBaNDeu5h8sgYgP9YyFAm9ywf/8iyyAaLm+w="; - settingsSha256 = "sha256-WFZhQZB6zL9d5MUChl2kCKQ1q9SgD0JlP4CMXEwp2jE="; - persistencedSha256 = "sha256-Vz33gNYapQ4++hMqH3zBB4MyjxLxwasvLzUJsCcyY4k="; + version = "550.120"; + sha256_64bit = "sha256-gBkoJ0dTzM52JwmOoHjMNwcN2uBN46oIRZHAX8cDVpc="; + sha256_aarch64 = "sha256-dzTEUuSIWKEuAMhsL9QkR7CCHpm6m9ZwtGSpSKqwJdc="; + openSha256 = "sha256-O3OrGGDR+xrpfyPVQ04aM3eGI6aWuZfRzmaPjMfnGIg="; + settingsSha256 = "sha256-fPfIPwpIijoUpNlAUt9C8EeXR5In633qnlelL+btGbU="; + persistencedSha256 = "sha256-ztEemWt0VR+cQbxDmMnAbEVfThdvASHni4SJ0dTZ2T4="; }; latest = selectHighestVersion production (generic { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix index 0a7e02f4ad..a1e1dc109a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pam libp11.passthru.openssl libp11 ] - ++ lib.optionals stdenv.isDarwin [ libintl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; meta = with lib; { homepage = "https://github.com/OpenSC/pam_p11"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix index dcecfa4c13..ac4cae906a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix @@ -4,7 +4,7 @@ , buildPackages , docbook_xml_dtd_44 , docbook_xsl -, withLibcap ? stdenv.isLinux, libcap +, withLibcap ? stdenv.hostPlatform.isLinux, libcap , pkg-config , meson , ninja diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix index 5c11195272..0ce82515d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202405"; + version = "202409"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - hash = "sha256-yEe1lWbvafc3N3+K9WMMlIXVVX+fVO8QsuKdyIqiKAg="; + hash = "sha256-eCFyk6V1wpTImDKbsSiwgnqIduh62YG8GK0jxZL04Yc="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index bb8a81d460..15ca9f9212 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.0.0-55653"; + version = "20.0.1-55659"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-ohGhaLVzXuR/mQ6ToeGbTixKy01F14JSgTs128vGZXM="; + hash = "sha256-5h8WZB7L6D9KOgIPSstN1sNcf3FZQiOQFB5MUC4YzvA="; }; hardeningDisable = [ "pic" "format" ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { undmg $src export sourceRoot=prl-tools-build - 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot + 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm"}.iso" -o$sourceRoot ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) runHook postUnpack @@ -111,12 +111,12 @@ stdenv.mkDerivation (finalAttrs: { cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra - ${lib.optionalString stdenv.isAarch64 + ${lib.optionalString stdenv.hostPlatform.isAarch64 "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} ) ( # tools - cd tools/tools${if stdenv.isAarch64 then "-arm64" else if stdenv.isx86_64 then "64" else "32"} + cd tools/tools${if stdenv.hostPlatform.isAarch64 then "-arm64" else if stdenv.hostPlatform.isx86_64 then "64" else "32"} mkdir -p $out/lib # prltoolsd contains hardcoded /bin/bash path @@ -169,11 +169,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; license = licenses.unfree; - maintainers = with maintainers; [ catap wegank ]; + maintainers = with maintainers; [ catap wegank codgician ]; platforms = platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh new file mode 100644 index 0000000000..58b7c14c47 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq + +set -eu -o pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +path="$nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix" + +# Currently this script only supports Parallels 20 +# Please change the knowledge base url after each major release +kb_url="https://kb.parallels.com/en/130212" +content="$(curl -s "$kb_url")" + +# Match latest version from Parallels knowledge base +regex='' +if [[ $content =~ $regex ]]; then + major_version="${BASH_REMATCH[1]}" + version="${BASH_REMATCH[2]}-${BASH_REMATCH[3]}" + echo "Found latest version: $version, major version: $major_version" +else + echo "Failed to extract version from $kb_url" + exit 1 +fi + +# Extract and compare current version +old_version="$(grep -o 'version = ".*"' "$path" | awk -F'"' '{print $2}')" +if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then + echo "Current version $old_version is up-to-date" + exit 0 +fi + +# Update version and hash +dmg_url="https://download.parallels.com/desktop/v${major_version}/${version}/ParallelsDesktop-${version}.dmg" +sha256="$(nix store prefetch-file $dmg_url --json | jq -r '.hash')" +sed -i -e "s/version = \"$old_version\"/version = \"$version\"/" \ + -e "s/hash = \"sha256-.*\"/hash = \"$sha256\"/" "$path" + +git commit -qm "linuxPackages_latest.prl-tools: $old_version -> $version" "$path" +echo "Updated linuxPackages_latest.prl-tools $old_version -> $version" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix index da2c809341..32a7f7865b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix @@ -14,7 +14,7 @@ # system (or very similar like that found in Cygwin). The one # exception is ‘watch’ which is portable enough to run on pretty much # any UNIX-compatible system. -, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) +, watchOnly ? !(stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isCygwin) , binlore , procps diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix index 35478732fb..5a1df895b4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libtraceevent (perl.withPackages (ps: with ps; [ DBI DBDSQLite ])) ] - ++ lib.optionals (!stdenv.isAarch64) [ dmidecode ]; + ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ dmidecode ]; configureFlags = [ "--sysconfdir=/etc" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/ras-mc-ctl \ --replace 'find_prog ("modprobe") or exit (1)' '"${kmod}/bin/modprobe"' '' - + lib.optionalString (!stdenv.isAarch64) '' + + lib.optionalString (!stdenv.hostPlatform.isAarch64) '' substituteInPlace $out/bin/ras-mc-ctl \ --replace 'find_prog ("dmidecode")' '"${dmidecode}/bin/dmidecode"' ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index 5348f93225..9956d0e653 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, kernel, bc, fetchpatch }: +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + bc, +}: stdenv.mkDerivation { pname = "rtl8188eus-aircrack"; - version = "${kernel.version}-unstable-2023-09-21"; + version = "${kernel.version}-unstable-2024-09-18"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8188eus"; - rev = "3fae7237ba121f1169e9a2ea55040dc123697d3b"; - sha256 = "sha256-ILSMEt9nMdg1ZbFeatWm8Yxf6a/E7Vm7KtKhN933KTc="; + rev = "f969c544ab6100da3d80a5709e077f920f2df698"; + sha256 = "sha256-uwO2nDDff4t0PZw3mLWmUPOHHftDgoaBaWMXQKHQunI="; }; prePatch = '' @@ -17,18 +23,6 @@ stdenv.mkDerivation { --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - # until https://github.com/aircrack-ng/rtl8188eus/pull/275 get merged using patches to fix and add newer kernel 6.7 support - patches = [ - (fetchpatch { - url = "https://github.com/aircrack-ng/rtl8188eus/commit/dcf602320ce0cfa316c990ce067317954d75edae.patch"; - hash = "sha256-AkrqqWv5TPHBfQ7FhS0urXnUw5QHQUrbvEb+NkLxpJA="; - }) - (fetchpatch { - url = "https://github.com/aircrack-ng/rtl8188eus/commit/c5647f440a38e72c97054b949760ac14faf22b6c.patch"; - hash = "sha256-0W0o68V0GkN+pJsI18ZMM8nyQre6FbOPpspegOOMioM="; - }) - ]; - hardeningDisable = [ "pic" ]; @@ -45,6 +39,6 @@ stdenv.mkDerivation { homepage = "https://github.com/aircrack-ng/rtl8188eus"; license = licenses.gpl2Only; maintainers = with maintainers; [ moni ]; - broken = (lib.versionAtLeast kernel.version "6.8") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + broken = (lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix index 434397ebc7..67046b28c9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { defelo ]; broken = - stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + stdenv.hostPlatform.isAarch64 + || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix index 86eee7ac7c..5dcee061ed 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "0-unstable-2024-07-27"; + version = "0-unstable-2024-08-22"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "610e04fc38343dcdcef95475c1579efc07572f1f"; - hash = "sha256-54XhluBnspjyKR+OjYRa5g66N8F0d/oV3x89IV3zdT0="; + rev = "764a1ee307d7e5720a93b8139c94d76737eced91"; + hash = "sha256-xHo9Qww3w36/UFhMhoLjSzZKpC2VKywJZlCPL30XirA="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix index 98cb0c061e..682434fa03 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libbsd libxcrypt ] - ++ lib.optional (pam != null && stdenv.isLinux) pam + ++ lib.optional (pam != null && stdenv.hostPlatform.isLinux) pam ++ lib.optional withTcb tcb; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 2e0a13846f..23285d5e26 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - broken = stdenv.isAarch64 || (lib.versionOlder kernel.version "5.5"); + broken = stdenv.hostPlatform.isAarch64 || (lib.versionOlder kernel.version "5.5"); description = "Keyboard and hardware I/O driver for TUXEDO Computers laptops"; homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index e393bf1ac0..61b52ede77 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, zlib, shadow -, capabilitiesSupport ? stdenv.isLinux +, capabilitiesSupport ? stdenv.hostPlatform.isLinux , libcap_ng , libxcrypt , ncursesSupport ? true @@ -12,8 +12,8 @@ , translateManpages ? true , po4a , installShellFiles -, writeSupport ? stdenv.isLinux -, shadowSupport ? stdenv.isLinux +, writeSupport ? stdenv.hostPlatform.isLinux +, shadowSupport ? stdenv.hostPlatform.isLinux , memstreamHook , gitUpdater }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # the greater util-linux toolset. # Compatibility is maintained by symlinking the binaries from the # smaller outputs in the bin output. - outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optionals stdenv.isLinux [ "mount" ] ++ [ "login" ] ++ lib.optionals stdenv.isLinux [ "swap" ]; + outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "mount" ] ++ [ "login" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "swap" ]; separateDebugInfo = true; postPatch = '' @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' moveToOutput bin/mount "$mount" moveToOutput bin/umount "$mount" ln -svf "$mount/bin/"* $bin/bin/ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { moveToOutput sbin/sulogin "$login" prefix=$login _moveSbin ln -svf "$login/bin/"* $bin/bin/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' moveToOutput sbin/swapon "$swap" moveToOutput sbin/swapoff "$swap" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix index b61b242291..b0da374d98 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, fetchpatch }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; @@ -11,6 +11,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM="; }; + patches = [ + # Fix build on kernel 6.11 + # https://github.com/medusalix/xone/pull/48 + (fetchpatch { + name = "kernel-6.11.patch"; + url = "https://github.com/medusalix/xone/commit/28df566c38e0ee500fd5f74643fc35f21a4ff696.patch"; + hash = "sha256-X14oZmxqqZJoBZxPXGZ9R8BAugx/hkSOgXlGwR5QCm8="; + }) + ]; + setSourceRoot = '' export sourceRoot=$(pwd)/${finalAttrs.src.name} ''; diff --git a/third_party/nixpkgs/pkgs/servers/akkoma/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/default.nix index ec69767338..8336cb4a9a 100644 --- a/third_party/nixpkgs/pkgs/servers/akkoma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/akkoma/default.nix @@ -5,7 +5,6 @@ , fetchFromGitLab , cmake , file -, writeText , nixosTests , ... }: diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index 68cad9be1a..f741858b01 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -33,7 +33,7 @@ let procps gnused coreutils # used by helper scripts - ] ++ lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]); # for systemd unit activation check in stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ] - ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/servers/apache-airflow/python-package.nix b/third_party/nixpkgs/pkgs/servers/apache-airflow/python-package.nix index 14c39ede5a..d178a3d150 100644 --- a/third_party/nixpkgs/pkgs/servers/apache-airflow/python-package.nix +++ b/third_party/nixpkgs/pkgs/servers/apache-airflow/python-package.nix @@ -244,7 +244,7 @@ buildPythonPackage rec { # https://github.com/apache/airflow/issues/33854 substituteInPlace pyproject.toml \ --replace '[project]' $'[project]\nname = "apache-airflow"\nversion = "${version}"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix failing test on Hydra substituteInPlace airflow/utils/db.py \ --replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db" @@ -287,7 +287,7 @@ buildPythonPackage rec { "tests/core/test_core.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "bash_operator_kill" # psutil.AccessDenied ]; diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index e30beee899..7b19d1df56 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { ps.gevent-websocket ps.pillow ps.setuptools + ps.psycopg2 ])) ] ++ runtimeProgDeps; diff --git a/third_party/nixpkgs/pkgs/servers/bindle/default.nix b/third_party/nixpkgs/pkgs/servers/bindle/default.nix index b9ff3937e9..bfd9b2872b 100644 --- a/third_party/nixpkgs/pkgs/servers/bindle/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bindle/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; # Tests require a network nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0="; diff --git a/third_party/nixpkgs/pkgs/servers/binserve/default.nix b/third_party/nixpkgs/pkgs/servers/binserve/default.nix index 62cddd3e0d..3864c79299 100644 --- a/third_party/nixpkgs/pkgs/servers/binserve/default.nix +++ b/third_party/nixpkgs/pkgs/servers/binserve/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix index f4ffeeb334..47eb65bf70 100644 --- a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix @@ -54,7 +54,7 @@ buildGoModule rec { "-lstdc++" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 8192 ''; diff --git a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix index 4b5071be7b..7589ae3630 100644 --- a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix @@ -24,7 +24,7 @@ let inherit (llvmPackages) stdenv; mkDerivation = ( - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.llvmPackages_16.stdenv else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { @@ -83,10 +83,10 @@ in mkDerivation rec { python3 perl llvmPackages.lld - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm yasm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools findutils darwin.bootstrap_cmds @@ -96,7 +96,7 @@ in mkDerivation rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # their vendored version is too old and missing this patch: https://github.com/corrosion-rs/corrosion/pull/205 corrosionSrc = if rustSupport then fetchFromGitHub { @@ -154,7 +154,7 @@ in mkDerivation rec { --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-style \ --replace 'git rev-parse --show-toplevel' '$src' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|gfind|find|' cmake/tools.cmake sed -i 's|ggrep|grep|' cmake/tools.cmake '' + lib.optionalString rustSupport '' @@ -168,7 +168,7 @@ in mkDerivation rec { popd cargoSetupPostPatchHook() { true; } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Make sure Darwin invokes lld.ld64 not lld. substituteInPlace cmake/tools.cmake \ --replace '--ld-path=''${LLD_PATH}' '-fuse-ld=lld' @@ -183,10 +183,10 @@ in mkDerivation rec { env = { NIX_CFLAGS_COMPILE = # undefined reference to '__sync_val_compare_and_swap_16' - lib.optionalString stdenv.isx86_64 " -mcx16" + + lib.optionalString stdenv.hostPlatform.isx86_64 " -mcx16" + # Silence ``-Wimplicit-const-int-float-conversion` error in MemoryTracker.cpp and # ``-Wno-unneeded-internal-declaration` TreeOptimizer.cpp. - lib.optionalString stdenv.isDarwin " -Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; + lib.optionalString stdenv.hostPlatform.isDarwin " -Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; }; # https://github.com/ClickHouse/ClickHouse/issues/49988 diff --git a/third_party/nixpkgs/pkgs/servers/code-server/default.nix b/third_party/nixpkgs/pkgs/servers/code-server/default.nix index 5fd0f7867d..5662dc5d33 100644 --- a/third_party/nixpkgs/pkgs/servers/code-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/code-server/default.nix @@ -133,9 +133,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ xorg.libX11 xorg.libxkbfile - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa CoreServices @@ -246,7 +246,7 @@ stdenv.mkDerivation (finalAttrs: { xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ # (see issue #101229). pushd ./lib/vscode/remote/node_modules/@parcel/watcher diff --git a/third_party/nixpkgs/pkgs/servers/confluencepot/default.nix b/third_party/nixpkgs/pkgs/servers/confluencepot/default.nix index d1aa0031f2..89233d2063 100644 --- a/third_party/nixpkgs/pkgs/servers/confluencepot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/confluencepot/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { --replace "confluence.html" "$out/share/confluence.html" ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/confluencePot $out/bin/${pname} ''; diff --git a/third_party/nixpkgs/pkgs/servers/coturn/default.nix b/third_party/nixpkgs/pkgs/servers/coturn/default.nix index 8578940b66..061ea52073 100644 --- a/third_party/nixpkgs/pkgs/servers/coturn/default.nix +++ b/third_party/nixpkgs/pkgs/servers/coturn/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 ]; platforms = platforms.all; maintainers = with maintainers; [ _0x4A6F ]; - broken = stdenv.isDarwin; # 2018-10-21 + broken = stdenv.hostPlatform.isDarwin; # 2018-10-21 }; } diff --git a/third_party/nixpkgs/pkgs/servers/dante/default.nix b/third_party/nixpkgs/pkgs/servers/dante/default.nix index 278c518a81..9b99f51aef 100644 --- a/third_party/nixpkgs/pkgs/servers/dante/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dante/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc libxcrypt ]; - configureFlags = if !stdenv.isDarwin + configureFlags = if !stdenv.hostPlatform.isDarwin then [ "--with-libc=libc.so.6" ] else [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ]; - dontAddDisableDepTrack = stdenv.isDarwin; + dontAddDisableDepTrack = stdenv.hostPlatform.isDarwin; patches = [ # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer diff --git a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix index a590036ea5..bb72aeb170 100644 --- a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix @@ -52,7 +52,7 @@ buildGoModule rec { ''; # PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { inherit (nixosTests) dendrite; diff --git a/third_party/nixpkgs/pkgs/servers/dico/default.nix b/third_party/nixpkgs/pkgs/servers/dico/default.nix index 658d477a48..de43d3389b 100644 --- a/third_party/nixpkgs/pkgs/servers/dico/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dico/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { strictDeps = true; # ERROR: All 188 tests were run, 90 failed unexpectedly. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Flexible dictionary server and client implementing RFC 2229"; diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index fde2c94306..545474200b 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -40,10 +40,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ libidn2 libtool libxml2 openssl libuv nghttp2 jemalloc ] - ++ lib.optional stdenv.isLinux libcap + ++ lib.optional stdenv.hostPlatform.isLinux libcap ++ lib.optional enableGSSAPI libkrb5 ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])) - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix index bb85bdb320..3cda1b6cf1 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix @@ -62,7 +62,7 @@ in buildGoModule rec { # it's a lint rather than a test of functionality, so it's safe to disable. substituteInPlace test/presubmit_test.go \ --replace "TestImportOrdering" "SkipImportOrdering" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # loopback interface is lo0 on macos sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go diff --git a/third_party/nixpkgs/pkgs/servers/dns/doh-proxy-rust/default.nix b/third_party/nixpkgs/pkgs/servers/dns/doh-proxy-rust/default.nix index 244ec35a67..5de2732b18 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eXPAn2ziSdciZa6YrOIa7y7Lms681X+yVAD9HrvsZHg="; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; passthru.tests = { inherit (nixosTests) doh-proxy-rust; }; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index e3926fe494..5c3c5df262 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , ngtcp2-gnutls, xdp-tools +, fstrm, protobufc , sphinx , autoreconfHook , nixosTests, knot-resolver, knot-dns, runCommandLocal @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { "--with-configdir=/etc/knot" "--with-rundir=/run/knot" "--with-storage=/var/lib/knot" + "--with-module-dnstap" "--enable-dnstap" ]; patches = [ @@ -40,11 +42,11 @@ stdenv.mkDerivation rec { ngtcp2-gnutls # DoQ support in kdig (and elsewhere but not much use there yet) libmaxminddb # optional for geoip module (it's tiny) # without sphinx &al. for developer documentation - # TODO: add dnstap support? - ] ++ lib.optionals stdenv.isLinux [ + fstrm protobufc # dnstap support + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng systemd xdp-tools libbpf libmnl # XDP support (it's Linux kernel API) - ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls + ] ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; @@ -60,7 +62,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit knot-resolver; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) knot kea; prometheus-exporter = nixosTests.prometheus-exporters.knot; # Some dependencies are very version-sensitive, so the might get dropped diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 198c7835fd..315a1e3aaf 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -64,7 +64,7 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] ## the rest are optional dependencies - ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] + ++ optionals stdenv.hostPlatform.isLinux [ /*lib*/systemd libcap_ng ] ++ [ jemalloc nghttp2 ] ++ [ fstrm protobufc ] # dnstap support ; @@ -78,7 +78,7 @@ unwrapped = stdenv.mkDerivation rec { ] ++ optional doInstallCheck "-Dunit_tests=enabled" ++ optional doInstallCheck "-Dconfig_tests=enabled" - ++ optional stdenv.isLinux "-Dsystemd_files=enabled" # used by NixOS service + ++ optional stdenv.hostPlatform.isLinux "-Dsystemd_files=enabled" # used by NixOS service #"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too. ; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix index 1037c88229..e7633761a5 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Authoritative DNS server"; homepage = "https://www.powerdns.com"; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; license = licenses.gpl2Only; maintainers = with maintainers; [ mic92 disassembler nickcao ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/domoticz/default.nix b/third_party/nixpkgs/pkgs/servers/domoticz/default.nix index 72b4d71a62..7f89645b3f 100644 --- a/third_party/nixpkgs/pkgs/servers/domoticz/default.nix +++ b/third_party/nixpkgs/pkgs/servers/domoticz/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/domoticz/domoticz/blob/${version}/History.txt"; license = licenses.gpl3Plus; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin mainProgram = "domoticz"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/fedigroups/default.nix b/third_party/nixpkgs/pkgs/servers/fedigroups/default.nix index e823a5017e..764dee9ff4 100644 --- a/third_party/nixpkgs/pkgs/servers/fedigroups/default.nix +++ b/third_party/nixpkgs/pkgs/servers/fedigroups/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { homepage = "https://git.ondrovo.com/MightyPork/group-actor#fedi-groups"; diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix index bc0a171666..287809a451 100644 --- a/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix +++ b/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix @@ -81,7 +81,7 @@ let # Needed with GCC 12 "-Wno-error=missing-template-keyword" # Needed to compile on aarch64 - (lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc") + (lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc") ]; inherit patches; diff --git a/third_party/nixpkgs/pkgs/servers/frr/default.nix b/third_party/nixpkgs/pkgs/servers/frr/default.nix index 76d0dc8b2a..bcb829d716 100644 --- a/third_party/nixpkgs/pkgs/servers/frr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/frr/default.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { readline rtrlib zeromq - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ] ++ lib.optionals snmpSupport [ net-snmp diff --git a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix index 0aba1e90a1..895e3cd063 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # utmp.h is deprecated on aarch64-darwin - postPatch = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) '' + postPatch = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' for file in login.*; do substituteInPlace $file --replace "#ifdef HAVE_UTMP_H" "#if 0" done diff --git a/third_party/nixpkgs/pkgs/servers/gemini/stargazer/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/stargazer/default.nix index 8aae6fa7b7..4c6b178ae3 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/stargazer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/stargazer/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles scdoc ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' scdoc < doc/stargazer.scd > stargazer.1 diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix index d871c79d6c..dbd1c527ef 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; checkFlags = [ "--skip function_source_schemas" diff --git a/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix b/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix index 3f57180795..c313b5f8d5 100644 --- a/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { ''; # tests are working only on x86_64-linux - # doCheck = stdenv.isLinux && stdenv.isx86_64; + # doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64; # checks are currently very unstable in our setup, so we should test manually for now doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/gpsd/default.nix b/third_party/nixpkgs/pkgs/servers/gpsd/default.nix index ab1668ccfb..4b9269ab66 100644 --- a/third_party/nixpkgs/pkgs/servers/gpsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gpsd/default.nix @@ -11,7 +11,7 @@ , dbus , libusb1 , ncurses -, kppsSupport ? stdenv.isLinux, pps-tools +, kppsSupport ? stdenv.hostPlatform.isLinux, pps-tools , python3Packages # optional deps for GUI packages diff --git a/third_party/nixpkgs/pkgs/servers/hbase/default.nix b/third_party/nixpkgs/pkgs/servers/hbase/default.nix index 401ebef8bd..93afa6d5e1 100644 --- a/third_party/nixpkgs/pkgs/servers/hbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hbase/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , makeWrapper -, jdk8_headless , jdk11_headless , nixosTests }: diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index eea3a1881e..8ef2dda17d 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.9.2"; + version = "2024.9.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix index b135b29bd7..3345af4403 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix @@ -64,6 +64,8 @@ smartthinq-sensors = callPackage ./smartthinq-sensors {}; + solax_modbus = callPackage ./solax_modbus {}; + solis-sensor = callPackage ./solis-sensor {}; somweb = callPackage ./somweb {}; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix new file mode 100644 index 0000000000..078d7db355 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix @@ -0,0 +1,29 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + pymodbus, +}: + +buildHomeAssistantComponent rec { + owner = "wills106"; + domain = "solax_modbus"; + version = "2024.09.4"; + + src = fetchFromGitHub { + owner = "wills106"; + repo = "homeassistant-solax-modbus"; + rev = "refs/tags/${version}"; + hash = "sha256-xWWsV57ozzEQWRfO1t4EbwD7DWiB1go+iJbTLPuufJs="; + }; + + dependencies = [ pymodbus ]; + + meta = { + changelog = "https://github.com/wills106/homeassistant-solax-modbus/releases/tag/${version}"; + description = "SolaX Power Modbus custom_component for Home Assistant (Supports some Ginlong Solis, Growatt, Sofar Solar, TIGO TSI & Qcells Q.Volt Hyb)"; + homepage = "https://github.com/wills106/homeassistant-solax-modbus"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ Luflosi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix index 40899c8926..fc659ba68e 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "AlexxIT"; domain = "xiaomi_gateway3"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "XiaomiGateway3"; rev = "v${version}"; - hash = "sha256-C8aY23e6iWANbhCRQYNHx+3fomVO+7qdxj+qfv+K3JM="; + hash = "sha256-E3BekX0Xbp1R36+dYmOlsI2BTrdGjFsMoYYRIiBi1qU="; }; propagatedBuildInputs = [ zigpy ]; @@ -25,7 +25,7 @@ buildHomeAssistantComponent rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v{version}"; + changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v${version}"; description = "Home Assistant custom component for control Xiaomi Multimode Gateway (aka Gateway 3), Xiaomi Multimode Gateway 2, Aqara Hub E1 on default firmwares over LAN"; homepage = "https://github.com/AlexxIT/XiaomiGateway3"; maintainers = with maintainers; [ azuwis ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix index 11ec3d02ad..f8fa78acf1 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "hourly-weather"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "decompil3d"; repo = "lovelace-hourly-weather"; rev = version; - hash = "sha256-IvwWeksEnq44PhCpUXVufYb8w5XEX9Dk0LMLLeM7Dps="; + hash = "sha256-dDWdVAVrZrZIyGG9gOyLohxRZ3DGfjbvW3gGCLqZr+A="; }; - npmDepsHash = "sha256-4uQfaYMg533xZobAl6+/9+FsHAFBm03wrF01nDa53Qg="; + npmDepsHash = "sha256-UzbMDlVOef6dO+tOeTHBBeuT578brklibbfma+VVYD8="; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 5459606f7c..4a4a6b8eed 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -408,7 +408,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.9.2"; + hassVersion = "2024.9.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-qAnEdH1MDPsCKDubpYL5AswcsaPqGm+TrKdBcDD3np8="; + hash = "sha256-W/qngUrc/R3lqdIWUFIXtP9IJ6t+VGdeAdJyZuGm94Q="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-gWQU18GfnsxttRzpoN9WeNeHOgioTxF9DmG2SwNuzEY="; + hash = "sha256-Qp1AiB89sq1OrAVR7qLEfX1j8kW8L2lb4Z1x4z4AzP0="; }; build-system = with python.pkgs; [ @@ -537,7 +537,7 @@ in python.pkgs.buildPythonApplication rec { makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; # upstream only tests on Linux, so do we. - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; nativeCheckInputs = with python.pkgs; [ # test infrastructure (selectively from requirement_test.txt) diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix index 67645e0c57..93b21249b8 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling +, hatch-vcs , home-assistant , python }: buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.9.2"; + version = "2024.9.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,19 +18,20 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-o5bk63yErDOqNlYeGD7nMNuQ2p9rQuRYXlmfIMo8w8k="; + hash = "sha256-ohk0Gxq+q7PH/+SRMEu4KFz/xoc/TDeuEzTnMjaYMBU="; }; build-system = [ - poetry-core + hatchling + hatch-vcs home-assistant ]; postPatch = '' # Relax constraint to year and month substituteInPlace pyproject.toml --replace-fail \ - 'homeassistant = "${version}"' \ - 'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"' + 'homeassistant==${version}' \ + 'homeassistant~=${lib.versions.majorMinor home-assistant.version}' ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix index d7377a5d3e..5f93c55867 100644 --- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -67,7 +67,7 @@ buildGo123Module rec { make ui ''; - doCheck = !stdenv.isDarwin; # darwin sandbox limitations around network access, access to /etc/protocols and likely more + doCheck = !stdenv.hostPlatform.isDarwin; # darwin sandbox limitations around network access, access to /etc/protocols and likely more checkFlags = let skippedTests = [ diff --git a/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix b/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix index 0b957e6337..f9ce34fde8 100644 --- a/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix +++ b/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix @@ -50,9 +50,11 @@ buildNpmPackage rec { patchShebangs .next/standalone/server.js ''; - nativeBuildInputs = [ git ] ++ lib.optionals stdenv.isDarwin [ cctools ]; + nativeBuildInputs = [ git ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; - buildInputs = [ nodePackages.node-gyp-build ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = [ + nodePackages.node-gyp-build + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; env.PYTHON = "${python3}/bin/python"; @@ -107,6 +109,6 @@ buildNpmPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/angie/console-light.nix b/third_party/nixpkgs/pkgs/servers/http/angie/console-light.nix index 15d035d21d..0966e9b94a 100644 --- a/third_party/nixpkgs/pkgs/servers/http/angie/console-light.nix +++ b/third_party/nixpkgs/pkgs/servers/http/angie/console-light.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, gzip , brotli }: diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index c0ebb2e8bf..2d9ac45b8e 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { lib.optional brotliSupport brotli ++ lib.optional sslSupport openssl ++ lib.optional modTlsSupport rustls-ffi ++ - lib.optional (modTlsSupport && stdenv.isDarwin) Foundation ++ + lib.optional (modTlsSupport && stdenv.hostPlatform.isDarwin) Foundation ++ lib.optional ldapSupport openldap ++ # there is no --with-ldap flag lib.optional libxml2Support libxml2 ++ lib.optional http2Support nghttp2 ++ - lib.optional stdenv.isDarwin libiconv; + lib.optional stdenv.hostPlatform.isDarwin libiconv; postPatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; # Required for ‘pthread_cancel’. - NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lgcc_s"; configureFlags = [ "--with-apr=${apr.dev}" diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix index ddd33184e0..bebd1278ac 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ apacheHttpd python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix index 87e80976b8..092c13f070 100644 --- a/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix +++ b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91" patchShebangs bin/rebar - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # LTO with Clang produces LLVM bitcode, which causes linking to fail quietly. # (There are warnings, but no hard errors, and it produces an empty dylib.) substituteInPlace src/jiffy/rebar.config.script --replace '"-flto"' '""' diff --git a/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix b/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix index be7ed60083..b7dfb2d3b6 100644 --- a/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # FIXME: checkPhase on darwin will leave some zombie spawn processes # see https://github.com/NixOS/nixpkgs/issues/205620 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # tests depend on network interface, may fail with virtual IPs. "--skip=validate_printed_urls" diff --git a/third_party/nixpkgs/pkgs/servers/http/merecat/default.nix b/third_party/nixpkgs/pkgs/servers/http/merecat/default.nix index 6231fb9e2a..344f81da2f 100644 --- a/third_party/nixpkgs/pkgs/servers/http/merecat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/merecat/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # Strange header and/or linker errors - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix index 9369259ff6..266c09755a 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation { ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=deprecated-declarations" "-Wno-error=gnu-folding-constant" "-Wno-error=unused-but-set-variable" @@ -173,7 +173,7 @@ stdenv.mkDerivation { inherit postPatch; - hardeningEnable = lib.optional (!stdenv.isDarwin) "pie"; + hardeningEnable = lib.optional (!stdenv.hostPlatform.isDarwin) "pie"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix index 6f7ff9ceb7..bddb334e8c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix @@ -100,11 +100,11 @@ stdenv.mkDerivation rec { ++ map (mod: "--add-module=${mod.src}") modules; env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough" - + optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations"; + + optionalString stdenv.hostPlatform.isDarwin " -Wno-error=deprecated-declarations"; preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); - hardeningEnable = optional (!stdenv.isDarwin) "pie"; + hardeningEnable = optional (!stdenv.hostPlatform.isDarwin) "pie"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix b/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix index 927ee7246c..e0b20f68bf 100644 --- a/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix @@ -10,8 +10,6 @@ , pcre , perlPackages , python3 -, xz -, zlib , catch2 # recommended dependencies , withHwloc ? true @@ -20,9 +18,9 @@ , curl , withCurses ? true , ncurses -, withCap ? stdenv.isLinux +, withCap ? stdenv.hostPlatform.isLinux , libcap -, withUnwind ? stdenv.isLinux +, withUnwind ? stdenv.hostPlatform.isLinux , libunwind # optional dependencies , withBrotli ? false @@ -66,7 +64,7 @@ stdenv.mkDerivation rec { # [2]: https://github.com/apache/trafficserver/blob/3fd2c60/configure.ac#L742-L788 nativeBuildInputs = [ makeWrapper pkg-config file python3 ] ++ (with perlPackages; [ perl ExtUtilsMakeMaker ]) - ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; buildInputs = [ openssl @@ -97,10 +95,10 @@ stdenv.mkDerivation rec { tools/check-unused-dependencies substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace configure \ --replace '/usr/include/linux' '${linuxHeaders}/include/linux' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # 'xcrun leaks' probably requires non-free XCode substituteInPlace iocore/net/test_certlookup.cc \ --replace 'xcrun leaks' 'true' diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index e5a40d2aae..b292780505 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} - ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} + ${optionalString withPHP82 "./configure php --module=php82 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index 5388376720..18f94c5998 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -3,21 +3,21 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.25.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-TkfyhePilOwuW6+MtTqYUYvpP/FnFhpsHt2APMFNbvo="; + hash = "sha256-sjgSbKKTUq6HL7QZ3LNU1Eo+2n/KnlY7Yt80lXAR26k="; rev = "v${version}"; }; - vendorHash = "sha256-LlVZRHotJcHtgeGXIDnbIwpO8iCrBB8nXBnqzHcrJWk="; + vendorHash = "sha256-YxZuAo8l3fhCGCEQVPzKeVdL7i4jWe8rZ5pILI4NVP4="; nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ vips ] - ++ lib.optionals stdenv.isDarwin [ libunwind ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libunwind ]; preBuild = '' export CGO_LDFLAGS_ALLOW='-(s|w)' diff --git a/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix b/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix index e70d6cc0a8..b31a7e16cd 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/lib" "--with-rundir=/run" "--with-logdir=/var/log" - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "--enable-sctp=${lksctp-tools.out}/lib" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sqlite ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; enableParallelBuilding = true; # Missing install depends: diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 64ce9873f4..b0d5ffaa17 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { runtimeDeps = [ openssl ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin nativeCheckInputs = [ mono ]; testProjectFile = "src/Jackett.Test/Jackett.Test.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 5abc811fc7..2ef6b0fdf3 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.5"; + version = "25.0.6"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-2PEQjdz+r/qRJxlu0jI2watkNOUkf4bUCkcNPrLsaMg="; + hash = "sha256-1VHixRgErao/1ZEJv+rlnNmUd2NT35X89D8wuUhYF08="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/third_party/nixpkgs/pkgs/servers/komga/default.nix b/third_party/nixpkgs/pkgs/servers/komga/default.nix index f0295a5e94..4d9eb36af8 100644 --- a/third_party/nixpkgs/pkgs/servers/komga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-PxfJdOnw6Yb41LsqaTwyY7v4hLuaTJwlXgUuy+7XGQo="; + sha256 = "sha256-ihZS4mNHOk0QoK1SCfjVWATyfGNpwTS/X4f5tr2aoBU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/krill/default.nix b/third_party/nixpkgs/pkgs/servers/krill/default.nix index a8847215d6..f310b4d020 100644 --- a/third_party/nixpkgs/pkgs/servers/krill/default.nix +++ b/third_party/nixpkgs/pkgs/servers/krill/default.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Z12fUK4TUgk38/vNAt8RWLFGLc8WnZAgHWz0xl1QKLI="; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; # disable failing tests on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "RPKI Certificate Authority and Publication Server written in Rust"; diff --git a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix index 279a099c9c..6c5e88633e 100644 --- a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix index e7be597d7e..7a2c42fad1 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] - ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ systemd pam libcap inotify-tools ] ++ lib.optional withMySQL libmysqlclient ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # DES-encrypted passwords are not supported by NixPkgs anymore sed '/test_password_scheme("CRYPT"/d' -i src/auth/test-libpassword.c - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' export systemdsystemunitdir=$out/etc/systemd/system ''; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch"; hash = "sha256-PbBB1jIY3jIC8Js1NY93zkV0gISGUq7Nc67Ul5tN7sw="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fix timespec calls ./timespec.patch ]; @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { "--with-lucene" "--with-icu" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "i_cv_epoll_works=${if stdenv.isLinux then "yes" else "no"}" - "i_cv_posix_fallocate_works=${if stdenv.isDarwin then "no" else "yes"}" - "i_cv_inotify_works=${if stdenv.isLinux then "yes" else "no"}" + "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" + "i_cv_posix_fallocate_works=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" + "i_cv_inotify_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" "i_cv_signed_size_t=no" "i_cv_signed_time_t=yes" "i_cv_c99_vsnprintf=yes" @@ -100,14 +100,14 @@ stdenv.mkDerivation rec { "lib_cv_va_copy=yes" "lib_cv___va_copy=yes" "lib_cv_va_val_copy=yes" - ] ++ lib.optional stdenv.isLinux "--with-systemd" - ++ lib.optional stdenv.isDarwin "--enable-static" + ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemd" + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite" ++ lib.optional withLua "--with-lua"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://dovecot.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 283e479651..78bb5b1e1c 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ julm symphorien ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/dovecot_fts_xapian.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/dovecot_fts_xapian.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix index fd8f01674d..c29baacd44 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix @@ -39,7 +39,7 @@ let hash = source.npmDepsHash; }; - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mlmmj/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mlmmj/default.nix index 2795ba1af3..76ce2d0115 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mlmmj/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mlmmj/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchurl }: - +{ + lib, + stdenv, + fetchFromGitea, + autoreconfHook, + atf, + pkg-config, + kyua, +}: stdenv.mkDerivation rec { - pname = "mlmmj"; - version = "1.3.0"; + version = "1.4.7"; - src = fetchurl { - url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = pname; + repo = pname; + rev = "refs/tags/RELEASE_" + lib.replaceStrings ["."] ["_"] version; + hash = "sha256-QetxCxny9elPetKuAsgKF0xTov1bNIRxi7gWhv6dYyU="; }; + nativeBuildInputs = [autoreconfHook atf pkg-config kyua]; + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: getlistdelim.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: multiple definition of - # `subtype_strs'; mlmmj-send.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - postInstall = '' # grab all documentation files docfiles=$(find -maxdepth 1 -name "[[:upper:]][[:upper:]]*") @@ -31,9 +36,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; - maintainers = [ maintainers.edwtjo ]; + maintainers = [maintainers.edwtjo]; platforms = platforms.linux; license = licenses.mit; }; - } diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index c642c62be1..69244b86d6 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -6,7 +6,6 @@ , pkgconf , libtool , bison -, libasr , libevent , zlib , libressl diff --git a/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix b/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix index 05dc98b466..72caae6a5b 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix @@ -126,7 +126,7 @@ buildPerlPackage rec { man ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ curl git @@ -138,7 +138,7 @@ buildPerlPackage rec { PlackTestExternalServer TestSimple13 XMLTreePP - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ LinuxInotify2 ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix index aff57ef0e1..65fec7bad3 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -24,12 +24,12 @@ zstd, libarchive, withBlas ? true, - withHyperscan ? stdenv.isx86_64, - withLuaJIT ? stdenv.isx86_64, + withHyperscan ? stdenv.hostPlatform.isx86_64, + withLuaJIT ? stdenv.hostPlatform.isx86_64, nixosTests, }: -assert withHyperscan -> stdenv.isx86_64; +assert withHyperscan -> stdenv.hostPlatform.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix index 91cdded5a2..4e3ddb37db 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { }; # tests failed on x86_64-darwin with SIGILL: illegal instruction - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); passthru.tests = { inherit (nixosTests) matrix-conduit; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix index 24d1d89ecd..a2f222e6d4 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, pkgs , stdenv , rustPlatform , pkg-config @@ -30,9 +29,9 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config cmake ] ++ - lib.optionals stdenv.isDarwin [ autoconf automake ]; + lib.optionals stdenv.hostPlatform.isDarwin [ autoconf automake ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Matrix bot which can generate \"This Week in X\" like blog posts "; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index b3a54b1e62..0e80af5a21 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.114.0"; + version = "1.115.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-AvUc6vE2gjsUEbRLaexDbvEPwJio7W3YMyN3fJvr4c0="; + hash = "sha256-R7TAuAdEGvk/cAttxbrOZkZfsfbrsPujt0zVcp3aDZQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-cAGTEi7UwNVfTzckWBpjxfEMWXZRZDdkXIhx/HjAiTg="; + hash = "sha256-h84Hp+vhGfunbD3nRb1EXPnGhnMXncjk3ASKdRr805Y="; }; postPatch = '' @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -140,7 +140,7 @@ python3.pkgs.buildPythonApplication rec { ]) ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index e728e1cb01..364abdb951 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/matrix-org/mjolnir/blob/main/docs/synapse_module.md"; license = licenses.asl20; maintainers = with maintainers; [ jojosch ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix index a66a1bdb89..de1cc21cf4 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Tool to compress some state in a Synapse instance's database"; homepage = "https://github.com/matrix-org/rust-synapse-compress-state"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index ccc9fff51a..71e77f4940 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=deprecated-declarations" ] - ++ lib.optional stdenv.isDarwin "-Wno-error"); + ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-error"); meta = with lib; { description = "Distributed memory object caching system"; diff --git a/third_party/nixpkgs/pkgs/servers/meteor/default.nix b/third_party/nixpkgs/pkgs/servers/meteor/default.nix index 2036d31e5b..1454f4994c 100644 --- a/third_party/nixpkgs/pkgs/servers/meteor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/meteor/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { chmod +x $out/bin/meteor ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # Patch Meteor to dynamically fixup shebangs and ELF metadata where # necessary. pushd $out diff --git a/third_party/nixpkgs/pkgs/servers/microbin/default.nix b/third_party/nixpkgs/pkgs/servers/microbin/default.nix index 55ebc572b6..62cb97ce1b 100644 --- a/third_party/nixpkgs/pkgs/servers/microbin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/microbin/default.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/microserver/default.nix b/third_party/nixpkgs/pkgs/servers/microserver/default.nix index acc223627f..810128a5d6 100644 --- a/third_party/nixpkgs/pkgs/servers/microserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/microserver/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 09918625b1..15351840a2 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-09-09T16-59-28Z"; + version = "2024-09-13T20-26-02Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-mFt1oo48GC9mVnGXSWc3SgtgQZlu1L9zAfM7nBYd9jE="; + hash = "sha256-ldPPnN63OZdnsQjeiKT32VVFkaRyvJ10M5EsVCBoz8I="; }; - vendorHash = "sha256-otRSkxMoshDHLwUn/VA+svvb/fJhkBqZth1lfOUBytY="; + vendorHash = "sha256-nK3t3wwV6vhU7SHYfhV/LDs5S9N5yTXjB2cbB0rwk+I="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix b/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix index 5fba2c0a38..104a2b876c 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation { powering on the computer via Wake On Lan is supported. ''; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix index d001d245d4..3158f9b242 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix @@ -22,6 +22,6 @@ buildGoModule { license = licenses.mit; homepage = "https://bosun.org"; maintainers = with maintainers; [ offline ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index dd7bb79595..58e4be3687 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.9.8"; + version = "5.9.9"; outputs = [ "out" "lambda" ]; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-0WcjmX3SXRfx6ged2lfNTZBWfICYVtXznR+7J/ASAFQ="; + hash = "sha256-Y39v+OBhR4WpytCeQN6qBuQpdwKlEgiKgeG5U79QFxU="; }; vendorHash = "sha256-i2+nefRE4BD93rG842oZj0/coamYVRMPxEHio80bdWk="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index 98a26fa5a9..c45ea47bac 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,21 +15,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-qSxm00zC1Ms9C5R077Zn5FKluEqFs8KYUPnDUaMvMs8="; + hash = "sha256-0pwsZONhouGuypGTP64oJd3+nq8VMlyulb/WUJj0qGw="; }; - vendorHash = "sha256-rC8iqCZ6tzXVCOHNqH+jAMDh2yTAR88zj45HcgJ2lSg="; + vendorHash = "sha256-vz65gr56wj6PNiQwmfz1wg9SVmRUnrv7ZeWQkqdA4WI="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/internal/web/ui/yarn.lock"; - hash = "sha256-FvrfWcuKld242YfZ8CixF5GGFRp8iFWZ3Vkef3Kf4ag="; + hash = "sha256-bnJL7W7VfJIrJKvRt9Q6kdEyjLH/IJoCi0TENxz7SUE="; }; ldflags = let @@ -79,12 +79,12 @@ buildGoModule rec { # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isLinux [ "-I${lib.getDev systemd}/include" ]); # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at # runtime. # Add to RUNPATH so it can be found. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/grafana-agent)" \ $out/bin/grafana-agent diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 4eca911690..cb5f14fa28 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 env = { CYPRESS_INSTALL_BINARY = 0; - } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix error: no member named 'aligned_alloc' in the global namespace. # Occurs while building @esfx/equatable@npm:1.0.2 on x86_64-darwin NIX_CFLAGS_COMPILE = "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; @@ -35,7 +35,7 @@ buildGoModule rec { yarn nodejs cacert jq moreutils python3 # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` - ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ]; buildPhase = '' runHook preBuild export HOME="$(mktemp -d)" @@ -65,7 +65,7 @@ buildGoModule rec { proxyVendor = true; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ]; postConfigure = '' # Generate DI code that's required to compile the package. diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix index 20525bfbf9..76048222ed 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix @@ -42,7 +42,7 @@ let sourceRoot = "${src.name}/libflux"; cargoHash = "sha256-oAMoGGdR0QEjSzZ0/J5J9s/ekSlryCcRBSo5N2r70Ko="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' Name: flux Version: ${libflux_version} @@ -56,7 +56,7 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix index d70ba0ea19..7570428d7f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 00924d94c5..987ec3f541 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.1.1"; + version = "3.2.0"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-QOokLht/nIzQAzXQuJv5M4QTQD0Zhzf9+Q0ILl2Mds0="; + hash = "sha256-dche8MbVSlwKMD/znOCj80FNf5KZmEuI3uodrFLrmjM="; }; vendorHash = null; @@ -34,9 +34,9 @@ buildGoModule rec { tags = ["promtail_journal_enabled"]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index 9507b5d1dc..69538107ad 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; vendorHash = "sha256-JIqQXS2iw3opeotpfqC16w7hdu+7XjxhIyVj2M+98ec="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix index e64ac13754..4c05a7513e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; # fails on darwin with: write unixgram -> /rsyncd.log: write: message too long - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Tool for extracting metrics from application logs"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index f0bcd2bde8..e6e4f6f355 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/check_ssl_cert \ - --prefix PATH : "${lib.makeBinPath ([ openssl file which curl bc coreutils bind nmap netcat-gnu python3 ] ++ lib.optional stdenv.isLinux iproute2) }" + --prefix PATH : "${lib.makeBinPath ([ openssl file which curl bc coreutils bind nmap netcat-gnu python3 ] ++ lib.optional stdenv.hostPlatform.isLinux iproute2) }" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix index b7db5e56fd..5aa0e8697c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" "--disable-embedded-perl" "--without-perl-modules" - ] ++ lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts"; postPatch = '' substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ nettools file autoreconfHook ]; buildInputs = [ openssl ] ++ lib.optional withPerlTools perlWithPkgs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.IOKit diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/openobserve/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/openobserve/default.nix index 5ff8616225..0948f72fcb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/openobserve/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/openobserve/default.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage { xz zlib zstd - ] ++ lib.optionals stdenv.isDarwin (with apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with apple_sdk.frameworks; [ CoreFoundation CoreServices IOKit diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 5e33eefa95..6d3e32640f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -121,7 +121,7 @@ buildGoModule rec { # https://hydra.nixos.org/build/130673870/nixlog/1 # Test mock data uses 64 bit data without an explicit (u)int64 - doCheck = !(stdenv.isDarwin || stdenv.hostPlatform.parsed.cpu.bits < 64); + doCheck = !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.parsed.cpu.bits < 64); passthru.tests = { inherit (nixosTests) prometheus; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix index caef8c5760..d23cc62c80 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - tags = lib.optionals stdenv.isLinux [ "netgo" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "netgo" ]; preCheck = '' # Run all tests. diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix index 7b6b0e4739..63f1d7e7b8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prom2json"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prom2json"; - sha256 = "sha256-oOnrIGtNQqS/7XCKcFtzXskv7N6syNyS52pZMwrY5wU="; + sha256 = "sha256-cKz+ZFQYjsL7dFfXXCrl4T8OuvQkdqVAotG9HRNtN7o="; }; - vendorHash = "sha256-d+/38wUMFChuLlVb84DELRQylCDIqopzk2bw/yd5B/E="; + vendorHash = "sha256-pCy4oECZnvoODezUD1+lOT46yWUr78zvnHgEB2BJN3c="; meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 50fe085d4a..51a13f1efc 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix index f787588aa9..e53e641e5d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -46,6 +46,6 @@ buildNpmPackage rec { license = licenses.mit; maintainers = with maintainers; [ julienmalka ]; # FileNotFoundError: [Errno 2] No such file or directory: 'xcrun' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index 57178da729..ee70b1b1e0 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -97,8 +97,8 @@ let # Disable platform specific features if needed # using libmad to decode mp3 files on darwin is causing a segfault -- there # is probably a solution, but I'm disabling it for now - platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "smbclient" ] - ++ lib.optionals (!stdenv.isLinux) [ "alsa" "pipewire" "io_uring" "systemd" "syslog" ]; + platformMask = lib.optionals stdenv.hostPlatform.isDarwin [ "mad" "pulse" "jack" "smbclient" ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "alsa" "pipewire" "io_uring" "systemd" "syslog" ]; knownFeatures = builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies; platformFeatures = lib.subtractLists platformMask knownFeatures; @@ -137,7 +137,7 @@ let gtest ] ++ concatAttrVals features_ featureDependencies - ++ lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AudioUnit ]; nativeBuildInputs = [ meson @@ -148,7 +148,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; - postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume @@ -166,7 +166,7 @@ let outputs = [ "out" "doc" ] ++ lib.optional (builtins.elem "documentation" features_) "man"; - CXXFLAGS = lib.optionals stdenv.isDarwin [ + CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" ]; @@ -210,9 +210,9 @@ in "libmpdclient" "id3tag" "expat" "pcre" "yajl" "sqlite" "soundcloud" "qobuz" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "alsa" "systemd" "syslog" "io_uring" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "mad" "jack" ]; }; mpdWithFeatures = run; diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index 7f32957fdb..3c3a6199f7 100644 --- a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277 url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch"; diff --git a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix index 27fde8301a..254434a8ba 100644 --- a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix @@ -47,7 +47,7 @@ in myNodePackages.package.override { maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "mx-puppet-discord"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix index c5d958bef2..f47a724999 100644 --- a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix b/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix index 77bf8ce7d7..3819a23781 100644 --- a/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 677359abdb..0234ee067b 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -18,7 +18,9 @@ let }; passthru = { - tests = nixosTests.nextcloud; + tests = lib.filterAttrs ( + key: _: (lib.hasSuffix (lib.versions.major version) key) + ) nixosTests.nextcloud; inherit packages; }; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index d068f28ccf..9269993a84 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -37,7 +37,7 @@ buildDotnetModule rec { executables = [ mainProgram ]; # This test has a problem running on macOS - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "EventStore.Projections.Core.Tests.Services.grpc_service.ServerFeaturesTests.should_receive_expected_endpoints" "EventStore.Projections.Core.Tests.Services.grpc_service.ServerFeaturesTests.should_receive_expected_endpoints" ]; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index 739fab6f81..3849586246 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -28,7 +28,7 @@ let sourceRoot = "${src.name}/libflux"; cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' Name: flux Version: ${libflux_version} @@ -42,7 +42,7 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix index 81333a9f1e..99ae9bc38c 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix @@ -53,7 +53,7 @@ let sourceRoot = "${src.name}/libflux"; cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' Name: flux Version: ${libflux_version} @@ -67,7 +67,7 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix index f69ad97f8a..84c0991515 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix @@ -8,13 +8,13 @@ let buildMongoDB = callPackage ./mongodb.nix { inherit sasl boost Security CoreFoundation cctools; }; - variants = if stdenv.isLinux then + variants = if stdenv.hostPlatform.isLinux then { version = "5.0.29"; sha256 = "sha256-27+SXo0fjFwJFFm/NhpDhq95dMwiN8RCJO7j5ic49Ls="; patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ]; } - else lib.optionalAttrs stdenv.isDarwin + else lib.optionalAttrs stdenv.hostPlatform.isDarwin { version = "5.0.3"; # at least darwin has to stay on 5.0.3 until the SDK used by nixpkgs is bumped to 10.13 sha256 = "1p9pq0dfd6lynvnz5p1c8dqp4filzrz86j840xwxwx82dm1zl6p0"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix index 9c26f5fa70..f906959341 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix @@ -56,7 +56,7 @@ let #"stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs). #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. #"wiredtiger" - ] ++ lib.optionals stdenv.isLinux [ "tcmalloc" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ]; inherit (lib) systems subtractLists; in stdenv.mkDerivation rec { @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ scons python - ] ++ lib.optional stdenv.isLinux net-snmp; + ] ++ lib.optional stdenv.hostPlatform.isLinux net-snmp; buildInputs = [ boost @@ -87,8 +87,8 @@ in stdenv.mkDerivation rec { sasl snappy zlib - ] ++ lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ] - ++ lib.optional stdenv.isLinux net-snmp + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreFoundation cctools ] + ++ lib.optional stdenv.hostPlatform.isLinux net-snmp ++ [ xz ]; # MongoDB keeps track of its build parameters, which tricks nix into @@ -107,9 +107,9 @@ in stdenv.mkDerivation rec { #include ' substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include ' '#include #include ' - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder version "6.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder version "6.0") '' substituteInPlace src/third_party/mozjs-${mozjsVersion}/extract/js/src/jsmath.cpp --replace '${mozjsReplace}' 0 - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' # don't fail by default on i686 substituteInPlace src/mongo/db/storage/storage_options.h \ @@ -142,9 +142,9 @@ in stdenv.mkDerivation rec { preBuild = '' sconsFlags+=" CC=$CC" sconsFlags+=" CXX=$CXX" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sconsFlags+=" AR=$AR" - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' sconsFlags+=" CCFLAGS='-march=armv8-a+crc'" ''; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index d15b05699d..42bafb37c8 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSystemd systemd ++ lib.optionals tlsSupport [ openssl ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace "-flto" "" ''; @@ -53,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix index 2ba228dd69..03aed49f56 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = lib.optionals (!stdenv.isDarwin) [ + configureFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--with-jemalloc" "--lib-path=${jemalloc}/lib" ]; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; buildInputs = [ protobuf boost zlib curl openssl icu ] - ++ lib.optional (!stdenv.isDarwin) jemalloc - ++ lib.optional stdenv.isDarwin libtool; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) jemalloc + ++ lib.optional stdenv.hostPlatform.isDarwin libtool; nativeBuildInputs = [ which m4 python3Packages.python makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/nostr-rs-relay/default.nix b/third_party/nixpkgs/pkgs/servers/nostr-rs-relay/default.nix index db7dd12556..c63f4d2a05 100644 --- a/third_party/nixpkgs/pkgs/servers/nostr-rs-relay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nostr-rs-relay/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+agmlg6tAnEJ5o586fUY7V4fdNScDPKCbaZqt7R3gqg="; buildInputs = [ openssl.dev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/servers/ombi/default.nix b/third_party/nixpkgs/pkgs/servers/ombi/default.nix index 6e6ece8ea7..a9fb9aa335 100644 --- a/third_party/nixpkgs/pkgs/servers/ombi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ombi/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook, fixDarwinDylibNames, zlib, krb5, openssl, icu, nixosTests }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; diff --git a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix index bc1e7a3f5e..f216935916 100644 --- a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix @@ -103,9 +103,9 @@ stdenv.mkDerivation (finalAttrs: { moreutils ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] ++ (with xorg; [ libX11 libxkbfile libkrb5 ]) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Security @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { find -path "*@vscode/ripgrep" -type d \ -execdir mkdir -p {}/bin \; \ -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ # (see issue #101229) pushd ./remote/node_modules/@parcel/watcher diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix index 647a54bf53..ced3be6b35 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -11,7 +11,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix index 87c1ee1d95..f2c77d33dd 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -7,7 +7,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix index ec8d4622a8..a287619155 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix index fc3798fde1..e074e0100d 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix @@ -13,7 +13,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix index 9455b14aad..27cf6c04f4 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix @@ -13,7 +13,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix index 98629719ee..55add5a09b 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -12,7 +12,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix index 23959b3be9..08774c7236 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix index 679c88e5cf..352489af8b 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix @@ -14,7 +14,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix index 74f5695705..a8b2000ec8 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix @@ -8,7 +8,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix index d9ca0d7208..a182986ee2 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -12,7 +12,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix index c10361f119..b1f810d0f5 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix b/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix index 868ec8f8bd..091b2037d2 100644 --- a/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Security ]; cargoBuildFlags = [ "--package" "oxigraph_server" ]; diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/default.nix b/third_party/nixpkgs/pkgs/servers/photoprism/default.nix index 0c39ad8b6b..ab641548b4 100644 --- a/third_party/nixpkgs/pkgs/servers/photoprism/default.nix +++ b/third_party/nixpkgs/pkgs/servers/photoprism/default.nix @@ -1,4 +1,5 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers +{ lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers +, callPackage , nixosTests , librsvg }: @@ -13,9 +14,9 @@ let hash = "sha256-ihDv5c5RUjDbFcAHJjzp/8qCwKfA+rlFXPziaYarzs8="; }; - libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; - backend = pkgs.callPackage ./backend.nix { inherit libtensorflow src version; }; - frontend = pkgs.callPackage ./frontend.nix { inherit src version; }; + libtensorflow = callPackage ./libtensorflow.nix { }; + backend = callPackage ./backend.nix { inherit libtensorflow src version; }; + frontend = callPackage ./frontend.nix { inherit src version; }; fetchModel = { name, hash }: fetchzip { @@ -41,7 +42,7 @@ let assets_path = "$out/share/${pname}"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname version; nativeBuildInputs = [ @@ -62,7 +63,7 @@ stdenv.mkDerivation { --set PHOTOPRISM_ASSETS_PATH ${assets_path} \ --set PHOTOPRISM_DARKTABLE_BIN ${darktable}/bin/darktable-cli \ --set PHOTOPRISM_RAWTHERAPEE_BIN ${rawtherapee}/bin/rawtherapee-cli \ - --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-convert \ + --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-dec \ --set PHOTOPRISM_RSVGCONVERT_BIN ${librsvg}/bin/rsvg-convert \ --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg_7}/bin/ffmpeg \ --set PHOTOPRISM_EXIFTOOL_BIN ${exiftool}/bin/exiftool \ @@ -78,7 +79,7 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = pkgs.photoprism; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; passthru.tests.photoprism = nixosTests.photoprism; meta = with lib; { @@ -89,4 +90,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ benesim ]; mainProgram = "photoprism"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix b/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix index e1bc6ce48f..81b60d46e2 100644 --- a/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pim6sd.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pim6sd.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/servers/pingvin-share/backend.nix b/third_party/nixpkgs/pkgs/servers/pingvin-share/backend.nix index 37bc0ffd6b..7e20ea7923 100644 --- a/third_party/nixpkgs/pkgs/servers/pingvin-share/backend.nix +++ b/third_party/nixpkgs/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-btjvX+2krSc0/bJqeLcVTqHBVWqiTFipp3MidO9wApY="; + npmDepsHash = "sha256-Uw2mjg8H+7XTm6SjfYHYkP7MJl8kdJXDKBFcx6VffPs="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pingvin-share/default.nix b/third_party/nixpkgs/pkgs/servers/pingvin-share/default.nix index 9dd4fd88c2..56e5753059 100644 --- a/third_party/nixpkgs/pkgs/servers/pingvin-share/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "0.29.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-ETsIGb6IxGruApUP05cuMtTDNAE23CI1Q2MmjxX3aPo="; + hash = "sha256-nBNz4xEMEnOJGxVIbpukGzlAEgG+uGntvTJoc+GHmIw="; }; in diff --git a/third_party/nixpkgs/pkgs/servers/pingvin-share/frontend.nix b/third_party/nixpkgs/pkgs/servers/pingvin-share/frontend.nix index eaddc1f6f0..12b1c3bd67 100644 --- a/third_party/nixpkgs/pkgs/servers/pingvin-share/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-66CUVLbq2XdOQAr69DcvxTMvOgSR/RTKPaq80JG+8dg="; + npmDepsHash = "sha256-iw7IoEjiLUiDuK9AKI7jXDaUVT6FklmZuZ+CKDig3tE="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix b/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix index f3cc1c5543..0e081884e4 100644 --- a/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix +++ b/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-YSiClSnjgqFqT2IGJoatcy7j3NUKcff826AvJ/+RNNU="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; meta = with lib; { description = "Infinitely transfer between every device over pure HTTP with pipes or browsers"; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 8bb3585177..bd2ee5b23d 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.40.5.8921-836b34c27"; + version = "1.41.0.8992-8463ad060"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1jf47mmwvvj4c64ksbvnx3g14x7qn9h08p3xbixha7nk4nhxpqcv"; + sha256 = "1hv8bg2cy1s6cn1yp5s75kma5v2fr3dncbslglvpn3srba1xafgz"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0fia2d6gxlxv1my5031wnp3ihc3knfra1yrwadz44khh03zkvxq7"; + sha256 = "0gwwlh47rfnayra3k8lwi794wiayl30crjjvzhqkg5zad77lkl4m"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix index 07e1dedce2..37b72c4538 100644 --- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.20"; + version = "0.22.21"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-ZkajcBwoXyH6+ARI/pl1HmvN99ibgqwqF/VfmptJgrc="; + hash = "sha256-KpW2ThWbAD/c1Z7xSCEbguMTPfBkgngxjXWOPvf5658="; }; vendorHash = "sha256-5lfjwCh930B5k8KbUDW81HkmiO7io4RqEr4VP8MikeA="; diff --git a/third_party/nixpkgs/pkgs/servers/polaris/default.nix b/third_party/nixpkgs/pkgs/servers/polaris/default.nix index b19eb1c47e..002a04f4f6 100644 --- a/third_party/nixpkgs/pkgs/servers/polaris/default.nix +++ b/third_party/nixpkgs/pkgs/servers/polaris/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PnNLSL6YIpM6b3+oCh2eNRNPpCKyvnWEW7uNaYTKzAU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index 6421688976..5e24932517 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -6,9 +6,9 @@ let unsupported = throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}"; os = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "osx" - else if stdenv.isLinux then + else if stdenv.hostPlatform.isLinux then "linux" else unsupported; diff --git a/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix b/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix index 30ca1318b9..4d9e221a30 100644 --- a/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mbedtls ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Doff64_t=off_t"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Doff64_t=off_t"; postInstall = '' install -Dm644 ../LICENSE.TXT $out/usr/share/licenses/${pname}/LICENSE.TXT diff --git a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix index 0186de73fd..44f89234ec 100644 --- a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix @@ -21,15 +21,15 @@ , airtunesSupport ? false -, bluetoothSupport ? stdenv.isLinux +, bluetoothSupport ? stdenv.hostPlatform.isLinux , advancedBluetoothCodecs ? false , remoteControlSupport ? false , zeroconfSupport ? false -, alsaSupport ? stdenv.isLinux -, udevSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux +, udevSupport ? stdenv.hostPlatform.isLinux , # Whether to build only the library. libOnly ? false @@ -68,23 +68,23 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config meson ninja makeWrapper perlPackages.perl perlPackages.XMLParser m4 ] - ++ lib.optionals stdenv.isLinux [ glib ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib ] # gstreamer plugin discovery requires wrapping ++ lib.optional (bluetoothSupport && advancedBluetoothCodecs) wrapGAppsHook3; propagatedBuildInputs = - lib.optionals stdenv.isLinux [ libcap ]; + lib.optionals stdenv.hostPlatform.isLinux [ libcap ]; buildInputs = [ libtool libsndfile soxr speexdsp fftwFloat check ] - ++ lib.optionals stdenv.isLinux [ glib dbus ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices CoreAudio libintl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib dbus ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit Cocoa CoreServices CoreAudio libintl ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing_1 ] ++ lib.optional jackaudioSupport libjack2 ++ lib.optionals x11Support [ xorg.libICE xorg.libSM xorg.libX11 xorg.libXi xorg.libXtst ] ++ lib.optional useSystemd systemd - ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] ++ lib.optional airtunesSupport openssl ++ lib.optionals bluetoothSupport [ bluez5 sbc ] # aptX and LDAC codecs are in gst-plugins-bad so far, rtpldacpay is in -good @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "doxygen" false) (lib.mesonEnable "elogind" false) # gsettings does not support cross-compilation - (lib.mesonEnable "gsettings" (stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform))) + (lib.mesonEnable "gsettings" (stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform))) (lib.mesonEnable "gstreamer" false) (lib.mesonEnable "gtk" false) (lib.mesonEnable "jack" (jackaudioSupport && !libOnly)) @@ -128,10 +128,10 @@ stdenv.mkDerivation rec { # renaming the unwrapped binaries (see below) "--bindir=${placeholder "out"}/.bin-unwrapped" ] - ++ lib.optionals (stdenv.isLinux && useSystemd) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && useSystemd) [ (lib.mesonOption "systemduserunitdir" "${placeholder "out"}/lib/systemd/user") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.mesonEnable "consolekit" false) (lib.mesonEnable "dbus" false) (lib.mesonEnable "glib" false) @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { ]; # tests fail on Darwin because of timeouts - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d) ''; @@ -156,13 +156,13 @@ stdenv.mkDerivation rec { cp config.h $dev/include/pulse ''; - preFixup = lib.optionalString (stdenv.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' wrapProgram $out/libexec/pulse/gsettings-helper \ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${pname}-${version}" \ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" '' # add .so symlinks for modules to be found under macOS - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/pulseaudio/modules/*.dylib; do ln -s "''$file" "''${file%.dylib}.so" ln -s "''$file" "$out/lib/pulseaudio/''$(basename ''$file .dylib).so" diff --git a/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix index 896e8b3d1f..d0ef6198f4 100644 --- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; diff --git a/third_party/nixpkgs/pkgs/servers/readarr/default.nix b/third_party/nixpkgs/pkgs/servers/readarr/default.nix index a0c1cea2c5..3a67b592fc 100644 --- a/third_party/nixpkgs/pkgs/servers/readarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/readarr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index 8d282ab787..231f6ee216 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -1,17 +1,17 @@ { buildGoModule -, doCheck ? !stdenv.isDarwin # Can't start localhost test server in MacOS sandbox. +, doCheck ? !stdenv.hostPlatform.isDarwin # Can't start localhost test server in MacOS sandbox. , fetchFromGitHub , installShellFiles , lib , stdenv }: let - version = "24.2.4"; + version = "24.2.5"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-DSwD9oN5hrDjUL0Ey8ARvojr54abBXUNvj/06lLvURk="; + sha256 = "sha256-25ijVHEcj0AXLxC1rSbp3Xyv+SMQRRkRq+qgRJgSnAI="; }; in buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-8vwmxUi4oWmHzb2QkIS5sU1NgJmJSV1+2I48TDAo2a0="; + vendorHash = "sha256-JEbIC33J+uUzPN04EtO5XoC0MIkYRXKYNCsFsirJfhY="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/third_party/nixpkgs/pkgs/servers/roapi/http.nix b/third_party/nixpkgs/pkgs/servers/roapi/http.nix index 019c979b47..8c0dc4ee59 100644 --- a/third_party/nixpkgs/pkgs/servers/roapi/http.nix +++ b/third_party/nixpkgs/pkgs/servers/roapi/http.nix @@ -5,7 +5,7 @@ let pname = "roapi-http"; version = "0.6.0"; - target = lib.optionalString stdenv.isDarwin "apple-darwin"; + target = lib.optionalString stdenv.hostPlatform.isDarwin "apple-darwin"; in # TODO build from source, currently compilation fails on darwin on snmalloc with # ./mem/../ds/../pal/pal_apple.h:277:64: error: use of undeclared identifier 'kCCSuccess' diff --git a/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix b/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix index 90f773c73d..8ca4cb5341 100644 --- a/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/FD-/RPiPlay"; description = "Open-source implementation of an AirPlay mirroring server"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix b/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix index fa5b4a30c6..3697043c24 100644 --- a/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ToJLE4nqgTqg5D4Qh2zi+wjmcdwDo0aupoDwKJCTwnM="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; buildNoDefaultFeatures = true; diff --git a/third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix b/third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix index 14cc9afcf4..3b6ddf3bb1 100644 --- a/third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsodium sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix index 97fdacecb9..f0a1fc8c3b 100644 --- a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-b9KZzevaTl52pduN4gkF8k6yqgDcE8x5sOwmPxzYfWA="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index e2a9345d4c..1e0f60224b 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -45,9 +45,9 @@ , enableRegedit ? true, ncurses , enableCephFS ? false, ceph , enableGlusterFS ? false, glusterfs, libuuid -, enableAcl ? (!stdenv.isDarwin), acl -, enableLibunwind ? (!stdenv.isDarwin), libunwind -, enablePam ? (!stdenv.isDarwin), pam +, enableAcl ? (!stdenv.hostPlatform.isDarwin), acl +, enableLibunwind ? (!stdenv.hostPlatform.isDarwin), libunwind +, enablePam ? (!stdenv.hostPlatform.isDarwin), pam }: let @@ -100,10 +100,10 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_45 cmocka rpcsvc-proto - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ buildPackages.stdenv.cc ] ++ optional (stdenv.buildPlatform != stdenv.hostPlatform) samba # asn1_compile/compile_et - ++ optionals stdenv.isDarwin [ + ++ optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -124,16 +124,16 @@ stdenv.mkDerivation (finalAttrs: { libtasn1 tdb libxcrypt - ] ++ optionals stdenv.isLinux [ liburing systemd ] - ++ optionals stdenv.isDarwin [ libiconv ] + ] ++ optionals stdenv.hostPlatform.isLinux [ liburing systemd ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ] - ++ optionals (!enableLDAP && stdenv.isLinux) [ ldb talloc tevent ] - ++ optional (enablePrinting && stdenv.isLinux) cups + ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [ ldb talloc tevent ] + ++ optional (enablePrinting && stdenv.hostPlatform.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ] ++ optional enableRegedit ncurses - ++ optional (enableCephFS && stdenv.isLinux) (lib.getDev ceph) - ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] + ++ optional (enableCephFS && stdenv.hostPlatform.isLinux) (lib.getDev ceph) + ++ optionals (enableGlusterFS && stdenv.hostPlatform.isLinux) [ glusterfs libuuid ] ++ optional enableAcl acl ++ optional enableLibunwind libunwind ++ optional enablePam pam; @@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" - ] ++ optionals (!enableLDAP && stdenv.isLinux) [ + ] ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [ "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb" ] ++ optional enableLibunwind "--with-libunwind" ++ optional enableProfiling "--with-profiling-data" @@ -212,12 +212,12 @@ stdenv.mkDerivation (finalAttrs: { read -r -d "" SCRIPT << EOF || true [ -z "\$SAMBA_LIBS" ] && exit 1; BIN='{}'; - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')"; ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')"; patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; patchelf --shrink-rpath "\$BIN"; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \$BIN \$BIN for old_rpath in \$(otool -L \$BIN | grep /private/tmp/ | awk '{print \$1}'); do new_rpath=\$(find \$SAMBA_LIBS -name \$(basename \$old_rpath) | head -n 1) diff --git a/third_party/nixpkgs/pkgs/servers/search/lnx/default.nix b/third_party/nixpkgs/pkgs/servers/search/lnx/default.nix index 447602b046..7cda5d44c4 100644 --- a/third_party/nixpkgs/pkgs/servers/search/lnx/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/lnx/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { "compose-0.1.0" = "sha256-zcniGI3wa+gI3jFTDqHcesX+6hAtNEbW81ABPUcFTXk="; }; }; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation ]; meta = with lib; { description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants."; mainProgram = "lnx"; diff --git a/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix index cbb4400869..a58af212b2 100644 --- a/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix index f966975917..587c4aa1d1 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix b/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix index ccc32cb900..8f89e1893c 100644 --- a/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoLock = { lockFile = ./Cargo.lock; diff --git a/third_party/nixpkgs/pkgs/servers/search/typesense/default.nix b/third_party/nixpkgs/pkgs/servers/search/typesense/default.nix index 762cc190f2..2a641cd752 100644 --- a/third_party/nixpkgs/pkgs/servers/search/typesense/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/typesense/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { inherit hash; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/shairplay/default.nix b/third_party/nixpkgs/pkgs/servers/shairplay/default.nix index 2a7e643b60..63de8df58f 100644 --- a/third_party/nixpkgs/pkgs/servers/shairplay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/shairplay/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # the build will fail without complaining about a reference to /tmp - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \ $out/bin/shairplay diff --git a/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix b/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix index a9043f6533..f74813cd46 100644 --- a/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix +++ b/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix @@ -28,8 +28,8 @@ , enablePipewire ? true , enableJack ? true , enableMetadata ? false -, enableMpris ? stdenv.isLinux -, enableDbus ? stdenv.isLinux +, enableMpris ? stdenv.hostPlatform.isLinux +, enableDbus ? stdenv.hostPlatform.isLinux , enableSoxr ? true , enableLibdaemon ? false }: @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { libuuid ffmpeg ] - ++ optional stdenv.isLinux glib; + ++ optional stdenv.hostPlatform.isLinux glib; postPatch = '' sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c diff --git a/third_party/nixpkgs/pkgs/servers/shishi/default.nix b/third_party/nixpkgs/pkgs/servers/shishi/default.nix index 4b3060d90b..926486c73c 100644 --- a/third_party/nixpkgs/pkgs/servers/shishi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/shishi/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; env.NIX_CFLAGS_COMPILE - = optionalString stdenv.isDarwin "-DBIND_8_COMPAT"; + = optionalString stdenv.hostPlatform.isDarwin "-DBIND_8_COMPAT"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix index ff83e3f62d..cb4fe13000 100644 --- a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix index 1e7021c7a7..9d11ad68a4 100644 --- a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix @@ -90,7 +90,7 @@ defaultModules = mods: with mods; [ xml_int.cdr xml_int.rpc xml_int.scgi -] ++ lib.optionals stdenv.isLinux [ endpoints.gsmopen ]; +] ++ lib.optionals stdenv.hostPlatform.isLinux [ endpoints.gsmopen ]; enabledModules = (if modules != null then modules else defaultModules) availableModules; @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { libuuid libxcrypt ] ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules) - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; enableParallelBuilding = true; @@ -168,6 +168,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mpl11; maintainers = with lib.maintainers; [ mikaelfangel ]; platforms = with lib.platforms; unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/snac2/default.nix b/third_party/nixpkgs/pkgs/servers/snac2/default.nix index c4e30fa74f..0b8f718d0c 100644 --- a/third_party/nixpkgs/pkgs/servers/snac2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snac2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Dst_mtim=st_mtimespec" "-Dst_ctim=st_ctimespec" ]); diff --git a/third_party/nixpkgs/pkgs/servers/sozu/default.nix b/third_party/nixpkgs/pkgs/servers/sozu/default.nix index f0467f7f9c..10427438e2 100644 --- a/third_party/nixpkgs/pkgs/servers/sozu/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sozu/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; buildInputs = - lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; doCheck = false; @@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ Br1ght0ne gaelreyrol ]; mainProgram = "sozu"; # error[E0432]: unresolved import `std::arch::x86_64` - broken = !stdenv.isx86_64; + broken = !stdenv.hostPlatform.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix index 5d5acfcba1..9c4e624202 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.35.3"; + version = "1.36.2"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-ZawoeucJiU3o9a1DfsCTOlTwlnVJV4c/QqTSentHREA="; + hash = "sha256-39sRog9EUPF8x8splTl456viyZKiEupwqQLGTq/vFYU="; }; - vendorHash = "sha256-hr0o1dpbnPc9/sja419QnPzW5W7201DS2TQ8fF1+lJ8="; + vendorHash = "sha256-Xl03IVSqBSIq1ZV/c96qhlTQ1RcWcqqWPf63fGbfNOQ="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix index dc82ca52fd..07a523cd2f 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-X8kZjPjFGMUfSQLdS6/XA1eNRQH6n/FffgbC19r1WRU="; + hash = "sha256-nSvWNelmqzgwf7M+9drqahwwo+YoQLgEscnigsBUwdI="; }; - vendorHash = "sha256-Q8OW9aBs1fcUdKin6uX1s6oD289eCUffmAK5nr3xn0s="; + vendorHash = "sha256-uTuI8rYmRUkbRf46+hZm1xHflFDcro6hVG8aI2C4eWs="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix index a2da81a009..e27179e8ab 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { ''; # The cmake setup-hook uses $out/lib by default, this is not the case here. - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb") ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix index dfa16d4796..7887704279 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -244,28 +244,26 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - # TODO should be removed - version = "10.5.25"; - hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4="; + version = "10.5.26"; + hash = "sha256-3V+ZodMK5HNl/Bix3u/23AqzishOfZ/ZyMBP9rAZYfE="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.18"; - hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg="; + version = "10.6.19"; + hash = "sha256-vOyw/3t5pBNEc2+plHEHh8FVFtUet3FfJ4w/D8t+hwM="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.8"; - hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8="; + version = "10.11.9"; + hash = "sha256-CgAYCGTNAWGHyYb6q4AQ3iOhF7mnX5HWRWQh+JTkjSA="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_110 = self.callPackage generic { - # Supported until 2024-06-07 - # TODO should be removed - version = "11.0.6"; - hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA="; + mariadb_114 = self.callPackage generic { + # Supported until 2029-05-29 + version = "11.4.3"; + hash = "sha256-bwAXuZAbsYl94O7SHK75/6nWbvVZNFoNim8BEwhBPs4="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch b/third_party/nixpkgs/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch deleted file mode 100644 index a12dfb73d0..0000000000 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 1f1ee5d3776af7ef56ffa3f4dcd22532c2c86c74 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Sun, 7 Jan 2024 10:19:54 +0100 -Subject: [PATCH] Fix build with libxml2 2.12 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer: - -https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711 - -Clang 16 does not like this: - - error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers - error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') - -Let’s update the variables to `const`. -For older versions, it will be automatically converted. - -But then `xmlResetError(xmlError*)` will not like the `const` pointer: - - error: no matching function for call to 'xmlResetError' - note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier - -Let’s replace it with `xmlResetLastError()`. - -ALso remove `LIBXMLDOC::Xerr` protected member property. -It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0 -along with the `xmlResetError` calls. -It does not appear to be used for anything. ---- - storage/connect/libdoc.cpp | 39 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) - -diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp -index e414aa88355..10edcbc3ffa 100644 ---- a/storage/connect/libdoc.cpp -+++ b/storage/connect/libdoc.cpp -@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT { - xmlXPathContextPtr Ctxp; - xmlXPathObjectPtr Xop; - xmlXPathObjectPtr NlXop; -- xmlErrorPtr Xerr; - char *Buf; // Temporary - bool Nofreelist; - }; // end of class LIBXMLDOC -@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp) - Ctxp = NULL; - Xop = NULL; - NlXop = NULL; -- Xerr = NULL; - Buf = NULL; - Nofreelist = false; - } // end of LIBXMLDOC constructor -@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn) - Encoding = (char*)Docp->encoding; - - return false; -- } else if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ } else if (xmlGetLastError()) -+ xmlResetLastError(); - - return true; - } // end of ParseFile -@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn) - #if 1 - // This function does not crash ( - if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) { -- xmlErrorPtr err = xmlGetLastError(); -+ const xmlError *err = xmlGetLastError(); - strcpy(g->Message, (err) ? err->message : "Error saving XML doc"); -- xmlResetError(Xerr); -+ xmlResetLastError(); - rc = -1; - } // endif Save - // rc = xmlDocDump(of, Docp); -@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Nlist) { - xmlXPathFreeNodeSet(Nlist); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Nlist = NULL; - } // endif Nlist -@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Xop) { - xmlXPathFreeObject(Xop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Xop = NULL; - } // endif Xop -@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (NlXop) { - xmlXPathFreeObject(NlXop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - NlXop = NULL; - } // endif NlXop -@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Ctxp) { - xmlXPathFreeContext(Ctxp); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Ctxp = NULL; - } // endif Ctxp -@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - /******************************************************************/ - xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - { -+ const xmlError *xerr; - xmlNodeSetPtr nl; - - if (trace(1)) -@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - } else - xmlXPathFreeObject(Xop); // Caused node not found - -- if ((Xerr = xmlGetLastError())) { -- strcpy(g->Message, Xerr->message); -- xmlResetError(Xerr); -+ if ((xerr = xmlGetLastError())) { -+ strcpy(g->Message, xerr->message); -+ xmlResetLastError(); - return NULL; -- } // endif Xerr -+ } // endif xerr - - } // endif Xop - -@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp) - /******************************************************************/ - void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - { -- xmlErrorPtr xerr; -+ const xmlError *xerr; - - if (trace(1)) - htrc("DeleteChild: node=%p\n", dnp); -@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - if (trace(1)) - htrc("DeleteChild: errmsg=%-.256s\n", xerr->message); - -- xmlResetError(xerr); -+ xmlResetLastError(); - } // end of DeleteChild - - /* -------------------- class XML2NODELIST ---------------------- */ --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/servers/sql/materialize/default.nix b/third_party/nixpkgs/pkgs/servers/sql/materialize/default.nix index 346e83f122..1738b4fb92 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/materialize/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/materialize/default.nix @@ -101,13 +101,13 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ] # Provides the mig command used by the krb5-src build script - ++ lib.optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; buildInputs = [ openssl rdkafka libclang ] - ++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv DiskArbitration Foundation ]; # the check phase requires linking with rocksdb which can be a problem since # the rust rocksdb crate is not updated very often. diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix index 4a072ae3f4..dbd09f9516 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ bison cmake pkg-config ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools CoreServices developer_cmds DarwinTools ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix index c286377e62..19739f2bcc 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0Eqk9X/qO9MkETaVIOCS6vyvywAK175/CDCNHH+YatQ="; + sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU="; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/innovation.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/innovation.nix index 2727241003..61b2ff7bb4 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/innovation.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/innovation.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { bison cmake pkg-config makeWrapper # required for scripts/CMakeLists.txt coreutils gnugrep procps - ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -45,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools CoreServices developer_cmds DarwinTools ] - ++ lib.optional (stdenv.isLinux && withJemalloc) jemalloc - ++ lib.optional (stdenv.isLinux && withTcmalloc) gperftools; + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; outputs = [ "out" "static" ]; @@ -81,12 +81,12 @@ stdenv.mkDerivation (finalAttrs: { "-DINSTALL_SHAREDIR=share/mysql" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DWITH_SYSTEMD=1" "-DWITH_SYSTEMD_DEBUG=1" ] - ++ lib.optional (stdenv.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" - ++ lib.optional (stdenv.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; postInstall = '' moveToOutput "lib/*.a" $static @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/lts.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/lts.nix index 19e81654dd..352b0239c4 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/lts.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/lts.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { bison cmake pkg-config makeWrapper # required for scripts/CMakeLists.txt coreutils gnugrep procps - ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -39,9 +39,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools CoreServices developer_cmds DarwinTools ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index 17bb24562d..dfffa518a5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl c-ares ] - ++ lib.optional stdenv.isLinux systemd; + ++ lib.optional stdenv.hostPlatform.isLinux systemd; enableParallelBuilding = true; - configureFlags = lib.optional stdenv.isLinux "--with-systemd"; + configureFlags = lib.optional stdenv.hostPlatform.isLinux "--with-systemd"; passthru.tests = { pgbouncer = nixosTests.pgbouncer; diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix index 49de401a75..525380e46f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QqwUEbWKSUuxzYjWpVpQuKZDiNib1gM2eZJ4y7XIzXY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix index f1762be17f..b4f5724bcf 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix @@ -4,7 +4,7 @@ , postgresql , openssl , libxcrypt -, withPam ? stdenv.isLinux +, withPam ? stdenv.hostPlatform.isLinux , pam }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc" ]; - patches = lib.optionals (stdenv.isDarwin) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin) [ # Build checks for strlcpy being available in the system, but doesn't # actually exclude its own copy from being built ./darwin-strlcpy.patch diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 2b8edb366f..ae52520925 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ --replace "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/AddPostgreSQLExtension.cmake \ --replace "INTERPROCEDURAL_OPTIMIZATION TRUE" "" ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix index 1e63222866..9a3e01d535 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; platforms = postgresql.meta.platforms; # error: use of undeclared identifier 'aligned_alloc' - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + broken = stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index ed0bfde0ca..42d055a029 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline, libkrb5, libxcrypt }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "pg_auto_failover"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix index c265ae39ca..3361e2100d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,12 +1,9 @@ { lib , stdenv , fetchFromGitHub -, openssl , postgresql , postgresqlTestHook -, readline , testers -, zlib }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 20e5299da2..a066933105 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation { }; buildInputs = [ postgresql gcc ]; - buildPhase = "USE_PGXS=1 make"; + + makeFlags = [ "USE_PGXS=1" ]; + installPhase = '' install -D pg_similarity${postgresql.dlSuffix} -t $out/lib/ install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff index 2b145445cf..d05a5cd34e 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff @@ -4,16 +4,16 @@ index 8d822e5..8b7e371 100644 +++ b/crates/c/build.rs @@ -1,9 +1,13 @@ fn main() { - println!("cargo:rerun-if-changed=src/c.h"); - println!("cargo:rerun-if-changed=src/c.c"); + println!("cargo:rerun-if-changed=src/f16.h"); + println!("cargo:rerun-if-changed=src/f16.c"); + println!("cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS"); cc::Build::new() - .compiler("clang-16") + .compiler("@clang@") - .file("./src/c.c") + .file("./src/f16.c") + // read env var set by rustPlatform.bindgenHook + .try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS") + .expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8") .opt_level(3) .debug(true) - .compile("pgvectorsc"); + .compile("vectorsc"); diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff deleted file mode 100644 index bd20cf6619..0000000000 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index a52b978..092bc1d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2788,7 +2788,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] - name = "std_detect" - version = "0.1.5" --source = "git+https://github.com/tensorchord/stdarch.git?branch=avx512fp16#db0cdbc9b02074bfddabfd23a4a681f21640eada" -+source = "git+https://github.com/rust-lang/stdarch.git?branch=master#d2b1a070afc72d9ba4df80e055109ede5fc0a81f" - dependencies = [ - "cfg-if", - "libc", -diff --git a/crates/detect/Cargo.toml b/crates/detect/Cargo.toml -index b3ac782..c671c6a 100644 ---- a/crates/detect/Cargo.toml -+++ b/crates/detect/Cargo.toml -@@ -4,6 +4,6 @@ version.workspace = true - edition.workspace = true - - [dependencies] --std_detect = { git = "https://github.com/tensorchord/stdarch.git", branch = "avx512fp16" } -+std_detect = { git = "https://github.com/rust-lang/stdarch.git", branch = "master" } - ctor = "0.2.6" - rustix.workspace = true diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock index 092bc1d2e3..52dd4913b5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,39 +19,94 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] -name = "anstyle" -version = "1.0.4" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] [[package]] name = "anyhow" -version = "1.0.77" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] [[package]] name = "ascii-canvas" @@ -72,6 +127,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -85,12 +150,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -98,15 +162,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] @@ -116,12 +179,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.1.1", + "async-channel 2.3.1", "async-executor", - "async-io 2.2.2", - "async-lock 3.2.0", + "async-io 2.3.3", + "async-lock 3.4.0", "blocking", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "once_cell", ] @@ -147,18 +210,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.7.1", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -175,11 +238,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.1", + "event-listener 5.3.1", "event-listener-strategy", "pin-project-lite", ] @@ -206,26 +269,26 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" dependencies = [ - "async-io 2.2.2", - "async-lock 2.8.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -234,6 +297,7 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ + "async-attributes", "async-channel 1.9.0", "async-global-executor", "async-io 1.13.0", @@ -257,28 +321,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.75" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", -] - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", + "syn 2.0.66", ] [[package]] @@ -288,7 +343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f" dependencies = [ "cfg-if", - "rustc_version 0.3.3", + "rustc_version", ] [[package]] @@ -298,16 +353,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "autocfg" -version = "1.1.0" +name = "atty" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -318,17 +384,45 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base" +version = "0.0.0" +dependencies = [ + "base_macros", + "bytemuck", + "c", + "detect", + "half 2.4.1", + "libc", + "num-traits", + "rand", + "serde", + "thiserror", + "toml", + "uuid", + "validator", +] + [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base_macros" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "basic-cookies" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38" +checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7" dependencies = [ "lalrpop", "lalrpop-util", @@ -346,22 +440,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] @@ -387,9 +481,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -403,55 +497,43 @@ dependencies = [ "wyz", ] -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", + "async-channel 2.3.1", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] @@ -462,9 +544,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "c" @@ -472,32 +554,33 @@ version = "0.0.0" dependencies = [ "cc", "detect", - "half 2.3.1", + "half 2.4.1", "rand", ] [[package]] name = "cargo_toml" -version = "0.16.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" +checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" dependencies = [ "serde", "toml", ] [[package]] -name = "castaway" -version = "0.1.2" +name = "cc" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] -name = "cc" -version = "1.0.83" +name = "cee-scape" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "4d67dfb052149f779f77e9ce089cea126e00657e8f0d11dafc7901fde4291101" dependencies = [ + "cc", "libc", ] @@ -517,10 +600,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clang-sys" -version = "1.6.1" +name = "chrono" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.5", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -528,58 +625,28 @@ dependencies = [ ] [[package]] -name = "clap" -version = "4.4.12" +name = "colorchoice" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" -dependencies = [ - "clap_builder", - "clap_derive", -] +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] -name = "clap-cargo" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25122ca6ebad5f53578c26638afd9f0160426969970dc37ec6c363ff6b082ebd" +name = "common" +version = "0.0.0" dependencies = [ - "clap", - "doc-comment", + "bytemuck", + "log", + "memmap2", + "rustix 0.38.34", + "serde", + "serde_json", ] -[[package]] -name = "clap_builder" -version = "4.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" -dependencies = [ - "anstyle", - "clap_lex", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.43", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -593,43 +660,37 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - [[package]] name = "crossbeam" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -639,54 +700,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.10" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -695,23 +748,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-common" -version = "0.1.6" +name = "csv" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "generic-array", - "typenum", + "csv-core", + "itoa", + "ryu", + "serde", ] [[package]] -name = "ctor" -version = "0.2.6" +name = "csv-core" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ - "quote", - "syn 2.0.43", + "memchr", ] [[package]] @@ -721,34 +775,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] -name = "curl" -version = "0.4.44" +name = "darling" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.10", - "winapi", + "darling_core", + "darling_macro", ] [[package]] -name = "curl-sys" -version = "0.4.70+curl-8.5.0" +name = "darling_core" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.48.0", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.66", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.66", ] [[package]] @@ -768,35 +826,17 @@ dependencies = [ name = "detect" version = "0.0.0" dependencies = [ - "ctor", - "rustix 0.38.28", - "std_detect", + "detect_macros", + "rustix 0.38.34", ] [[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +name = "detect_macros" +version = "0.0.0" dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -809,18 +849,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -832,38 +860,49 @@ dependencies = [ "winapi", ] -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" + +[[package]] +name = "elkan_k_means" +version = "0.0.0" +dependencies = [ + "base", + "bytemuck", + "common", + "num-traits", + "rand", + "rayon 0.0.0", +] + +[[package]] +name = "embedding" +version = "0.0.0" +dependencies = [ + "httpmock", + "reqwest", + "serde", + "serde_json", + "thiserror", +] [[package]] name = "ena" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" dependencies = [ "log", ] [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -885,20 +924,30 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -909,9 +958,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -936,9 +985,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.1" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -947,30 +996,24 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.1", + "event-listener 5.3.1", "pin-project-lite", ] [[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fastrand" version = "1.9.0" @@ -982,15 +1025,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fixedbitset" @@ -999,13 +1036,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +name = "flat" +version = "0.0.0" dependencies = [ - "crc32fast", - "miniz_oxide", + "base", + "common", + "quantization", + "rayon 0.0.0", + "storage", ] [[package]] @@ -1023,12 +1061,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "funty" version = "2.0.0" @@ -1042,7 +1074,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -1074,11 +1105,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1093,7 +1124,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] @@ -1115,29 +1146,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", + "futures-io", "futures-macro", - "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1146,9 +1168,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1169,16 +1191,35 @@ dependencies = [ ] [[package]] -name = "half" -version = "1.8.2" +name = "h2" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] [[package]] name = "half" -version = "2.3.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "bytemuck", "cfg-if", @@ -1191,58 +1232,71 @@ dependencies = [ [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heapless" -version = "0.7.17" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version 0.4.0", - "spin", "stable_deref_trait", ] [[package]] -name = "heck" -version = "0.4.1" +name = "hermit-abi" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +name = "hnsw" +version = "0.0.0" dependencies = [ - "digest", + "base", + "bytemuck", + "common", + "parking_lot", + "quantization", + "rayon 0.0.0", + "storage", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1274,12 +1328,13 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "httpmock" -version = "0.6.8" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b02e044d3b4c2f94936fb05f9649efa658ca788f44eb6b87554e2033fc8ce93" +checksum = "08ec9586ee0910472dec1a1f0f8acf52f0fdde93aea74d70d4a3107b4be0fd5b" dependencies = [ "assert-json-diff", "async-object-pool", + "async-std", "async-trait", "base64", "basic-cookies", @@ -1287,7 +1342,6 @@ dependencies = [ "form_urlencoded", "futures-util", "hyper", - "isahc", "lazy_static", "levenshtein", "log", @@ -1308,21 +1362,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -1330,15 +1385,48 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.4.0" +name = "hyper-rustls" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.5.0" @@ -1349,23 +1437,46 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "indenter" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +[[package]] +name = "index" +version = "0.0.0" +dependencies = [ + "arc-swap", + "base", + "bincode", + "byteorder", + "common", + "crc32fast", + "crossbeam", + "dashmap", + "elkan_k_means", + "flat", + "hnsw", + "ivf", + "log", + "parking_lot", + "quantization", + "rand", + "rayon 0.0.0", + "serde", + "serde_json", + "storage", + "thiserror", + "uuid", + "validator", +] + [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1373,70 +1484,49 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] +[[package]] +name = "interprocess_atomic_wait" +version = "0.0.0" +dependencies = [ + "libc", + "ulock-sys", +] + [[package]] name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] [[package]] -name = "is-terminal" -version = "0.4.10" +name = "ipnet" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix 0.38.28", - "windows-sys 0.52.0", -] +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "isahc" -version = "1.7.2" +name = "is_ci" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel 1.9.0", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "encoding_rs", - "event-listener 2.5.3", - "futures-lite 1.13.0", - "http", - "log", - "mime", - "once_cell", - "polling 2.8.0", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] -name = "itertools" -version = "0.10.5" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -1448,16 +1538,40 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.10" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "ivf" +version = "0.0.0" +dependencies = [ + "base", + "common", + "elkan_k_means", + "num-traits", + "quantization", + "rand", + "rayon 0.0.0", + "serde_json", + "storage", +] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1473,33 +1587,33 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ "ascii-canvas", "bit-set", - "diff", "ena", - "is-terminal", - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop-util", "petgraph", + "pico-args", "regex", - "regex-syntax 0.6.29", + "regex-syntax", "string_cache", "term", "tiny-keccak", "unicode-xid", + "walkdir", ] [[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex", + "regex-automata", ] [[package]] @@ -1522,18 +1636,18 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", ] [[package]] @@ -1542,37 +1656,14 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libnghttp2-sys" -version = "0.1.8+1.55.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", ] [[package]] @@ -1583,15 +1674,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1599,47 +1690,37 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] [[package]] -name = "md-5" -version = "0.10.6" +name = "memchr" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +name = "memfd" +version = "0.0.0" +dependencies = [ + "detect", + "rand", + "rustix 0.38.34", +] [[package]] name = "memmap2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.17" @@ -1654,78 +1735,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", "windows-sys 0.48.0", ] -[[package]] -name = "mockall" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 2.0.43", -] - -[[package]] -name = "multiversion" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" -dependencies = [ - "multiversion-macros", - "target-features", -] - -[[package]] -name = "multiversion-macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "target-features", -] - [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" @@ -1737,20 +1769,11 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -1762,15 +1785,15 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -1781,48 +1804,14 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "openai_api_rust" -version = "0.1.8" -source = "git+https://github.com/tensorchord/openai-api.git?rev=228d54b6002e98257b3c81501a054942342f585f#228d54b6002e98257b3c81501a054942342f585f" -dependencies = [ - "log", - "mime", - "rand", - "serde", - "serde_json", - "ureq", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +dependencies = [ + "supports-color", +] [[package]] name = "parking" @@ -1832,9 +1821,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1842,17 +1831,23 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pathsearch" version = "0.2.0" @@ -1863,12 +1858,6 @@ dependencies = [ "libc", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -1877,9 +1866,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -1888,9 +1877,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -1898,22 +1887,21 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb44171122605250e719ca2ae49afb357bdb2fce4b3c876fcf2225165237328a" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "atomic-traits", - "bitflags 2.4.1", + "bitflags 2.5.0", "bitvec", "enum-map", "heapless", "libc", "once_cell", + "paste", "pgrx-macros", "pgrx-pg-sys", "pgrx-sql-entity-graph", "seahash", - "seq-macro", "serde", "serde_cbor", "serde_json", @@ -1923,46 +1911,42 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18ac8628b7de2f29a93d0abdbdcaee95a0e0ef4b59fd4de99cc117e166e843b" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "pgrx-pg-config" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd45ac6eb1142c5690df63c4e0bdfb74f27c9f93a7af84f064dc2c0a2c2d6f7" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "cargo_toml", - "dirs", "eyre", + "home", "owo-colors", "pathsearch", "serde", - "serde_derive", "serde_json", + "thiserror", "toml", "url", ] [[package]] name = "pgrx-pg-sys" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c6207939582934fc26fceb651cb5338e363c06ddc6b2d50ca71867f7c70ffe" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "bindgen", + "cee-scape", "clang-sys", "eyre", "libc", - "memoffset", - "once_cell", "pgrx-macros", "pgrx-pg-config", "pgrx-sql-entity-graph", @@ -1971,56 +1955,23 @@ dependencies = [ "serde", "shlex", "sptr", - "syn 1.0.109", + "syn 2.0.66", "walkdir", ] [[package]] name = "pgrx-sql-entity-graph" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50083de83b1fac2484e8f2c2a7da5fed0193904e2578fa6c4ce02262c455c2b" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "convert_case", "eyre", "petgraph", "proc-macro2", "quote", - "syn 1.0.109", - "unescape", -] - -[[package]] -name = "pgrx-tests" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba0115cd80d9e3ca1d5d2a8ab8b7320d6ed614a53d025b86152696a8b3caa75" -dependencies = [ - "clap-cargo", - "eyre", - "libc", - "once_cell", - "owo-colors", - "pgrx", - "pgrx-macros", - "pgrx-pg-config", - "postgres", - "proptest", - "rand", - "regex", - "serde", - "serde_json", - "sysinfo", + "syn 2.0.66", "thiserror", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared 0.11.2", + "unescape", ] [[package]] @@ -2033,39 +1984,16 @@ dependencies = [ ] [[package]] -name = "phf_shared" -version = "0.11.2" +name = "pico-args" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2075,21 +2003,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] -[[package]] -name = "pkg-config" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - [[package]] name = "polling" version = "2.8.0" @@ -2108,61 +2030,19 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.3.9", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] -[[package]] -name = "postgres" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" -dependencies = [ - "bytes", - "fallible-iterator", - "futures-util", - "log", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" -dependencies = [ - "base64", - "byteorder", - "bytes", - "fallible-iterator", - "hmac", - "md-5", - "memchr", - "rand", - "sha2", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" -dependencies = [ - "bytes", - "fallible-iterator", - "postgres-protocol", -] - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2175,33 +2055,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "predicates" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" -dependencies = [ - "anstyle", - "itertools 0.11.0", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2228,44 +2081,31 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] -name = "proptest" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +name = "quantization" +version = "0.0.0" dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.4.1", - "lazy_static", + "base", + "common", + "detect", + "elkan_k_means", "num-traits", "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax 0.8.2", - "rusty-fork", - "tempfile", - "unarray", + "serde_json", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2317,19 +2157,18 @@ dependencies = [ ] [[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +name = "rayon" +version = "0.0.0" dependencies = [ - "rand_core", + "log", + "rayon 1.10.0", ] [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2337,9 +2176,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2347,18 +2186,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -2367,58 +2206,94 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] -name = "regex-syntax" -version = "0.8.2" +name = "reqwest" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2432,16 +2307,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.20", + "semver", ] [[package]] @@ -2460,22 +2326,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -2483,6 +2349,15 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -2495,27 +2370,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2526,15 +2389,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -2566,12 +2420,6 @@ dependencies = [ "semver-parser", ] -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - [[package]] name = "semver-parser" version = "0.10.2" @@ -2582,16 +2430,19 @@ dependencies = [ ] [[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" +name = "send_fd" +version = "0.0.0" +dependencies = [ + "libc", + "log", + "rustix 0.38.34", +] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -2602,26 +2453,26 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half 1.8.2", + "half 1.8.3", "serde", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2640,77 +2491,59 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "service" version = "0.0.0" dependencies = [ "arc-swap", - "arrayvec", - "bincode", - "bytemuck", - "byteorder", - "c", - "crc32fast", - "crossbeam", - "dashmap", - "detect", - "half 2.3.1", - "libc", - "log", - "memmap2", - "memoffset", - "multiversion", - "num-traits", + "base", + "common", + "index", "parking_lot", - "rand", - "rayon", - "rustix 0.38.28", "serde", "serde_json", "thiserror", - "ulock-sys", - "uuid", - "validator", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", ] [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "similar" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "siphasher" @@ -2727,22 +2560,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel 1.9.0", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -2756,12 +2578,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2769,9 +2591,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "sptr" @@ -2786,12 +2605,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "std_detect" -version = "0.1.5" -source = "git+https://github.com/rust-lang/stdarch.git?branch=master#d2b1a070afc72d9ba4df80e055109ede5fc0a81f" +name = "storage" +version = "0.0.0" dependencies = [ - "cfg-if", - "libc", + "base", + "common", ] [[package]] @@ -2803,26 +2621,25 @@ dependencies = [ "new_debug_unreachable", "once_cell", "parking_lot", - "phf_shared 0.10.0", + "phf_shared", "precomputed-hash", ] [[package]] -name = "stringprep" -version = "0.1.4" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "subtle" -version = "2.5.0" +name = "supports-color" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +dependencies = [ + "atty", + "is_ci", +] [[package]] name = "syn" @@ -2837,9 +2654,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2847,18 +2664,30 @@ dependencies = [ ] [[package]] -name = "sysinfo" -version = "0.29.11" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", ] [[package]] @@ -2867,25 +2696,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "target-features" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", - "windows-sys 0.52.0", -] - [[package]] name = "term" version = "0.7.0" @@ -2897,39 +2707,44 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", ] [[package]] @@ -2958,9 +2773,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2969,67 +2784,50 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] -name = "tokio-postgres" -version = "0.7.10" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "rand", - "socket2 0.5.5", + "rustls", "tokio", - "tokio-util", - "whoami", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -3039,18 +2837,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", @@ -3071,23 +2869,10 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -3097,28 +2882,12 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - [[package]] name = "ucd-trie" version = "0.1.6" @@ -3134,12 +2903,6 @@ dependencies = [ "cty", ] -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - [[package]] name = "unescape" version = "0.1.0" @@ -3148,9 +2911,9 @@ checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -3160,18 +2923,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-xid" @@ -3185,24 +2948,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "serde", - "serde_json", - "url", - "webpki-roots", -] - [[package]] name = "url" version = "2.5.0" @@ -3210,15 +2955,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", ] [[package]] -name = "uuid" -version = "1.6.1" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", "serde", @@ -3226,12 +2977,12 @@ dependencies = [ [[package]] name = "validator" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" dependencies = [ - "idna 0.4.0", - "lazy_static", + "idna", + "once_cell", "regex", "serde", "serde_derive", @@ -3242,66 +2993,55 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" +checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" dependencies = [ - "if_chain", - "lazy_static", + "darling", + "once_cell", "proc-macro-error", "proc-macro2", "quote", - "regex", - "syn 1.0.109", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" -dependencies = [ - "proc-macro2", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "value-bag" -version = "1.4.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vectors" version = "0.0.0" dependencies = [ + "arrayvec", + "base", "bincode", "bytemuck", "byteorder", + "chrono", + "csv", "detect", + "embedding", "env_logger", - "half 2.3.1", - "httpmock", + "interprocess_atomic_wait", "libc", "log", - "mockall", + "memfd", + "memmap2", "num-traits", - "openai_api_rust", + "paste", "pgrx", - "pgrx-tests", "rand", - "rustix 0.38.28", + "rustix 0.38.34", + "scopeguard", + "send_fd", "serde", "serde_json", "service", "thiserror", + "tikv-jemallocator", "toml", "validator", ] @@ -3312,26 +3052,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3354,9 +3085,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3364,24 +3095,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3391,9 +3122,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3401,28 +3132,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3430,19 +3161,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "whoami" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" -dependencies = [ - "wasm-bindgen", - "web-sys", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -3462,11 +3183,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3475,6 +3196,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -3490,7 +3220,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -3510,17 +3240,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3531,9 +3262,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3543,9 +3274,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3555,9 +3286,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3567,9 +3304,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3579,9 +3316,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3591,9 +3328,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3603,19 +3340,29 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.5.31" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index 0041c55536..e8b3af416c 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,6 +1,6 @@ { lib , buildPgrxExtension -, cargo-pgrx_0_11_2 +, cargo-pgrx_0_12_0_alpha_1 , clang_16 , fetchFromGitHub , nix-update-script @@ -27,13 +27,13 @@ in # Upstream only works with a fixed version of cargo-pgrx for each release, # so we're pinning it here to avoid future incompatibility. # See https://docs.pgvecto.rs/developers/development.html#environment, step 6 - cargo-pgrx = cargo-pgrx_0_11_2; + cargo-pgrx = cargo-pgrx_0_12_0_alpha_1; rustPlatform = rustPlatform'; }) rec { inherit postgresql; pname = "pgvecto-rs"; - version = "0.2.1"; + version = "0.3.0"; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -44,17 +44,13 @@ in src = ./0001-read-clang-flags-from-environment.diff; clang = lib.getExe clang; }) - # Fix build failure on rustc 1.78 due to missing feature flag. - # Can (likely) be removed when pgvecto-rs 0.3.0 is released. - # See https://github.com/NixOS/nixpkgs/issues/320131 - ./0002-std-detect-use-upstream.diff ]; src = fetchFromGitHub { owner = "tensorchord"; repo = "pgvecto.rs"; rev = "v${version}"; - hash = "sha256-kwaGHerEVh6Oxb9jQupSapm7CsKl5CoH6jCv+zbi4FE="; + hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE="; }; # Package has git dependencies on Cargo.lock (instead of just crate.io dependencies), @@ -62,8 +58,7 @@ in cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "openai_api_rust-0.1.8" = "sha256-os5Y8KIWXJEYEcNzzT57wFPpEXdZ2Uy9W3j5+hJhhR4="; - "std_detect-0.1.5" = "sha256-Rsy8N0pTJ/3AIHjRyeOeyY7Q9Ho46ZcDmJFurCbRxiQ="; + "pgrx-0.12.0-alpha.1" = "sha256-HSQrAR9DFJsi4ZF4hLiJ1sIy+M9Ygva2+WxeUzflOLk="; }; }; @@ -86,6 +81,9 @@ in RUSTC_BOOTSTRAP = 1; }; + # This crate does not have the "pg_test" feature + usePgTestCheckFeature = false; + passthru = { updateScript = nix-update-script { }; tests = { @@ -94,11 +92,8 @@ in }; meta = with lib; { - # The pgrx 0.11.2 dependency is broken in aarch64-linux: https://github.com/pgcentralfoundation/pgrx/issues/1429 - # It is fixed in pgrx 0.11.3, but upstream is still using pgrx 0.11.2 - # Additionally, upstream (accidentally) broke support for PostgreSQL 12 and 13 on 0.2.1, but - # they are removing it in 0.3.0 either way: https://github.com/tensorchord/pgvecto.rs/issues/343 - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin || (versionOlder postgresql.version "14"); + # Upstream removed support for PostgreSQL 12 and 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 + broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14"); description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix index 1800b42471..05d22c19a8 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ R postgresql ]; - preBuild = '' - export USE_PGXS=1 - ''; + + makeFlags = [ "USE_PGXS=1" ]; + installPhase = '' install -D plr${postgresql.dlSuffix} -t $out/lib/ install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index 5b4e4543ec..109876b6e9 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "postgis"; - version = "3.4.2"; + version = "3.4.3"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - hash = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; + hash = "sha256-+N7VBdrrj1dlnaK55Xf/ceGDqqCUcI0u7OLFbZM2H2I="; }; buildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { json_c protobufc pcre2.dev - ] ++ lib.optional stdenv.isDarwin libiconv; + ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeBuildInputs = [ perl pkg-config @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ln -s ${postgresql}/bin/postgres $out/bin/postgres ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis" diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix index e4e8c5afdb..565f3fdaf6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -2,13 +2,9 @@ , stdenv , fetchFromGitHub , postgresql -, openssl -, zlib -, readline , flex , curl , json_c -, libxcrypt }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix index bc2a0973b9..c1700fc038 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { pname = "system_stats"; - version = "3.0"; + version = "3.2"; buildInputs = [ postgresql ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "EnterpriseDB"; repo = "system_stats"; rev = "v${version}"; - hash = "sha256-LuX7/LOi0rl6L/kjbjq7rr2zPcGIOYB7hdZBNJ9xqak="; + hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 0e5651085e..92b6ad4fea 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] ++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ] - ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLINTER=OFF" ]; # Fix the install phase which tries to install into the pgsql extension dir, # and cannot be manually overridden. This is rather fragile but works OK. diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix index 26d4cb0c15..3248384901 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, callPackage, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "wal2json"; @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension sql/*.sql ''; + passthru.tests.wal2json = lib.recurseIntoAttrs (callPackage ../../../../../nixos/tests/postgresql-wal2json.nix { + inherit (stdenv) system; + inherit postgresql; + }); + meta = with lib; { description = "PostgreSQL JSON output plugin for changeset extraction"; homepage = "https://github.com/eulerto/wal2json"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix index dcb286dd30..69aa8a3774 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix @@ -47,7 +47,7 @@ let pname = "postgresql"; stdenv' = - if jitSupport then + if jitSupport && !stdenv.cc.isClang then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { # LLVM bintools are not used by default, but are needed to make -flto work below. bintools = llvmPackages.bintools; @@ -103,8 +103,8 @@ let ++ lib.optionals systemdSupport' [ systemdLibs ] ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals gssSupport [ libkrb5 ] - ++ lib.optionals stdenv'.isLinux [ linux-pam ] - ++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ]; + ++ lib.optionals stdenv'.hostPlatform.isLinux [ linux-pam ] + ++ lib.optionals (!stdenv'.hostPlatform.isDarwin) [ libossp_uuid ]; nativeBuildInputs = [ makeWrapper @@ -126,7 +126,6 @@ let # and allows splitting them cleanly. env.CFLAGS = "-fdata-sections -ffunction-sections" + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections") - + lib.optionalString (stdenv'.isDarwin && jitSupport) " -fuse-ld=lld" # Makes cross-compiling work when xml2-config can't be executed on the host. # Fixed upstream in https://github.com/postgres/postgres/commit/0bc8cebdb889368abdf224aeac8bc197fe4c9ae6 + lib.optionalString (olderThan "13") " -I${libxml2.dev}/include/libxml2"; @@ -139,16 +138,16 @@ let "--with-system-tzdata=${tzdata}/share/zoneinfo" "--enable-debug" (lib.optionalString systemdSupport' "--with-systemd") - (if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + (if stdenv'.hostPlatform.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals lz4Enabled [ "--with-lz4" ] ++ lib.optionals zstdEnabled [ "--with-zstd" ] ++ lib.optionals gssSupport [ "--with-gssapi" ] ++ lib.optionals pythonSupport [ "--with-python" ] ++ lib.optionals jitSupport [ "--with-llvm" ] - ++ lib.optionals stdenv'.isLinux [ "--with-pam" ] + ++ lib.optionals stdenv'.hostPlatform.isLinux [ "--with-pam" ] # This could be removed once the upstream issue is resolved: # https://postgr.es/m/flat/427c7c25-e8e1-4fc5-a1fb-01ceff185e5b%40technowledgy.de - ++ lib.optionals (stdenv'.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]; + ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]; patches = [ (if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch) @@ -159,14 +158,14 @@ let (substituteAll { src = ./patches/locale-binary-path.patch; - locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; + locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 map fetchurl (lib.attrValues muslPatches) - ) ++ lib.optionals stdenv'.isLinux [ + ) ++ lib.optionals stdenv'.hostPlatform.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch) - ] ++ lib.optionals (stdenv'.isDarwin && olderThan "16") [ + ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [ ./patches/export-dynamic-darwin-15-.patch ]; @@ -230,7 +229,7 @@ let wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; - doCheck = !stdenv'.isDarwin; + doCheck = !stdenv'.hostPlatform.isDarwin; # autodetection doesn't seem to able to find this, but it's there. checkTarget = "check"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix index e0a6f23a46..ed04908180 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "High-performance MySQL proxy"; mainProgram = "proxysql"; homepage = "https://proxysql.com/"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix b/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix index 37cce9c42e..81f35a20b5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.30.0"; + version = "8.30.3"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q0Gt75SUhyezqikhBoDeLY4fw6utkhe1lJHsmBRFNWY="; + sha256 = "sha256-W5/e22Qc/qHHHAtsTD9isUkdZ1j4Wk0g56uuAGbE4cU="; }; - vendorHash = "sha256-waAhhbg02xyWRtj+hvzN9M0DLzz2NlkCmhmOLd3O2Sc="; + vendorHash = "sha256-P8v0vqxOfN9JjwsdoM6JmqGujGP5V68OAUc3KB/YU+k="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/sqld/default.nix b/third_party/nixpkgs/pkgs/servers/sql/sqld/default.nix index db78ebafc8..79c52798c6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/sqld/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/sqld/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zstd - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; env.ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix b/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix index c7c06a6d50..c6055d6015 100644 --- a/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { sqlite zstd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index 9229359d91..998b2d9ada 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl - ] ++ lib.optionals stdenv.isLinux [ libcap pam systemd ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap pam systemd ]; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-delay-pools" "--enable-x-accelerator-vary" "--enable-htcp" - ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) + ] ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/sslh/default.nix b/third_party/nixpkgs/pkgs/servers/sslh/default.nix index a9ca0c8f25..cfb15d6d54 100644 --- a/third_party/nixpkgs/pkgs/servers/sslh/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sslh/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs *.sh"; - buildInputs = [ libev libconfig perl pcre2 ] ++ lib.optionals stdenv.isLinux [ libcap tcp_wrappers ]; + buildInputs = [ libev libconfig perl pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap tcp_wrappers ]; - makeFlags = lib.optionals stdenv.isLinux [ "USELIBCAP=1" "USELIBWRAP=1" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "USELIBCAP=1" "USELIBWRAP=1" ]; postInstall = '' # install all flavours diff --git a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix index 3e29f5aa42..b57dafed1d 100644 --- a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00 preCheck = '' diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix index 9b56cccf15..6ced9624b7 100644 --- a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix @@ -139,7 +139,7 @@ stdenv'.mkDerivation rec { miniupnpc ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ intel-media-sdk ]; diff --git a/third_party/nixpkgs/pkgs/servers/swego/default.nix b/third_party/nixpkgs/pkgs/servers/swego/default.nix index a446648099..f26b33856d 100644 --- a/third_party/nixpkgs/pkgs/servers/swego/default.nix +++ b/third_party/nixpkgs/pkgs/servers/swego/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { maintainers = with maintainers; [ fab ]; # darwin crashes with: # src/controllers/parsingArgs.go:130:4: undefined: PrintEmbeddedFiles - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "swego"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 10b88a04c7..e1b26e12cc 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -15,7 +15,7 @@ }: let - version = "1.74.0"; + version = "1.74.1"; in buildGoModule { pname = "tailscale"; @@ -25,7 +25,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-KTg1rxyCgvZAwkGxhFXLff5UggKlqa6VLMItK81JV2k="; + hash = "sha256-672FtDKgz7Nmoufoe4Xg/b8sA8EuKH8X+3n9PAKYjFk="; }; patches = [ @@ -39,7 +39,7 @@ buildGoModule { vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles ]; CGO_ENABLED = 0; @@ -60,7 +60,7 @@ buildGoModule { postInstall = '' ln -s $out/bin/tailscaled $out/bin/tailscale - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/tailscaled \ --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]} \ --suffix PATH : ${lib.makeBinPath [ procps ]} diff --git a/third_party/nixpkgs/pkgs/servers/teleport/generic.nix b/third_party/nixpkgs/pkgs/servers/teleport/generic.nix index 87719f03eb..2fcdc7f4a6 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/generic.nix @@ -54,7 +54,7 @@ let buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; nativeBuildInputs = [ pkg-config ]; # https://github.com/NixOS/nixpkgs/issues/161570 , @@ -144,7 +144,7 @@ buildGoModule rec { ++ lib.optional withRdpClient "desktop_access_rdp"; buildInputs = [ openssl libfido2 ] - ++ lib.optionals (stdenv.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ]; nativeBuildInputs = [ makeWrapper pkg-config ]; patches = extPatches ++ [ diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index d9759fa66f..db5c231b45 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchzip, buildGoModule, nixosTests }: +{ lib, fetchzip, buildGo123Module, nixosTests }: -buildGoModule rec { +buildGo123Module rec { pname = "traefik"; - version = "3.1.2"; + version = "3.1.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-PHS4x9RDoc2zDPS1SaYYEeZVa4SyQpvqzPT/SDo1ygg="; + hash = "sha256-e77PCMeN6Ck6hQ3Rx7MU4EL+f/1kpA2E+gVcISoUnf4="; stripRoot = false; }; - vendorHash = "sha256-xQPDlwu/mRdyvZW0qSCA9eko9pOQAMwh2vVJWzMnyfs="; + vendorHash = "sha256-iYwA/y9AuHomyEckOyl4845lkQkeBAFDsGiZWESylqs="; subPackages = [ "cmd/traefik" ]; diff --git a/third_party/nixpkgs/pkgs/servers/trezord/default.nix b/third_party/nixpkgs/pkgs/servers/trezord/default.nix index 247ac6832d..3852f13993 100644 --- a/third_party/nixpkgs/pkgs/servers/trezord/default.nix +++ b/third_party/nixpkgs/pkgs/servers/trezord/default.nix @@ -30,8 +30,8 @@ buildGoModule rec { }) ]; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix index d3cb4c7d47..30091834a8 100644 --- a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorHash = "sha256-wWIw0gNn5tqRq0udzPy/n2OkiIVESpSotOSn2YlBNS4="; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa WebKit ]; ldflags = [ "-s" "-w" "-X golift.io/version.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/ursadb/default.nix b/third_party/nixpkgs/pkgs/servers/ursadb/default.nix index c79156a8f3..c8111fc648 100644 --- a/third_party/nixpkgs/pkgs/servers/ursadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ursadb/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ msm ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix index 1f874236fb..7d0729ee46 100644 --- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -9,9 +9,9 @@ , zlib # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] -, pam, withPAM ? stdenv.isLinux +, pam, withPAM ? stdenv.hostPlatform.isLinux , systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, libcap, withCap ? stdenv.isLinux +, libcap, withCap ? stdenv.hostPlatform.isLinux , python2, python3, ncurses , ruby, php , makeWrapper, fetchFromGitHub @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ jansson pcre libxcrypt ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ expat zlib ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ expat zlib ] ++ lib.optional withPAM pam ++ lib.optional withSystemd systemd ++ lib.optional withCap libcap diff --git a/third_party/nixpkgs/pkgs/servers/varnish/default.nix b/third_party/nixpkgs/pkgs/servers/varnish/default.nix index ddc190a288..8814bd41e0 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/default.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/default.nix @@ -32,7 +32,7 @@ let ''; # https://github.com/varnishcache/varnish-cache/issues/1875 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-fexcess-precision=standard"; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix index e9c5ff0e4f..0a4e2b7c9a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index 8deafe9e53..1db614f03a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -6,7 +6,6 @@ , yarn , makeBinaryWrapper , nodejs -, node-gyp , python3 , nixosTests }: diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix index 1adbbecec3..0225e2a346 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix @@ -1,23 +1,22 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, buildDotnetModule -, buildNpmPackage -, dotnetCorePackages -, nixosTests +{ + lib, + stdenvNoCC, + fetchFromGitHub, + buildDotnetModule, + buildNpmPackage, + dotnetCorePackages, + nixosTests, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "kavita"; - version = "0.8.2"; + version = "0.8.3.2"; src = fetchFromGitHub { owner = "kareadita"; repo = "kavita"; - # commit immediately following the v${version} tag - # for correct version reporting - rev = "44c046176e54fa81e3420a1a40dcd9871e0a45f1"; - hash = "sha256-cHX6nzajFqygdFF9y4KEAMv0tdNx9xFbpOoVNo8uafs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8ZE3zlWX8DxLYUFj3AA04cIJTUWYgnNM+5FZhGmlRz8="; }; backend = buildDotnetModule { @@ -49,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; }; - frontend = buildNpmPackage { + frontend = buildNpmPackage { pname = "kavita-frontend"; inherit (finalAttrs) version src; @@ -58,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { npmBuildScript = "prod"; npmFlags = [ "--legacy-peer-deps" ]; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers - npmDepsHash = "sha256-H53lwRr43MQWBbwc8N0GikAOkN2N0CwyiY8eGHveNFc="; + npmDepsHash = "sha256-EB4B6BHiRi6A4nhj2dR+3q1MZKcfcYUuo4ls4WMJEUI="; }; dontBuild = true; @@ -75,7 +74,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - tests = { inherit (nixosTests) kavita; }; + tests = { + inherit (nixosTests) kavita; + }; updateScript = ./update.sh; }; @@ -85,7 +86,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://github.com/kareadita/kavita/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ misterio77 nevivurn ]; + maintainers = with lib.maintainers; [ + misterio77 + nevivurn + ]; mainProgram = "kavita"; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/kavita/nuget-deps.nix b/third_party/nixpkgs/pkgs/servers/web-apps/kavita/nuget-deps.nix index 77fa4d46c8..085e615b19 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/kavita/nuget-deps.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/kavita/nuget-deps.nix @@ -25,18 +25,18 @@ (fetchNuGet { pname = "Hangfire.NetCore"; version = "1.8.14"; hash = "sha256-AcBAONay/nnNrGy0Hjt1UA7rxzIeTm0rQgZO+AJpQbM="; }) (fetchNuGet { pname = "Hangfire.SqlServer"; version = "1.8.14"; hash = "sha256-OkKb2D2kKN9ESrSwFH1up9/KC4qZHblGiuLLwMWojfE="; }) (fetchNuGet { pname = "Hangfire.Storage.SQLite"; version = "0.4.2"; hash = "sha256-//40m/V+kgcDrKJ7/YfX1upOK9ZQEG/Bpbk7c5PmQuk="; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.61"; hash = "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY="; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.64"; hash = "sha256-tj0yh2B2st0k4DABKA/LFh7lH3c07soEfxwH8AL7PSY="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) - (fetchNuGet { pname = "MailKit"; version = "4.7.0"; hash = "sha256-9KcpzvO9MKAlxCh2B2XOBWbPfQ8TRo27gxuSJpB57vs="; }) + (fetchNuGet { pname = "MailKit"; version = "4.7.1.1"; hash = "sha256-g9VnuGYTPNUa6woEO/gVbxNfaidHgGtoQw2qOgYLK0o="; }) (fetchNuGet { pname = "MarkdownDeep.NET.Core"; version = "1.5.0.4"; hash = "sha256-NO//QjqAcE4yDmQARbThyp8fdFrE2U0Bed5XToOG+jI="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; hash = "sha256-0JcJYAoU+AEM0dWaXk2qnqxrVM0Ak9/ntCU1MC90R24="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.6"; hash = "sha256-rUg3keud5JjMtyncxNc2/8Sey2bMTth/AFjeketJR88="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.6"; hash = "sha256-tTPB/xKJA9BJiwcrBhcV+kwqxyumew2RXDlicn85fgE="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.8"; hash = "sha256-HnRXaASyL3Q3tA++0C4JiIhUSTeFtEX+acybs8uiXZ8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.8"; hash = "sha256-7Nbhyn29No/p2/nqFc+C41J1mnU5DBYUrnVSxbod+QM="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; hash = "sha256-PaMYICjQ0rprUv53Uza/jQvvWTcbPjGLMMp12utF+NY="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; hash = "sha256-onFYB+jtCbGyfZsIglReCPRdDMmwah2EDMhJN4uBP7Q="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; hash = "sha256-MoieWAe7zT/0a7PAn3gMKO8YpHTbOtiGIwF/sFAmieY="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.6"; hash = "sha256-8+2aRr6mWkdzcGEpIAA9mwI+HPAxqZek8MtNS50mPJQ="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.6"; hash = "sha256-5ss60ArZhhZCml464QwlRdvRdyBWIR8cmCZfiPt05vo="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.8"; hash = "sha256-VS+6L2gvDAIS51kpAamt8FHDbiIwYBpBh2ADvKO3uRU="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.8"; hash = "sha256-nwzIcerY8JKBkkJgw2ozTmGRyXrVkP6BnMYbDYNLe24="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; hash = "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.0"; hash = "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk="; }) @@ -45,7 +45,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "1.1.0"; hash = "sha256-PooDjJHsIcZkL2IOp530pJr4GLGlre2sIdboNRrAcHQ="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; hash = "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; hash = "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-8Jc28VhEkWgW0dE5riY/Ye7w6vlkIQ44dduLBx1p/s4="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.8"; hash = "sha256-fgnUFp18Uop3gpfs/jLFEf/leDJoWtECVvEX5ZN9cyw="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; hash = "sha256-mvsF973Cm48XUB6lPBiGp7U7vkfBjB3oILdnIQUwe4o="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; hash = "sha256-nqJjxKXkdPAY1XvQjIRNW2y855Xi+LAX1S5AncPnPDU="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR"; version = "1.1.0"; hash = "sha256-VCTxQAWRKBk640FhkGu4XUcfWXWSV8x4jEfezDoM4Jo="; }) @@ -62,14 +62,14 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.6"; hash = "sha256-MgUBbb0LDM1ixm8pBfBrSTVjNoGFn6NQMD36mirELmo="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-T9Pz6bCGULBEYjzdUBd1KXSAnw1c4VljSkwgbTE2MmE="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; hash = "sha256-RdcIA9WUJnHyAFdlpBPs5qUusKMUH9uLFGusKBWDCX8="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; hash = "sha256-aTWfaOL0MfWYBbR+1Q1g+sxzmcjA4Q/OBFnVZDQqKJ8="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.6"; hash = "sha256-svQdeAv19bCM/RQwWFA6wFssrXecqazqs5ctbdZCBgQ="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; hash = "sha256-l2fkzSq3Tb15Uq7a879Bihat+Y7rijDwsrs/MDiApdw="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.6"; hash = "sha256-kb+8eSHhmaxJ5OXYSFTHtKYaQ2TV+WJ5nfZMP+XXsto="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.6"; hash = "sha256-4rVgUuCdBUvQyEnadrieZ1RxgwGAfuRCj9kkWM24NKA="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.8"; hash = "sha256-5qV38l8ZeCZTE5f5+f5XFNzUCuTurqDti2qxobeYPXk="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.8"; hash = "sha256-w4NJ3K5ot/oZO5xIGcVLE7n4x/Jnmz0/VYfumnACcuc="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.8"; hash = "sha256-93QnvBG9lz9TuWx4o1yvEvWMq2k3jD7G77yI8pl8hz8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.8"; hash = "sha256-xjqccaSQW7pJinwWPv2eLuVA2vchIJcRroYVTbywTnQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.8"; hash = "sha256-Bxfg9/w3/bUwsWgASf5TAeL/7ECBDpkCUytT+bKwrx0="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.8"; hash = "sha256-ZdhJ4yUuxo1NIMz/qCrDKIFvYGAHhDCNsAVy+0lm/Kk="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.8"; hash = "sha256-i9YQkY0U64ronI8zvEDhbFNJt3QQTZ470Ysnx2ZxiJ4="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.8"; hash = "sha256-TI77E3xSNZexiEbh/z5uVgG76cLZVn8KP7Dzh8sRciU="; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; }) @@ -93,7 +93,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.6"; hash = "sha256-TKEE5GJmn1wLKuiF6Wd+Q7jpIlq9gSvlWvTVopCyoo4="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.1"; hash = "sha256-m8daXRK1Qn9y2c8SmtWu9ysLHwFJtEWiUQoAnMalw7s="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; hash = "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k="; }) @@ -105,8 +105,8 @@ (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "3.0.0"; hash = "sha256-iUMCRR9uHSoub48MboewTxokP5QwrC47X5t+C+JUMo4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.6"; hash = "sha256-0cquYLpXjFMdd2VQrsr54LrbQ723jbIwoLOhO04wTnM="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.6"; hash = "sha256-/HmTyyTMpY5xpgjwU9GO8uTIefTaTztFagZKEqXX6iY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.8"; hash = "sha256-Gu8lyqKUANMq7oea6WQHCieCN3AFDFbRM5ClmS096Zk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.8"; hash = "sha256-kh0GfO507LMSDZPNPNoMVBSfDpip2wXCewUDi6KsURg="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) @@ -134,14 +134,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.1.2"; hash = "sha256-QN2btwsc8XnOp8RxwSY4ntzpqFIrWRZg6ZZEGBZ6TQY="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.1.2"; hash = "sha256-6M7Y1u2cBVsO/dP+qrgkMLisXbZgMgyWoRs5Uq/QJ/o="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.1.2"; hash = "sha256-6OXP0vQ6bQ3Xvj3I73eqng6NqqMC4htWKuM8cchZhWI="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.1.2"; hash = "sha256-cAwwCti+/ycdjqNy8PrBNEeuF7u5gYtCX8vBb2qIKRs="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.1.2"; hash = "sha256-qf8y8KCo1ysrK+jCrnR+ARHwlfMWPXLxe7a41FVg4OA="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.1"; hash = "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo="; }) (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; hash = "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="; }) (fetchNuGet { pname = "Microsoft.NETCore.Jit"; version = "1.0.2"; hash = "sha256-T92T+bmdXfpAe73OKFTYXGJW1gTHuwcryBSgV7mwSkk="; }) @@ -158,23 +158,23 @@ (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; }) - (fetchNuGet { pname = "MimeKit"; version = "4.7.0"; hash = "sha256-bdBpES930ZgPaFrXJuNkW3vRryMygwXpE5dNyW1xOS0="; }) + (fetchNuGet { pname = "MimeKit"; version = "4.7.1"; hash = "sha256-yTUqWAFU1v8jo70D09A+l8tsc+pr6IMOORD9L8EDz9o="; }) (fetchNuGet { pname = "MimeTypeMapOfficial"; version = "1.0.17"; hash = "sha256-HuQRDUDjBlAKzbnCWvxkXp7tf2bCdd/evox8964grdA="; }) (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; hash = "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="; }) (fetchNuGet { pname = "Nager.ArticleNumber"; version = "1.0.7"; hash = "sha256-Th3BIABiOo0vsgqznr6C6WhVdGDFalso/rAfUYDI0NE="; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) (fetchNuGet { pname = "NetVips"; version = "2.4.1"; hash = "sha256-Un1ZACxSjadaUIzmUimGshXDal8tJAq1CBwrgrNiwMk="; }) - (fetchNuGet { pname = "NetVips.Native"; version = "8.15.2"; hash = "sha256-ak8dJNNOGJURiUVourVL0Qn8rTA4H5yzrKWfcUt2z0o="; }) - (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.2"; hash = "sha256-Xv+EBcwNYeUXv5Z9OHDY+8xw9haW24WQCp0t+eYWjN0="; }) - (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.2"; hash = "sha256-PZCj5MESL+Da0pu0Lx4OpysD1m45LZVPQo3dWLsLjYc="; }) - (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.2"; hash = "sha256-A8TYMh6L9z3gDjTyyFd9WNjU0BuxOT5Ag34EW9wazJk="; }) - (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.2"; hash = "sha256-2oUm+8OHyK1zHWCoIVXfPu+T/xmq5yTN4H048LrT9kc="; }) - (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.2"; hash = "sha256-vTnL2ERyu8/UwfTeCtLZR0stmVx4Qyyki/yAEE537Cc="; }) - (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.2"; hash = "sha256-eXE7j851WlLGJWc9Kbg/eP3HxKrM8b7ujwy/r3IBUxE="; }) - (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.2"; hash = "sha256-VRS7vWj9GYHWnyE4qjc7XnxhiwsTmqx1hfnc7WO4SIA="; }) - (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.2"; hash = "sha256-zhLnFqPsf/+cA5JDT+7eFWaldM+mnMEgzS3ijSuC73k="; }) - (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.2"; hash = "sha256-73NkRF3um0AEO2PMQLpFb0IvGgBihYdY7ccfBg4vHXk="; }) - (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.2"; hash = "sha256-fTgnpFaq9uVx2OEOW7WuUdHHCguMeUp90KDIsNvi4iI="; }) + (fetchNuGet { pname = "NetVips.Native"; version = "8.15.3"; hash = "sha256-MW+so2f7+IwnRIHN5u8g/B4InETKLsDgSte2qq7B+bU="; }) + (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.3"; hash = "sha256-+m86lUEBWxbPT/sKBCFPorTkO0WMtRgaI0Ab+x4kUr4="; }) + (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.3"; hash = "sha256-GSX/tcblN9LZLXXXKsTqjJYwHRsQ0ol4AuC5rmBtA44="; }) + (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.3"; hash = "sha256-pOq07bd9L3H5GdSkLSlSB/ViElUF6r87oNixWoq/WzM="; }) + (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.3"; hash = "sha256-1JdsDxKwY+tk6OSCt1PhX3wXV9noZgQp27rKsQElESQ="; }) + (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.3"; hash = "sha256-TQoRwZ8CHi0+06dqEr9SLv7JOttIVGiUzc/LLRMtGGU="; }) + (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.3"; hash = "sha256-uMSH4OOgv/6PoXVvJw44JMiqytKBcOWDrjqz3coJ3sE="; }) + (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.3"; hash = "sha256-rwQqUqgvYeNvE/S518Uw2JeL9+qaXOnhqmdVUb3ez/E="; }) + (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.3"; hash = "sha256-dlcl9vAmu5B0K6zy0WsZQ1Q3DYrgZELIXEYIDQs8m8g="; }) + (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.3"; hash = "sha256-nRaI7ZaWpR5LWNYEBXMNfdij1nxQcDYTK4liz8T6we0="; }) + (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.3"; hash = "sha256-34+2bMn8PXNoag39r8kCOYG/vJxcmB6/Ay6ytZTswuA="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.1"; hash = "sha256-lbR7rpS/EXgJ8TqQspuIIqAsiorrZb1oOK4HFw+QyPw="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; hash = "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; hash = "sha256-BW7sXT2LKpP3ylsCbTTZ1f6Mg1sR4yL68aJVHaJcTnA="; }) @@ -222,22 +222,22 @@ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) (fetchNuGet { pname = "Scrutor"; version = "3.3.0"; hash = "sha256-cYd6xuCn8cniuHWhiWMZRYZrYUjOvAz2wlEvOM5drmE="; }) - (fetchNuGet { pname = "Serilog"; version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; }) - (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; hash = "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="; }) + (fetchNuGet { pname = "Serilog"; version = "4.0.1"; hash = "sha256-yenpr50Qf+nq1nrqyg3TKJqOroSyIKHke/9nfkA3wYg="; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.2"; hash = "sha256-cRZHG2bqrESOxPVxq2v+mHx+oZBzZEPksrleGVXO1p0="; }) (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "4.0.0"; hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="; }) (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; hash = "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk="; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; }) (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.1"; hash = "sha256-UqaNQPN5devzd8czUWu6D7zWJs/pUVsU5PJQRnyT4uw="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.2"; hash = "sha256-iHRQt6vDk85/6HpMXiJluAwhkjgwEnL3IKavfDgFX0k="; }) (fetchNuGet { pname = "Serilog.Sinks.AspNetCore.SignalR"; version = "0.4.0"; hash = "sha256-KkyrLNMsoBGMJN7C8NNGhGVxFDYzfvxlX66i3NLYkmo="; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; }) (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; }) (fetchNuGet { pname = "Serilog.Sinks.SignalR.Core"; version = "0.1.2"; hash = "sha256-7j9SK++4U7Q6f6ofPWsaH9xQii/jBK864u/kHYwxyJk="; }) (fetchNuGet { pname = "SharpCompress"; version = "0.37.2"; hash = "sha256-IP7/ssqWKT85YwLKrLGACHo0sgp7sMe603X+o485sYo="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) - (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.28.0.94264"; hash = "sha256-lG8+16cWHYNhO0MFjUHv0zQGj5mipRmUr57z3CaO1wk="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; }) + (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.32.0.97167"; hash = "sha256-F8f9YjBZekwIowIm6LKfjowqmCyhLUuTFQIcjEEVDPg="; }) (fetchNuGet { pname = "sqlite-net-pcl"; version = "1.8.116"; hash = "sha256-XlD0ycLkpMeFkZ9NCktC2ldYzD2NyJarSv5h6e4gekA="; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.4"; hash = "sha256-QjDI47nPUXx75rMABeSYefB6gw6xgrgTjYY6Uq/1J4U="; }) @@ -247,14 +247,14 @@ (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; hash = "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.4"; hash = "sha256-0rzyURehoQsyDxW8Yj477TJLNcItBsJVwKBeGidKmSA="; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.3"; hash = "sha256-pt1lBEN6Yk1QfqcgLD8Z2vE3tXUeJreQ2lRfjtMASCU="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters"; version = "8.0.2"; hash = "sha256-RCFdFvCzUYS850axoGaprr0heFyBFCIu9jzusXJ0YAA="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters.Abstractions"; version = "8.0.2"; hash = "sha256-oe6KYmrvaAKu0JpAwxpIiyxSaqfRg2VAyc/KKQX6xFI="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; hash = "sha256-TnAjQpCdwSH3rm1m3ptdoOGS4/9a8OOH3srAatG2gYw="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.3"; hash = "sha256-aVQ9NuqiW0EFhLwz2LMa15hWTQzmzyS3huuA42rbJSM="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; hash = "sha256-JGMmhhq6OdscsGsnSM6182ZkyWiSdr0ERmNZvJV4XAM="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.3"; hash = "sha256-K2Ig2cp8Cl5tLuPhSGz5ewW1W6A1JC9rfSfVSDNdLuY="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.3"; hash = "sha256-OLcFaBuRyBhukVE4LiJm1kkAAjZtzfhGjRFEHHbI1X4="; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; }) @@ -281,17 +281,17 @@ (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.6"; hash = "sha256-dHrc4lCnhmBU3j+bdmgyjNK2pZsbfBRL1zz38lVyQvM="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.8"; hash = "sha256-u/u0US7c0dfB8TmIdN+AI2GKrWUguuEmEKMGx7NLIKE="; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.0"; hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.1"; hash = "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.6.2"; hash = "sha256-RL7l7Xfi9a7w8v1DOTxrOFLrNVUkXWoCcE2YdCN6Q+Y="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "8.0.2"; hash = "sha256-SQA6LrcReEQIGz/flaXD7gDlAyu30XbQKEVimpZSFuU="; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-UTdB/kD39zeXjUxdgQbXSxS/yyzDtc2rLre2+pLoQWk="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-91e2/Bd4ZgANw19mKkTdxAy2tv7NutyG0lQTKhMiEpo="; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) @@ -368,6 +368,7 @@ (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) @@ -385,9 +386,9 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-900+hyDm/wCd7iD5hnPJue/In/ZcA3NlGNk9kHWLoX0="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.22"; hash = "sha256-xDe16iGy2i0SyYnlauFxZMTUx44PM+kas+jRtagDV50="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-OFpu9RcDRPLYntQyesBevoG1XxyH96ukHOH0uXqO5ls="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.29"; hash = "sha256-2q1HzbyRPIm6VKYzZzZnkXBJzV8S+HBtT6Lej1pv84Y="; }) (fetchNuGet { pname = "VersOne.Epub"; version = "3.3.2"; hash = "sha256-jzkD4HDgFMevH8FRYml7UHEwMt7BWG+VpinIPlioIUo="; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.8.1"; hash = "sha256-PzTY1UeDK4t22o3GjAV1qV/zsXe/N4yOQsFu5l8Zu/A="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.9.0"; hash = "sha256-3GUZ0loDa/3WDXRuBQdghsKXE/bZrCBJ5Bopr43SuVA="; }) (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.0"; hash = "sha256-nQkUIDqpgy7ZAtRWyMXQflYnWdPUcbIxIblOINO2O5k="; }) ] diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix index 8cb65bfef2..416de2b21d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { cargoHash = pinData.serverCargoHash; buildInputs = [ postgresql ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration ]; # Using OPENSSL_NO_VENDOR is not an option on darwin # As of version 0.10.35 rust-openssl looks for openssl on darwin diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/0.3.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/0.3.nix index 11f2479efd..9e7ad6e3d2 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/0.3.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/0.3.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' wrapProgram "$out/bin/pict-rs" \ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix index 6033db65bf..fddfd6fffe 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) pict-rs; }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Simple image hosting service"; mainProgram = "pict-rs"; homepage = "https://git.asonix.dog/asonix/pict-rs"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix index 796e61848e..5816e1dd91 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.303"; + version = "2.5.304"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-Jpv4D+ldGPvJz+8cwNhrmC+Ii5dG0UOTC5JIWPwUzvk="; + sha256 = "sha256-w89+X3sqZPlX7EuK/g2oATHqlpx1br/Njh81vZt8zYM="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 08a9eb2da0..76a0ebfdf2 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -5,7 +5,7 @@ hash = "sha256-bIRmTqmzIRo1KdhAcJa1GxhVcTEiEaLFPzlNFbzfLcQ="; }; wordpress_6_6 = { - version = "6.6.1"; - hash = "sha256-YW6BhlP48okxLrpsJwPgynSHpbdRqyMoXaq9IBd8TlU="; + version = "6.6.2"; + hash = "sha256-JpemjLPc9IP0/OiASSVpjHRmQBs2n8Mt4nB6WcTCB9Y="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/webdav-server-rs/default.nix b/third_party/nixpkgs/pkgs/servers/webdav-server-rs/default.nix index ad10845976..e7e5b6a0ed 100644 --- a/third_party/nixpkgs/pkgs/servers/webdav-server-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/webdav-server-rs/default.nix @@ -5,7 +5,7 @@ , libtirpc , pam , rpcsvc-proto -, enablePAM ? stdenv.isLinux +, enablePAM ? stdenv.hostPlatform.isLinux }: rustPlatform.buildRustPackage rec { diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index b3eb0e74dc..ad631e419a 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -11,7 +11,7 @@ }: let - inherit (stdenv) isDarwin; + inherit (stdenv.hostPlatform) isDarwin; malloc0ReturnsNullCrossFlag = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) @@ -87,7 +87,7 @@ self: super: x11BuildHook = ./imake.sh; patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch]; setupHook = ./imake-setup-hook.sh; - CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${if stdenv.isDarwin + CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${if stdenv.hostPlatform.isDarwin then "${tradcpp}/bin/cpp" else "gcc"}\"'"; @@ -164,7 +164,7 @@ self: super: # Remove useless DocBook XML files. rm -rf $out/share/doc ''; - CPP = lib.optionalString stdenv.isDarwin "clang -E -"; + CPP = lib.optionalString stdenv.hostPlatform.isDarwin "clang -E -"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ]; }); @@ -263,7 +263,7 @@ self: super: ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; + CPP = if stdenv.hostPlatform.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; outputDoc = "devdoc"; outputs = [ "out" "dev" "devdoc" ]; }); @@ -794,7 +794,7 @@ self: super: ./dont-create-logdir-during-build.patch ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -926,7 +926,7 @@ self: super: "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" "--with-xkb-output=$out/share/X11/xkb/compiled" - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ "--without-dtrace" ]; @@ -935,7 +935,7 @@ self: super: xorg.libXfont2 xorg.xtrans xorg.libxcvt - ] ++ lib.optional stdenv.isDarwin [ Xplugin ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ Xplugin ]; }); lndir = super.lndir.overrideAttrs (attrs: { @@ -1083,7 +1083,7 @@ self: super: xmore = addMainProgram super.xmore { }; xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" ''; }); diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix index 11da061226..420c923367 100644 --- a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.33"; + version = "1.36.34"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - hash = "sha256-KUhFZrF7BuLB2Z3LnTcHEEZVA6iosam6YsOd8KWvx7E="; + hash = "sha256-ClO1f0Aspz04C8wgQurtHWmwzu2f4RZ/1oGjPN8HQrw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/shells/bash/5.nix b/third_party/nixpkgs/pkgs/shells/bash/5.nix index 614b3c377e..91da1f05a5 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/5.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/5.nix @@ -7,7 +7,7 @@ , util-linux # patch for cygwin requires readline support -, interactive ? stdenv.isCygwin +, interactive ? stdenv.hostPlatform.isCygwin , readline , withDocs ? false , texinfo diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index 9e65dcd7c2..6408f0610f 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --ignore=test/t/test_screen.py ''; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* ''; diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index 73065cb380..82ba76c005 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -177,7 +177,7 @@ let # tests/checks/complete.fish sed -i 's|/bin/ls|${coreutils}/bin/ls|' tests/checks/complete.fish - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Tests use pkill/pgrep which are currently not built on Darwin # See https://github.com/NixOS/nixpkgs/pull/103180 rm tests/pexpects/exit.py @@ -187,7 +187,7 @@ let # pexpect tests are flaky in general # See https://github.com/fish-shell/fish-shell/issues/8789 rm tests/pexpects/bind.py - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # pexpect tests are flaky on aarch64-linux (also x86_64-linux) # See https://github.com/fish-shell/fish-shell/issues/8789 rm tests/pexpects/exit_handlers.py @@ -208,12 +208,12 @@ let cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DMAC_CODESIGN_ID=OFF" ]; # Fish’s test suite needs to be able to look up process information and send signals. - sandboxProfile = lib.optionalString stdenv.isDarwin '' + sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow mach-lookup mach-task-name) (allow signal (target children)) ''; @@ -235,7 +235,7 @@ let gnused groff gettext - ] ++ lib.optional (!stdenv.isDarwin) man-db; + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db; doCheck = true; @@ -278,13 +278,13 @@ let end EOF - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for cur in $out/share/fish/functions/*.fish; do sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \ -i "$cur" done - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ "$out/share/fish/tools/create_manpage_completions.py" sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ @@ -308,7 +308,7 @@ let passthru = { shellPath = "/bin/fish"; tests = { - nixos = lib.optionalAttrs stdenv.isLinux nixosTests.fish; + nixos = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.fish; # Test the fish_config tool by checking the generated splash page. # Since the webserver requires a port to run, it is not started. diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix index 3a70c888c3..1ad4764c46 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix @@ -31,7 +31,7 @@ buildFishPlugin rec { # Disable tests that are failing, because there is not 'rev' command rm tests/preview_file/custom_file_preview.fish '' + ( - if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' + if stdenv.hostPlatform.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' else ''script -c 'fish -c "fishtape tests/*/*.fish"' '' ); diff --git a/third_party/nixpkgs/pkgs/shells/ion/default.nix b/third_party/nixpkgs/pkgs/shells/ion/default.nix index 0440a79e76..a5e7f9edeb 100644 --- a/third_party/nixpkgs/pkgs/shells/ion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/ion/default.nix @@ -34,11 +34,11 @@ rustPlatform.buildRustPackage rec { ./build-script.patch ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # test assumes linux "--skip=binary::completer::tests::filename_completion" ]; diff --git a/third_party/nixpkgs/pkgs/shells/murex/default.nix b/third_party/nixpkgs/pkgs/shells/murex/default.nix index 871b07bc6e..44c6c4f48c 100644 --- a/third_party/nixpkgs/pkgs/shells/murex/default.nix +++ b/third_party/nixpkgs/pkgs/shells/murex/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "murex"; - version = "6.2.4000"; + version = "6.3.4225"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CgbbbFFsY6zBwS4GeZk5DuHWibRIewvQ1CnvuvTFaSU="; + sha256 = "sha256-y+7tRp4JNlefsKnMgU9d3b9pzgBJbSKGI98CzkcOjq8="; }; - vendorHash = "sha256-/qK7Zgdz48vmz+tIMZmo1M5Glr842fOCinMoLAeQasg="; + vendorHash = "sha256-NIhg8D8snCNxpb3i2JG5tLcZteYBCGN4QbOowG/vgJE="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index a391ac6999..ef0edeb6a2 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -21,7 +21,7 @@ }: let - version = "0.97.1"; + version = "0.98.0"; in rustPlatform.buildRustPackage { @@ -32,24 +32,24 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-hrcPWJ5OXFozfNux6iR/nEw/1z64N5BV4DD/JWhlH2U="; + hash = "sha256-0XN26onR4Tk8Ejc/UntdL+b5FPBOoBmDQM0DRommIMo="; }; - cargoHash = "sha256-iGmAgrj1oy0t8SsSuCNiUoqWXDFA2CdsPnYYYOpXofs="; + cargoHash = "sha256-43V0TnYGG2tyWRIGaohIaoN7dxnY1fle2Bp5lDiFlWg="; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = [ openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ zlib Libsystem Security ] - ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withDefaultFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib Libsystem Security ] + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [ AppKit nghttp2 libgit2 ]; buildNoDefaultFeatures = !withDefaultFeatures; buildFeatures = additionalFeatures [ ]; - doCheck = ! stdenv.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0 + doCheck = ! stdenv.hostPlatform.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0 checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix index f713957f27..7d693118ac 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix @@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-pWtQYraMJ8nXJiTQPXxu/kEg4ftQy8YAjhUj9WPEYS8="; + cargoHash = "sha256-Lcgf6+Li1STl4Sko81oBHAnX09A6F7dwYmHJiF2CZ3s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index c2b12073b7..06a2fb38d9 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-f7gH5Kxz8vsYQluvIl/VNklFh80kFKCZEyJvH5eD9Qk="; + cargoHash = "sha256-NLGEaIGUqgyGegzVyZloLckVGYmfMjwhzVXh327kxRA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix index 95d1c36b46..981f1d208e 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation IOKit ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix index 88c29e0ccb..5865af7139 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix @@ -14,12 +14,12 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-agUuDPv8LJixj3cBrvhW8UdPLQHNVYpSlPGvioxZoDU="; + cargoHash = "sha256-LfD0b9ZDWA1apKR36eHx1gKFiKSGAr2tqbZKTc2rMIE="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix index c3440a7295..55bd221c8b 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-ygzHnrQ3zO1+lxzRUFO1+0XocGBemJKoDa4oiCjCe+0="; + cargoHash = "sha256-7E4CCs4xyNGwjk6B2CwIFf1x0o5uNQArZpyxXEKLXMI="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { openssl curl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/update.sh b/third_party/nixpkgs/pkgs/shells/nushell/update.sh deleted file mode 100644 index 9a8015e746..0000000000 --- a/third_party/nixpkgs/pkgs/shells/nushell/update.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -#!nix-shell -p git nix-update nixpkgs-review nixfmt-rfc-style - -set -euxo pipefail - -basedir="$(git rev-parse --show-toplevel)" -cd "$basedir" - -branch="update-nushell" -nuPath="pkgs/shells/nushell" - -function staged() { - if git status --porcelain | grep -q -E "^[AM].? +$1"; then - return 0 - else - return 1 - fi -} - -function version() { - grep '\s*version = ' "$nuPath/default.nix" | cut -d'"' -f 2 | head --lines 1 -} - -git checkout -B "$branch" - -version_old=$(version) -if ! staged "$nuPath/default.nix"; then - nix-update nushell - git add "$nuPath/default.nix" -fi -version_new=$(version) - -declare -a plugins=(formats query polars gstat) -for plugin in "${plugins[@]}"; do - attr="nushellPlugins.$plugin" - pluginPath="$nuPath/plugins/$plugin.nix" - - if staged "$pluginPath"; then - echo "Skipping '$plugin' because it's alredy staged" - continue - fi - - echo "Attempting to build $attr" - - set +e - newHash=$(nix build ".#$attr" 2> \ - >(grep got | - awk -F' ' '{ print $2 }')) - set -e - - # New hash ? - if [ -n "$newHash" ]; then - # Add the new hash - sed -i "s!cargoHash = ".*";!cargoHash = \"$newHash\";!" "$pluginPath" - nixfmt "$pluginPath" - - echo "Building $plugin again with new hash $newHash" - nix build ".#$attr" - git add "$pluginPath" - echo "Plugin $plugin built sucessfully" - else - echo "No new hash for '$plugin'" - fi -done - -git commit -m "nushell: $version_old -> $version_new" - -echo "Starting nixpkgs-review" -nixpkgs-review rev "$branch" diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index c6d1237015..a29bb9c990 100644 --- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/powershell/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ less makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { libuuid libunwind openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Libsystem - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust pam ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { --set POWERSHELL_TELEMETRY_OPTOUT 1 \ --set DOTNET_CLI_TELEMETRY_OPTOUT 1 - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $out/share/powershell/libcoreclrtraceptprovider.so '' + '' diff --git a/third_party/nixpkgs/pkgs/shells/rush/default.nix b/third_party/nixpkgs/pkgs/shells/rush/default.nix index 6e7e256561..7b60617897 100644 --- a/third_party/nixpkgs/pkgs/shells/rush/default.nix +++ b/third_party/nixpkgs/pkgs/shells/rush/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Restricted User Shell"; longDescription = diff --git a/third_party/nixpkgs/pkgs/shells/yash/default.nix b/third_party/nixpkgs/pkgs/shells/yash/default.nix index a88049ca01..3e57b7b9a0 100644 --- a/third_party/nixpkgs/pkgs/shells/yash/default.nix +++ b/third_party/nixpkgs/pkgs/shells/yash/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ asciidoc gettext ]; - buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ gettext ]; + buildInputs = [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; meta = with lib; { homepage = "https://yash.osdn.jp/index.html.en"; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix index fe32821dd6..7c1f0eb56c 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -30,6 +30,6 @@ buildGoModule rec { # # but this package is no longer maintained. # - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/shells/zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/default.nix index ac8d3aa9a7..0955c9c47f 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook perl groff texinfo pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux yodl ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux yodl ]; buildInputs = [ ncurses pcre ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index 00349696bd..d7b745c63c 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ txt2tags ]; buildInputs = [ zsh coreutils procps ] - ++ lib.optional stdenv.isLinux inetutils; + ++ lib.optional stdenv.hostPlatform.isLinux inetutils; buildPhase = '' cd doc diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index e1149cf9c6..cf4337a98f 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2024-09-01"; + version = "2024-09-22"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "b8c69d265257fae88fe504ea43cbcf2728bc1308"; - sha256 = "sha256-Q0SjYWkWY5/haoPunp5yusYoXIXzmB2tces/9gOZgJM="; + rev = "f11cc8fea190eb9a1638dc67877436d0b8475ff5"; + sha256 = "sha256-9rk9iyz7uK1JfNfBq3jxrB3qzdR7xo43899KIivS/Zo="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix index e950eadbcf..8b0cfd6ed5 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "zsh-autopair"; - version = "1.0"; + version = "1.0-unstable-2024-07-14"; src = fetchFromGitHub { owner = "hlissner"; repo = "zsh-autopair"; - rev = "v${version}"; - sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; + rev = "449a7c3d095bc8f3d78cf37b9549f8bb4c383f3d"; + hash = "sha256-3zvOgIi+q7+sTXrT+r/4v98qjeiEL4Wh64rxBYnwJvQ="; }; - strictDeps = true; - installPhase = '' install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh ''; @@ -21,7 +23,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hlissner/zsh-autopair"; description = "Plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently"; license = licenses.mit; - maintainers = with maintainers; [ _0qq ]; + maintainers = with maintainers; [ + _0qq + DataHearth + ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix index 13038e05c7..0ace44e06f 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix @@ -1,32 +1,33 @@ -{ stdenv +{ stdenvNoCC , lib , bash , coreutils , findutils , fetchFromGitHub , fzf +, gawk , git , gnugrep , gnused , makeWrapper }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "24.02.0"; + version = "24.09.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; - rev = version; - sha256 = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I="; }; strictDeps = true; postPatch = '' substituteInPlace forgit.plugin.zsh \ - --replace "\$INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" + --replace-fail "\$FORGIT_INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" ''; dontBuild = true; @@ -38,10 +39,9 @@ stdenv.mkDerivation rec { install -D bin/git-forgit $out/bin/git-forgit install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit - install -D completions/git-forgit.zsh $out/share/zsh/${pname}/git-forgit.zsh - install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh + install -D forgit.plugin.zsh $out/share/zsh/${finalAttrs.pname}/forgit.plugin.zsh wrapProgram $out/bin/git-forgit \ - --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf gawk git gnugrep gnused ]} runHook postInstall ''; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ deejayem ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 9cd22e364e..b2b6576c4a 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -42,6 +42,24 @@ let inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags; inherit (import ../../build-support/lib/meson.nix { inherit lib stdenv; }) makeMesonFlags; + /** + This function creates a derivation, and returns it in the form of a [package attribute set](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) + that refers to the derivation's outputs. + + `mkDerivation` takes many argument attributes, most of which affect the derivation environment, + but [`meta`](#chap-meta) and [`passthru`](#var-stdenv-passthru) only directly affect package attributes. + + The `mkDerivation` argument attributes can be made to refer to one another by passing a function to `mkDerivation`. + See [Fixed-point argument of `mkDerivation`](#mkderivation-recursive-attributes). + + Reference documentation see: https://nixos.org/manual/nixpkgs/stable/#sec-using-stdenv + + :::{.note} + This is used as the fundamental building block of most other functions in Nixpkgs for creating derivations. + + Most arguments are also passed through to the underlying call of [`builtins.derivation`](https://nixos.org/manual/nix/stable/language/derivations). + ::: + */ mkDerivation = fnOrAttrs: if builtins.isFunction fnOrAttrs diff --git a/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix index 6a0b11a6cc..3de359d15b 100644 --- a/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix @@ -3,9 +3,9 @@ let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersWorking = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin && !stdenv.hostPlatform.isMusl && ( + sanitizersWorking = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl && ( (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "5.0.0") - || (stdenv.cc.isGNU && stdenv.isLinux) + || (stdenv.cc.isGNU && stdenv.hostPlatform.isLinux) ); staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; emulator = stdenv.hostPlatform.emulator buildPackages; @@ -57,7 +57,7 @@ in stdenv.mkDerivation { rm cxx-main{,-static,.o} ''} - ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' + ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} @@ -65,7 +65,7 @@ in stdenv.mkDerivation { ''} - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' echo "checking whether compiler builds valid static C binaries... " >&2 $CC ${staticLibc} -static -o cc-static ${./cc-main.c} ${emulator} ./cc-static @@ -106,7 +106,7 @@ in stdenv.mkDerivation { echo "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index 0a9df68ecc..adb112fd36 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -167,7 +167,7 @@ with pkgs; makeBinaryWrapper = pkgs.makeBinaryWrapper.override { # Enable sanitizers in the tests only, to avoid the performance cost in regular usage. # The sanitizers cause errors on aarch64-darwin, see https://github.com/NixOS/nixpkgs/pull/150079#issuecomment-994132734 - sanitizers = pkgs.lib.optionals (! (pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64)) + sanitizers = pkgs.lib.optionals (! (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64)) [ "undefined" "address" ]; }; }; diff --git a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/default.nix b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/default.nix index 0d699900cf..29e4272fd6 100644 --- a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/default.nix @@ -60,7 +60,7 @@ let "overlength-strings" "prefix" "suffix" - ] makeGoldenTest // lib.optionalAttrs (! stdenv.isDarwin) { + ] makeGoldenTest // lib.optionalAttrs (! stdenv.hostPlatform.isDarwin) { cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.callPackage ./cross.nix { }; }; in diff --git a/third_party/nixpkgs/pkgs/test/release/default.nix b/third_party/nixpkgs/pkgs/test/release/default.nix index 19ff08b6f9..2fdc6d0dc3 100644 --- a/third_party/nixpkgs/pkgs/test/release/default.nix +++ b/third_party/nixpkgs/pkgs/test/release/default.nix @@ -13,7 +13,7 @@ pkgs.runCommand "all-attrs-eval-under-tryEval" { nativeBuildInputs = [ nix pkgs.gitMinimal - ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; + ] ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools; strictDeps = true; src = with lib.fileset; toSource { diff --git a/third_party/nixpkgs/pkgs/test/stdenv-inputs/default.nix b/third_party/nixpkgs/pkgs/test/stdenv-inputs/default.nix index 6a2e441d01..deb97b8224 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv-inputs/default.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv-inputs/default.nix @@ -12,7 +12,7 @@ let chmod +x $out/bin/foo cp ${./foo.c} $out/include/foo.h $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ -o $out/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} ''; @@ -30,7 +30,7 @@ let chmod +x $out/bin/bar cp ${./bar.c} $dev/include/bar.h $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ -o $dev/lib/libbar${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./bar.c} ''; diff --git a/third_party/nixpkgs/pkgs/test/stdenv/default.nix b/third_party/nixpkgs/pkgs/test/stdenv/default.nix index 6ed430f5da..a916e9b65a 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv/default.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv/default.nix @@ -168,7 +168,7 @@ in { # Disable on Darwin due to assumptions with __bootPackages - __attrsFailEvaluation = stdenv.isDarwin; + __attrsFailEvaluation = stdenv.hostPlatform.isDarwin; # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; }); diff --git a/third_party/nixpkgs/pkgs/test/texlive/default.nix b/third_party/nixpkgs/pkgs/test/texlive/default.nix index c142623233..f9e0bc51e3 100644 --- a/third_party/nixpkgs/pkgs/test/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/test/texlive/default.nix @@ -375,7 +375,7 @@ rec { # 'Error initialising QuantumRenderer: no suitable pipeline found' "tlcockpit" - ] ++ lib.optional stdenv.isDarwin "epspdftk"; # wish shebang is a script, not a binary! + ] ++ lib.optional stdenv.hostPlatform.isDarwin "epspdftk"; # wish shebang is a script, not a binary! # (1) binaries requiring -v shortVersion = [ "devnag" "diadia" "pmxchords" "ptex2pdf" "simpdftex" "ttf2afm" ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix b/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix index 5d756844e3..c14ff710d4 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.unix; # `daemon(3)` is deprecated on macOS and `pidfile-rs` needs updating - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ jecaro ]; mainProgram = "inputplug"; }; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix index 80407564a2..6c7aa89e01 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uroO0PgnCkFRNYAZgdTZWgDDbBqq1ZM+dni/A2Qw9fg="; - buildInputs = [ xorg.libX11 xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ xorg.libX11 xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config patchelf python3 ]; - buildNoDefaultFeatures = !stdenv.isLinux; - buildFeatures = lib.optional (!stdenv.isLinux) "pulse"; + buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; + buildFeatures = lib.optional (!stdenv.hostPlatform.isLinux) "pulse"; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook ''; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index 625dde8f82..fe3f4ba0f4 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -88,7 +88,7 @@ in buildPythonApplication rec { ./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159 ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace xpra/platform/posix/features.py \ --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" ''; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index 38a67622ed..3eca45ee7c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "sha256-onxneLmXs1rYwpTzcnn+rbDboWVoEQgtGMHx/bMPRa8="; + sha256 = "sha256-smhqovPgDdSLhAwW1y/hnPjNwFcpIUocs3MKizdvZj0="; }; nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix index e7fbb962c8..b0e0d79d27 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gnused openssl socat - (if stdenv.isLinux then iproute2 else unixtools.netstat) + (if stdenv.hostPlatform.isLinux then iproute2 else unixtools.netstat) ]; in '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix index 10f196979d..918a9ab7fc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-IAYQJviSQHKeayI0uAEbXX+vQxfAbMOqP2fH+2VPamQ="; + sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY="; }; - cargoHash = "sha256-BJ8WV8FcRrwPHhCY2GiOWDP72/T3K9eJIrPeoIa+9Sk="; + cargoHash = "sha256-rk/lVoPdA9Uj/MorMchVlQQB9bYmNC90NqM6w9FXLoc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 6c1ca57749..181e5c7220 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecr-credential-helper"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "sha256-xhJnhh1pDANGq4CFBPAEwqtsxSYeIvhKcHEsvYRebbM="; + sha256 = "sha256-TRYBZiddnN6wCErSLKCr9JEH/Ldxg+Oh2hA63+EwRjo="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix b/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix index bc6e325ea1..0e2757d548 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "24.7.0"; + version = "24.9.2"; format = "pyproject"; src = fetchPypi { inherit version; pname = "ansible_lint"; - hash = "sha256-yi7cfk6AzxnfSyjL9MEY92HObN1qXvnIVh5FTtevWiQ="; + hash = "sha256-fP9sWvEO+Za3xgEMvUjJFZJ2SuCY8rBUCHJomaEGan8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix index bb326f1f3a..ed945be9fc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix @@ -15,20 +15,20 @@ let # Fix for: https://github.com/NixOS/nixpkgs/issues/272156 buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "19.0.3"; + version = "19.0.12"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-6odzj7/twhSJFxX2kbKbEOjzyZHjrg6Dd8d3LDtSzNU="; + hash = "sha256-/C83s66vTq60FLfKPb27RBGfBC295qs5WWej9Yz4Cak="; }; - npmDepsHash = "sha256-IWd3E6bjy5cQ4VsDV/zHyehxxINUsDEy3pKVfSWVpKU="; + npmDepsHash = "sha256-CdbJqMbBYzy9TfhlXVMJgGr3pLVMX4naRs/rGz96bYo="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json @@ -38,13 +38,13 @@ in buildNpmPackage' rec { nativeBuildInputs = [ node-gyp python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix b/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix index b2825ce7d5..23360dc7f7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/coldsnap/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-ngkoxybl52zTH4wo+sIUtU8vtzOAp+jU1RyTO2KbCgU="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index 57164bd0dc..b47be23c03 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.37"; + version = "2.9.38"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-BW6QMxBuiBmCE7ujpPc2sGEz0jkhEo0cPoa184Yx6/Q="; + sha256 = "sha256-xSjT+h85/ZknwTTLUhC9GWrCRN9VHMQBM6WuHX3ldq4="; }; # these tests require network access that we're not going to give them diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix index f9e90afb27..54de6d17e3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorHash = null; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ libsecret ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; ldflags = [ "-s" @@ -25,7 +25,7 @@ buildGoModule rec { buildPhase = let - cmds = if stdenv.isDarwin then [ "osxkeychain" "pass" ] else [ "secretservice" "pass" ]; + cmds = if stdenv.hostPlatform.isDarwin then [ "osxkeychain" "pass" ] else [ "secretservice" "pass" ]; in '' for cmd in ${builtins.toString cmds}; do @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://github.com/docker/docker-credential-helpers"; license = licenses.mit; maintainers = [ ]; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { mainProgram = "docker-credential-osxkeychain"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix index 6ba8bbedd7..33df518660 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-09-08"; + version = "0-unstable-2024-09-09"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "877bce095a192ead0e9b6e0d5ce3071482cf0f6e"; - hash = "sha256-s1l7IyWRzaBTtoj71W+Ubmcigw4w7Ypf1Yg44vxN2Qg="; + rev = "789b8fe40e156ad0252230b13dd4ada96f3eed8b"; + hash = "sha256-M/kTV13MCcWycpJ2+jhXBTIoQuXakqO2llEL3PEjI/g="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix index f63b5049e2..c337112762 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -164,7 +164,7 @@ let nativeBuildInputs = [ python3 stdenv.cc.cc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix b/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix index 4fbe229b2c..89f1ad466b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-prvdxWdv580BmhjhP6h4FHyjCDlgr5/Z1kg2wOS+pR0="; + sha256 = "sha256-BVliK88TRcpQEWnj2PVBJOtdehn4ZuYUWX9lr5MRbIM="; }; - vendorHash = "sha256-g7GKABv7SunVhRUd4y3ZSqD5lnFxM5nuaHJhxFuF/FE="; + vendorHash = "sha256-uKzs+plk1W2S7iPv2J1Mi1Ff88+82zrIXLy2eTzD/Hc="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix index 704bdf84e0..6ffed3604c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix @@ -9,7 +9,7 @@ , glib , pkg-config , cyrus_sasl -, pulseaudioSupport ? stdenv.isLinux +, pulseaudioSupport ? stdenv.hostPlatform.isLinux , libpulseaudio , libgcrypt , gtk3 diff --git a/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix b/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix index 82f2825bcd..0b5e1ed737 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index 4325040dd6..37725ad4b9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -39,7 +39,7 @@ let # skip tests on macOS which fail due to an error in keyring, see https://github.com/NixOS/nixpkgs/issues/281214 skippedTests = builtins.concatStringsSep "," ( [ "browser.tests.test_kerberos_with_mocking" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "browser.server_groups.servers.tests.test_all_server_get" "browser.server_groups.servers.tests.test_check_connect" "browser.server_groups.servers.tests.test_check_ssh_mock_connect" diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index d4071186f9..4e574e407e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EifER0wt2Nw7WrlVwc49tZHH/av4OkzTPYSzl9mVJI8="; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; postInstall = '' for shell in bash fish zsh; do @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion procs.{bash,fish} --zsh _procs ''; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv Libsystem ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv Libsystem ]; meta = with lib; { description = "Modern replacement for ps written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index b9ee4437d4..d7c88c80b0 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,16 +1,16 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.133.0"; + version = "3.134.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-linux-x64.tar.gz"; - sha256 = "0yxlgy48i3b80f8y8nbgvq93i1qcz43ya2la6z5wfhj4cxc900rc"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.0-linux-x64.tar.gz"; + sha256 = "0mrx8kkr09a90clhpc1km72w2xggf32ql6b48hyz2qxd8p83yi0r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-amd64.tar.gz"; - sha256 = "1dd5s4d07qlcikcc7m4yh41085diciq25md4g2m1n6wfy629sllv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.0-linux-amd64.tar.gz"; + sha256 = "0fm7qx0jn7c60wpf5gar18xycwykl77lyma90mpiwcd0jiv9n7lc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-linux-amd64.tar.gz"; @@ -21,8 +21,8 @@ sha256 = "1pq2xl59ady3id356gxp08ml7jdlzk4hm0rlq6dk9cn7v9nvj973"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-linux-amd64.tar.gz"; - sha256 = "0pv5cl6wvgwvz17r2q4i4d0bmkxyvqn3yhid91bvxx1n11i0rb2y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.0-linux-amd64.tar.gz"; + sha256 = "0qmfv8avmbvkh2jva2wlghc5x3gi750jwcav88492lisk9ld8mhs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-amd64.tar.gz"; @@ -33,20 +33,20 @@ sha256 = "17ghj412xh4d80ih2lbl43xlaj97ia89jfkj2z6mxv1k5b4mmsc6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz"; - sha256 = "0yzv3xyijma1sxvilf1bgqcc3d0hdcx6pfpzw2s0fix7pi25qszn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-linux-amd64.tar.gz"; + sha256 = "10ci5gj7abcp8rw6nkx1d3gj1f21j67h5g73ly5p3k83ki4ay3wm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-amd64.tar.gz"; sha256 = "1m7pif65wv083zvfxdyc3bpq7dyv4whpqi9k9p8d9gb7zn93piz8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-amd64.tar.gz"; - sha256 = "1l7qibcbak0zmrzfrldqrhkfdvmankb8yflv6ak17y8434dfcrfa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-linux-amd64.tar.gz"; + sha256 = "0rz7ksgn1z152kcsjlqapapv4ywy48vmqi31bnbgfkg9w4z92v75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-linux-amd64.tar.gz"; - sha256 = "1gn7m1wyx7qlvv8q2i64cybpzms92dbydnv4dw3gvdxq4l217w94"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.0-linux-amd64.tar.gz"; + sha256 = "0c8x02aw6zsrq6blkqc440fb0ngc5n0xpip87yr0xlc7axafys85"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-amd64.tar.gz"; @@ -73,32 +73,32 @@ sha256 = "0k4phk9p7w58lnl65d21r6182gw1pawz8zj21dycbsbyx68vbqfc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-linux-amd64.tar.gz"; - sha256 = "1rq8njkjzajwjbj7kgm1n12fblyvxj4ar04cb883si0d48015l1p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.2.0-linux-amd64.tar.gz"; + sha256 = "1vq4v3cf53zi8xw4k9ycnsj4hasx5jsc7n0334hh15kdz6rd9snr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-amd64.tar.gz"; sha256 = "1qn8x8k4gn5qr9h5r5a1pj2x9fvpn3ass9g4xdqcdfrvi8x1xn3v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-linux-amd64.tar.gz"; - sha256 = "0c454vzi55b272rbhpwy9bwrdlyip16fa5775rdlnp6zrwqxwzfs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.0-linux-amd64.tar.gz"; + sha256 = "0fizv7mh652n0778446ly9hvb7zvpd79krhidmf6l5wz0aa1gr95"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-linux-amd64.tar.gz"; - sha256 = "1cr2rwv1k4myd4gdyb88v4vyqrlxkl2br4jrvnari7sklpb4kjz9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.2-linux-amd64.tar.gz"; + sha256 = "1fw9wa0qj44c3c3iankmzj46v4mvyjbynnq5h25irhxvzfvdkrii"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-amd64.tar.gz"; sha256 = "1c19ylgpigrcflaklyk5dd0qg2b5zpn0gn5nm9brxy5za2k60n3f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-linux-amd64.tar.gz"; - sha256 = "0paqwfdqjdd5cymrjfmx8qq8j26hgcjmy2zlgjp516psfvf645vp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.1-linux-amd64.tar.gz"; + sha256 = "0gq1mdlysvpv11xqjn3zxwk9av8bcyljjfbzf15hyrn9mx6ymrbq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-amd64.tar.gz"; @@ -121,20 +121,20 @@ sha256 = "1qp5ix0ybdjg9gzdlrlrkvvnqyc7sz9hwjkfmr944h6nc1smkghw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-linux-amd64.tar.gz"; - sha256 = "0i9668mimdhm0aw0hjmg2ca2qycwilngz30mp2hjjlb2rv4mfgbk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-linux-amd64.tar.gz"; + sha256 = "1v317rlj7gmcdb74zlnmz668qn4d1ivl7dx81gw0lmqba73i1pdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-linux-amd64.tar.gz"; - sha256 = "1974ysq788i3g4xzgx16azwn71flypbpb378j0dpaz7z2phwa021"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-linux-amd64.tar.gz"; + sha256 = "12livvv61dcj8ylkrff2mggc55hh7pc60raqzpx3bslr6x5h8ln9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-amd64.tar.gz"; - sha256 = "10d34620hkdqmflb24gs8hapf5apb45ribw695xz9pdwkhqrd3wp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-linux-amd64.tar.gz"; + sha256 = "02l5xxzsdjwxacrylviavlr7myspz46b3wvyar24vdqjm572ccjw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-linux-amd64.tar.gz"; - sha256 = "13imgiw2lys6d4wdriqrzmgsszkkam8lg7c01nz6xcqr2lccf2xy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-linux-amd64.tar.gz"; + sha256 = "1i1g4sacapzq2mr9nivydjyagk03g6k42khsrm2mzziw91mwmjbm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-amd64.tar.gz"; @@ -149,12 +149,12 @@ sha256 = "07izmvi0z326vbjc7nnq8q4imxz3ljdaanmbxk8imdhg6ikfbfxd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-amd64.tar.gz"; - sha256 = "05xc1bm0bzqfwpakw9yrlh6dwm0zy3sq0vdhp4bnwrl2cmkwxp26"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-linux-amd64.tar.gz"; + sha256 = "1dknp93vk8am0ghhpsa9pjymd6vkysnq3lfkcwzdq3i7n52lf36c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-amd64.tar.gz"; - sha256 = "1ng6z1bl5z362p4sc9mn1skrz40d05csbch7dpd2cqhi0n5kkkf8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-linux-amd64.tar.gz"; + sha256 = "0qz3vzgc9g4lwb7c0sdm075lcwjahqz6indnnma3ljbvpq3r92bq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,12 +163,12 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-darwin-x64.tar.gz"; - sha256 = "1823lpgdn3q98nls7d967hfqsddkaawldcqcwiqw809qsr7786hq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.0-darwin-x64.tar.gz"; + sha256 = "1wqa9y1msnf8hdy7hi81b5g2jxyg3zifvnv9rrj00v39b3mj59b1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-amd64.tar.gz"; - sha256 = "0338m5b1c2lffg6xx6zv1dnawwyq3vqvgfmm43c2pklrwwka89v6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.0-darwin-amd64.tar.gz"; + sha256 = "1zs9c6jrxkq11198mh3bc9q1vrcg0wbr12pz0yyhk6xmm3hjzq90"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-darwin-amd64.tar.gz"; @@ -179,8 +179,8 @@ sha256 = "10xngdq0rcmpfl4mfkarvf14fiba43pb7fkdcs13mijqym4gay90"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-darwin-amd64.tar.gz"; - sha256 = "1nw8g4svrm2x26nxndfhk5rj0jjdjz02s6rgkvy364l517xfd84k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.0-darwin-amd64.tar.gz"; + sha256 = "0fnklssab01bl6i6khl1l7pbsswka7sa8cjnbkjclgbk4an6z4i2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-amd64.tar.gz"; @@ -191,20 +191,20 @@ sha256 = "1m52yb52cgz10vww4cfwqs6db2jy4i9zmfc1b1pq64bnlr1y8a5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz"; - sha256 = "16vkx1cnfzwyzsk7f9f794p6mg1ny8g5qxiy0825gd0prf8dzdm5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-darwin-amd64.tar.gz"; + sha256 = "13sii3q13rm56rp1bgpfc4w852h5zncx0cbs9j9hpb2ihayp28kf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-amd64.tar.gz"; sha256 = "0zib88z73ha81isxajkwjbigl2f51dj1d7zwvk2ic9qwvrimvb2m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-amd64.tar.gz"; - sha256 = "02czk2wwf03sswlqj4hrj83i2i53h4nclqrb3nlgzjgaal82ijv9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-darwin-amd64.tar.gz"; + sha256 = "19sp73a7kfa89y37zf31m6by6qi8jh7zbrvv3b49nrhs38yxy02z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-darwin-amd64.tar.gz"; - sha256 = "0rnj0nvqazsmvb3wwkgiwnpcimzv86df6bw8ln5h7rjiqpb23mvk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.0-darwin-amd64.tar.gz"; + sha256 = "0xv5225v5kpy68g6ff7qy7pvxhn8gih2jivlcf7xqnp8w2lpkg40"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-amd64.tar.gz"; @@ -231,32 +231,32 @@ sha256 = "0wf6vwa9dj7k18p3rmfmxw07vag5jqf5d9fdb467ijnvha463lan"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-darwin-amd64.tar.gz"; - sha256 = "03mkrnkqgqyy1d2mharbbd37kg98yd8jxl55rymcgdk12a515ayn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.2.0-darwin-amd64.tar.gz"; + sha256 = "032hbmgcw87x9dkzi6mq08gsnxs3hycf54mjs0gb2dqgvdzdch06"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-amd64.tar.gz"; sha256 = "162y9zyjwqzhh9ahph8vn9zmca8xc123hrybmhlhn6srj5sqjldh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-darwin-amd64.tar.gz"; - sha256 = "1f4wspm6h1a7qwy8wf0akbjvjj7di9a38my4ni9x4dw4hv87bmyq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.0-darwin-amd64.tar.gz"; + sha256 = "1isidas89q439fc0s214khq73rr4q2pgv8dcy5rdvznpsircbgpr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-darwin-amd64.tar.gz"; - sha256 = "0lkbzgp8kycnd2285zb90w6l0q5iigmjamxh4zrak86vrk4lnyz7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.2-darwin-amd64.tar.gz"; + sha256 = "0skgrgidd3ykdsr1rwblgv043p8c79spg9f3iq7dmsbsylrqi45b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-amd64.tar.gz"; sha256 = "0hjmvd26a0fpsbzkyhafmj92jjr26lz1yr93gn2idhnzn9vg2d95"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-darwin-amd64.tar.gz"; - sha256 = "03q47z5kprj6adsk7fshc7jclah6rwcw3jzlvkvy2hbr6li43364"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.1-darwin-amd64.tar.gz"; + sha256 = "1wk7braq3c0bi0fzbc9734avmvcr9m81g1v0i2w691xdgavfdl8h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-amd64.tar.gz"; @@ -279,20 +279,20 @@ sha256 = "0qc451qq772vfa5cfi06r2vpcmi69hahj8m2040sbx363wpz8rm5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-darwin-amd64.tar.gz"; - sha256 = "0jnbcq4649mn52qmq52h1sndad9jch07rh9b3ahjm8b6lakviq87"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-darwin-amd64.tar.gz"; + sha256 = "0azl4v8lrj62855lzjf9js7hgvirwsy9821vabwdfmd9pzl3x5bn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-darwin-amd64.tar.gz"; - sha256 = "0jbl5avzhqs4phnfrwp8n0lq1m4lmvlzvyhjpcsrx4nb33740rhz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-darwin-amd64.tar.gz"; + sha256 = "07xcvfp02q3l0snf1cdx1a6r2jbqfa0c5nv9pwmq8vk9fsnjdh54"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-amd64.tar.gz"; - sha256 = "0791x9j63kq8cbh2gmgsmbaim6067df3i164kiwpm4y1l38f8yf6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-darwin-amd64.tar.gz"; + sha256 = "1yyyrkqy492ny1g7r588lwlj2v59ry0l0gbr3pwa465a3achx06s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-darwin-amd64.tar.gz"; - sha256 = "0vbqwwqrx6s87m8ikngbhqwi207p6hs6ckapq9bivhjr2hl0vc8f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-darwin-amd64.tar.gz"; + sha256 = "19wla9irh7c9lfzfh97i15nz0p5m4fvr8cgzaz4q5rh39s6991kw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-amd64.tar.gz"; @@ -307,12 +307,12 @@ sha256 = "1ps4dywj60k5y8cri6g2vgrssaipmm9z8hp3mi9qnifr9vbwgd30"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-amd64.tar.gz"; - sha256 = "1wj5zz7gc9c8f1yk1aycb55v6pdpdkm97x4yq7ig3gy1j0zx90pg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-darwin-amd64.tar.gz"; + sha256 = "0gnv7qqirx2h8090pk3b50i801aivwrb767aj45zvqprkw1cb7ni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-amd64.tar.gz"; - sha256 = "0cxp9vabn3b5b50j46qx1m246k2w7f3cknkh8x308sbfg9lkgv98"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-darwin-amd64.tar.gz"; + sha256 = "0h1ay2zpq8yll6w1myk3pjg2vvkhscsiqsjh1gwq2vp3xvd3m9j8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,12 +321,12 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-linux-arm64.tar.gz"; - sha256 = "1fn37w2ad5bla6lpzvk2f8rbm9wcpfmf6nrdgbwm3lfyml0sijcq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.0-linux-arm64.tar.gz"; + sha256 = "1sxn8dazy00k4bdrkm4nry39vy37x83brvsc4vp43iwxzr871r69"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-arm64.tar.gz"; - sha256 = "1hzxmw420rzlka6wvr9b7gljyxdngbff4bcpdsaj6672isl2zy5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.0-linux-arm64.tar.gz"; + sha256 = "04v62zajw402d4x37y6056w84vy3flv0svh3ds0riq4h5rj6kzfx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-linux-arm64.tar.gz"; @@ -337,8 +337,8 @@ sha256 = "0xsyvl8x6qi21g71ys2d71fnhkmy8yxix12fvb21kk03b412rhcf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-linux-arm64.tar.gz"; - sha256 = "1wwmbg6zi5w6625pjmpbqvlw8kjj02vd1fxldl56hdwq8l0qlc71"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.0-linux-arm64.tar.gz"; + sha256 = "0lk4pdsic1sz9kjhyn3gx9avhjkxs8awqvwbgh0gq4634q9wgxjr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-arm64.tar.gz"; @@ -349,20 +349,20 @@ sha256 = "07qkkic0p6na4phg69sd3n919x4s5y35i0j15r93fww5r5y25ic2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz"; - sha256 = "0p16833m7igpz7b6p05clcf6qk5jj10iqrdm8wkdj7zv9q1v60hk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-linux-arm64.tar.gz"; + sha256 = "0ry0jqhisgg5cqyl3051fd32zm0dnpjhkbnyizfkb01m1clh185q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-arm64.tar.gz"; sha256 = "08hd9b9vbbcx15bpb7vlrsjkw9ak7sjarqlxv4sx1fzys682nwra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-arm64.tar.gz"; - sha256 = "0ciadynvqc0pkmy9w7zj65zbc7w6rbsnz5b6iaszlyqp9rzwahg2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-linux-arm64.tar.gz"; + sha256 = "0wkyy8zm38sh4mybyix4ncwn1qbv03szgc4iqw17qfc4xmi867bz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-linux-arm64.tar.gz"; - sha256 = "0pv5av9471mlgv18k9pz977awnrc86zfm86bb1hkgbsgnpzxnxjd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.0-linux-arm64.tar.gz"; + sha256 = "1hgnvnq5s2raqjhwyhp8d42nk9avbjik7g1pgxa7zik5l0aix24c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-arm64.tar.gz"; @@ -389,32 +389,32 @@ sha256 = "0gafajkj6zskxghjsbskyqlnyy70y7z22vkihn00h7lh0i71q97g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-linux-arm64.tar.gz"; - sha256 = "1wjpp49xwhz45xwim67hfgbifvxr29mghv7zvxss24lfyps3f9k4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.2.0-linux-arm64.tar.gz"; + sha256 = "0wp38q4bpn1qsd7ppkvz58cfvl20467csbx8f1xy1msw7y4dfphz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-arm64.tar.gz"; sha256 = "14jsk2s02idmfi8m832l62gx34g466zvw78z3g9pabnn4igr9ixz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-linux-arm64.tar.gz"; - sha256 = "1vrnss7x1bcvx5f4mirvhqvi15dw3w0bylbgpk7imsaazv6ylfyz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.0-linux-arm64.tar.gz"; + sha256 = "060bmnd8c2xzkhd8g4l4rc0dmzc3p168wzx67pfzymvac7knkynf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-linux-arm64.tar.gz"; - sha256 = "00ip2mi0hizfcvrmhq609ppghxpw50nihq0gaxl6lw9a7983ai97"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.2-linux-arm64.tar.gz"; + sha256 = "0fznaaas1a5849pizql7r2xw5jsagc1j97hg3i7cy6y8jrbvvp37"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-arm64.tar.gz"; sha256 = "04vxicmfwi72irkl5rp3jvj4qpxxz49z5fhgnfirhj5kksb6cggz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-linux-arm64.tar.gz"; - sha256 = "1xxg7d3rzp6gd56qd3zggyq6yjq460iipz9c28s3r34p4s1mr4sx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.1-linux-arm64.tar.gz"; + sha256 = "1zs0v7206hxs8h1vd5f9bzlk7vz0v91sgwdsj9jir1gwd1six0km"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-arm64.tar.gz"; @@ -437,20 +437,20 @@ sha256 = "0a1r87a9vp1sm4q7bxhgisrypyfi1p7hvh3c15yx22ylrmgwd83n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-linux-arm64.tar.gz"; - sha256 = "11racnb583bfsi3id7mqf8bjnwxl83a252y1lxbz3wy4bpqdzz4b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-linux-arm64.tar.gz"; + sha256 = "033jmnkp92bid7jiwy1jzn6l18qg5lncmsrpjdnwwxlqb2mr7ml6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-linux-arm64.tar.gz"; - sha256 = "11sf43q4djd1yk0cf7ypv5ypcjc62dibhb8g1p5dg2qcbdlkc551"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-linux-arm64.tar.gz"; + sha256 = "04f0ndwchrznq0a9vw7jvll46a69mkk2p9snlqlqsl29n89awdfm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-arm64.tar.gz"; - sha256 = "14hsny87inyvays04khhan9kg0a0kfi2x085yrqs6cy8pnshx29w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-linux-arm64.tar.gz"; + sha256 = "0lsbqgi5v4wpd0h9d73x9fx2xyrllvm1gfam3ks17pf2w1lkdd15"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-linux-arm64.tar.gz"; - sha256 = "1qbqqg8dhc3hs1rmf0gwzvys0izqbmfwhjr85qbydar5ydwapwx8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-linux-arm64.tar.gz"; + sha256 = "1v9bw8zxlzg6zsqncbl0kl4xqph41940s61lp1fnsksa9jylbs3d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-arm64.tar.gz"; @@ -465,12 +465,12 @@ sha256 = "11rcd6whkn8d21h1y37h15ih4wpdjmbyp2kf8x4150wq8s7cxgrc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-arm64.tar.gz"; - sha256 = "11yb5bv4ra9a28g4ns4pmzmf0ax280j6hxwh2p2nrkxxd3p8a6ai"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-linux-arm64.tar.gz"; + sha256 = "03kbh0807pmwkiz558sw704gv2grba51vdjy3i8wpn6viani9n7r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-arm64.tar.gz"; - sha256 = "1hfyy6fm2vr10qrbawr3c7jb4fd1k3a0y55iff4f2dkpm23gsg9s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-linux-arm64.tar.gz"; + sha256 = "0nj8k7x0kbsqd5mc83wsb3q0b0v91zsakpr49h6p7cjjwkcxmchi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,12 +479,12 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-darwin-arm64.tar.gz"; - sha256 = "1y8jm0vi1f0rjmj2vx345a64szx752nj80kn8nxsk4k48ywx0ggi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.0-darwin-arm64.tar.gz"; + sha256 = "1np5vqzjrb5namcbr69j3gry53gsvd6wz0l94wzy6mldhygrc9g5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-arm64.tar.gz"; - sha256 = "1jms955rhkw8babbbdkniic3qqc1g7jsddp322c5di2x4863qs2x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.0-darwin-arm64.tar.gz"; + sha256 = "1mxa1sdvb6dp7lk27jbi8alvnai9psg24vdxxc2cwbgqsml9fw9s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-darwin-arm64.tar.gz"; @@ -495,8 +495,8 @@ sha256 = "108qc3nm58sp43b39xzg1nz6vglpcyyjvqxy489pj42grk0w1lw4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-darwin-arm64.tar.gz"; - sha256 = "0sfwvz38202fxk6qvai7jnd3bq183cvhsh1kgw4a88anaqis640k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.0-darwin-arm64.tar.gz"; + sha256 = "1sk3bjw4g788gpqqzl3rqdf5i6r7pqj7bfq5kf9ksk03rvrgfsss"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-arm64.tar.gz"; @@ -507,20 +507,20 @@ sha256 = "13d33lvlhka2900acq7aksqnyvcyfhcb9cazj4dllrs71kj1smx3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz"; - sha256 = "13r7yzgj4lbsvsw9y1fxc5n6dhral0763ny8mahxhj3cl6mmxvi7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-darwin-arm64.tar.gz"; + sha256 = "1zbvcfplwrbxr0jmwrl8sqz31q5j05x5ss6v2j04zzjb3qmj0b94"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-arm64.tar.gz"; sha256 = "1f9zy9rl8vmnc40p6cvcz3d5wrf52y5a798ljp87kmjmra0mglg3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-arm64.tar.gz"; - sha256 = "1vs8xhy7iqfadfi2397jwfnz099pqyz5js4g4mx7kw1v47bsbvdq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-darwin-arm64.tar.gz"; + sha256 = "0fyzahxqgzmb9v0qvikdak38qhwsbzmv1mrrvd8s611a2f2xw2zp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-darwin-arm64.tar.gz"; - sha256 = "1b833d49z3h4cnf35qgill4rnixh6mfswk0g70qzv83jm9gvw9gz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.0-darwin-arm64.tar.gz"; + sha256 = "1xpv6mg0vbg6h91sg14qjn3ngl3l3dan2j31lqc5pmbhn16crs2z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-arm64.tar.gz"; @@ -547,32 +547,32 @@ sha256 = "1pm7vggaqsb8yrpk2swzpn6bm9jsqddf7cmx26sw0vd73shhmkd0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-darwin-arm64.tar.gz"; - sha256 = "1bgh5bym2f2l1s0pvvvs5fpf1qcvdvsnxf8d81346cfnk7qjw5jx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.2.0-darwin-arm64.tar.gz"; + sha256 = "109jpb4j34dm39wvwarggz832hs2zvnmbnakrql8rqgi5rwql2i7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-arm64.tar.gz"; sha256 = "0jmdqpajx5c1nnc01qwyjp8gil71wp3k2ddj7ac2vh4m75341ki9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-darwin-arm64.tar.gz"; - sha256 = "0r4j9mvzqv62b6cf40hh4w5mgpkqq82khsmjzij8djjcd86gn7i0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.0-darwin-arm64.tar.gz"; + sha256 = "0q53mglqhpnr5qc4hj21n3nh3kyjfbnqs5n8k5xkam1lfvpmmcw6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-darwin-arm64.tar.gz"; - sha256 = "19shjz66ybjkcij72bhknsnxgpg8acnv6vp1lkmxd39s5g87ajv0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.2-darwin-arm64.tar.gz"; + sha256 = "0jb0kixyv3cnkz1v1dhgn62qjy4pyvg2bl7hxirj1kxi7q3xdi78"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-arm64.tar.gz"; sha256 = "1gndidz869h2i6ig47a42nvqvzhsj8zzq9qlmb9z87gn2hxqfg69"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-darwin-arm64.tar.gz"; - sha256 = "194h7v4wrpmqk3494n75yn9y042ayg5xffghixqgq3h6pf1d2y9g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.1-darwin-arm64.tar.gz"; + sha256 = "1hn7hhylnjw80gkqnxxdy9addypspk2fdb6rnq7y9zzjyk3ykycc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-arm64.tar.gz"; @@ -595,20 +595,20 @@ sha256 = "0nsgv18wdkyjrr9wq6qdd07bcjy9jr5206ncz84xhar47iaw1m16"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-darwin-arm64.tar.gz"; - sha256 = "0p9lcg7wjjsgj8slg5vxd6jdjdwk36pdfdk87w450zm7k0ymfzq1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-darwin-arm64.tar.gz"; + sha256 = "1iidb02qq295xhwy48ya07xxdhhfb28ddppxvl88xxk03mfc03f4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-darwin-arm64.tar.gz"; - sha256 = "02fqsg8vvfl1xcb7s5waa9ysfl57i6307wzgwsw2y156jdbl2xkn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-darwin-arm64.tar.gz"; + sha256 = "1vhlfgsfd3h79w992r9i2pqxfra93q386wcg73x0xhbx4xsrfqf6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-arm64.tar.gz"; - sha256 = "0ij18wxlhy84hwjwh0h0yf0jl3zpky66a15v6y0gh9w9sn5ng47f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-darwin-arm64.tar.gz"; + sha256 = "0hfak60820z50xhw3kfdvm0shcwxi7y9xxp6iid5r1gk2a0vhaxk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-darwin-arm64.tar.gz"; - sha256 = "1vpbar4a93fn6kbms0nahqgj256x97cvn9kyv48v8hs4cxa7n0qr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-darwin-arm64.tar.gz"; + sha256 = "0zwv4v9kv9s3kfqhzvdfr9qjn5mw1yaswa2zjandr45pfyz50abg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-arm64.tar.gz"; @@ -623,12 +623,12 @@ sha256 = "103jidsyp9px082yg00cf57jps1iz96cjy7p9a5hrwvjf17m75mz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-arm64.tar.gz"; - sha256 = "1329dc2jqwqdxlfrx214jmxji01kzny3rj5hh137yipkvfkrfzkf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-darwin-arm64.tar.gz"; + sha256 = "0b4jl4sn0ymwb304czlp7rqw1dkmhjqf6fn2b4n3sk4l9frgzbyn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-arm64.tar.gz"; - sha256 = "160cif97xqh3va114kqwsz6666rspwwhk965c1k0ab4kxdhiwjdm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-darwin-arm64.tar.gz"; + sha256 = "0wr64m509ayhbh7877zj3i3dmry4bf1625cfzq7f35qip3yczarx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix index 25351db6fd..ec61e5aef2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { installPhase = '' install -D -t $out/bin/ * - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" '' + '' installShellCompletion --cmd pulumi \ @@ -23,7 +23,7 @@ in stdenv.mkDerivation { --zsh <($out/bin/pulumi completion zsh) ''; - nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook makeWrapper ]; buildInputs = [ stdenv.cc.cc.libgcc or null ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 9d715ea7ed..e79000e702 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -74,7 +74,7 @@ buildGoModule rec { rm codegen/{docs,dotnet,go,nodejs,python,schema}/*_test.go rm -R codegen/{dotnet,go,nodejs,python}/gen_program_test - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export PULUMI_HOME=$(mktemp -d) ''; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index e83ff967b9..7345f54a99 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.21.5"; + version = "1.21.6"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-Zv5hHDqjfpKiXYhM8CTXVJxqFE8dZ5mFDNnq6k0GWwM="; + hash = "sha256-VDHsSMVxdkCnJlNXbuoR1PS0W5YUuj+Yh4VLWREVG1k="; }; vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix index e1a10334f4..c54ce8bfe1 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o="; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= substituteInPlace vncviewer/vncviewer.cxx \ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "-Wno-error=array-bounds" ]; - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" # Build Xvnc @@ -84,11 +84,11 @@ stdenv.mkDerivation rec { --with-xkb-output=$out/share/X11/xkb/compiled make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES popd - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' make dmg ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' pushd unix/xserver/hw/vnc make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../../../.. install popd @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/vncserver \ --prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv 'TigerVNC Viewer ${version}.app' $out/Applications/ rm $out/bin/vncviewer @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { libjpeg_turbo pixman gawk - ] ++ lib.optionals stdenv.isLinux (with xorg; [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ nettle pam perl @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext - ] ++ lib.optionals stdenv.isLinux (with xorg; [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ fontutil libtool makeWrapper @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { zlib ] ++ xorg.xorgserver.nativeBuildInputs); - propagatedBuildInputs = lib.optional stdenv.isLinux xorg.xorgserver.propagatedBuildInputs; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg.xorgserver.propagatedBuildInputs; passthru.tests.tigervnc = nixosTests.tigervnc; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix index 547d302062..afa431ecd7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoVendorDir = "vendor"; doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Trinsic CLI"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index b6f4faad4d..125c2a6c4d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "trivy"; - version = "0.55.1"; + version = "0.55.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-NStDXhJ2nOaPxirD6qbLyqIZZFLp5vm5/u5tego7MyI="; + hash = "sha256-DwIklbBd2g/zVPwRqcl+GFfTUm3LHs/x37X5T+tX4aI="; }; # Hash mismatch on across Linux and Darwin @@ -30,7 +30,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/aquasecurity/trivy/pkg/version.ver=v${version}" + "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -58,13 +58,13 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = trivy; command = "trivy --version"; - version = "Version: v${version}"; + version = "Version: ${version}"; }; meta = with lib; { + description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; homepage = "https://github.com/aquasecurity/trivy"; changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; - description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; longDescription = '' Trivy is a simple and comprehensive vulnerability scanner for containers and other artifacts. A software vulnerability is a glitch, flaw, or diff --git a/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix b/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix index 6bf1d55e43..659ca72085 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ malte-v ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix index 74746fa5f1..8a0b1365ee 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix @@ -4,7 +4,7 @@ # Only used for Linux's x86/x86_64 , uasm -, useUasm ? (stdenv.isLinux && stdenv.hostPlatform.isx86) +, useUasm ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86) # RAR code is under non-free unRAR license # see the meta.license section below for more details @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { --replace windres.exe ${stdenv.cc.targetPrefix}windres ''; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-deprecated-copy-dtor" ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ "-Wno-conversion" @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { # We need at minimum 10.13 here because of utimensat, however since # we need a bump anyway, let's set the same minimum version as the one in # aarch64-darwin so we don't need additional changes for it - ++ lib.optionals stdenv.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ] # it's the compression code with the restriction, see DOC/License.txt ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "IS_MINGW=1" "MSYSTEM=1" ]; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix index 057efacdbe..24a1d01b64 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { ''; # A few tests fail on aarch64-linux - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = with lib; { description = "Tool to extract files from visual novel archives"; @@ -93,6 +93,6 @@ stdenv.mkDerivation { mainProgram = "arc_unpacker"; # unit test failures - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/arj/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/arj/default.nix index 6f365e226e..5ec946788d 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/arj/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/arj/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace environ.c \ --replace " #include " " #include " ''; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix index 04c0300944..ba178fb3eb 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - preConfigure = lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i gnu/fpending.h -e 's,include ,,' ''; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix index f025a0c578..6bbc31a6b1 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; passthru.tests.version = testers.testVersion { package = gbl; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix index 723c6b75ca..f9b5415b4f 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; # avoid retaining reference to CF during stdenv bootstrap - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "gt_cv_func_CFPreferencesCopyAppValue=no" "gt_cv_func_CFLocaleCopyCurrent=no" "gt_cv_func_CFLocaleCopyPreferredLanguages=no" @@ -27,26 +27,26 @@ stdenv.mkDerivation rec { # gnutar tries to call into gettext between `fork` and `exec`, # which is not safe on darwin. # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/system.c --replace '_(' 'N_(' ''; outputs = [ "out" "info" ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook - ++ lib.optional (!stdenv.isDarwin) updateAutotoolsGnuConfigScriptsHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook + ++ lib.optional (!stdenv.hostPlatform.isDarwin) updateAutotoolsGnuConfigScriptsHook; # Add libintl on Darwin specifically as it fails to link (or skip) # NLS on it's own: # "_libintl_textdomain", referenced from: # _main in tar.o # ld: symbol(s) not found for architecture x86_64 - buildInputs = lib.optional aclSupport acl ++ lib.optional stdenv.isDarwin libintl; + buildInputs = lib.optional aclSupport acl ++ lib.optional stdenv.hostPlatform.isDarwin libintl; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. - FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1"; + FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.isSunOS) "1"; - preConfigure = if stdenv.isCygwin then '' + preConfigure = if stdenv.hostPlatform.isCygwin then '' sed -i gnu/fpending.h -e 's,include ,,' '' else null; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix index 1219c48ab7..e2e3ddcdc3 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xz boost ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Python is reported as missing during the build, however # including Python does not change the output. diff --git a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix index 3ced84bed0..e77904e120 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' buildFlags=all3 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp makefile.macosx_llvm_64bits makefile.machine ''; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/pax/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/pax/default.nix index feacf73fe8..42668a4d1d 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/pax/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/pax/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p18nxijh323f4i1s2pg7pcr0557xljl5avv8ll5s9nfr34r5j0w"; }; - buildInputs = lib.optional stdenv.isDarwin utmp + buildInputs = lib.optional stdenv.hostPlatform.isDarwin utmp ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/rar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/rar/default.nix index cd78e11e80..fe378514ad 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/rar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/rar/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation { dontBuild = true; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix index 44a5d4d119..96090b88f6 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; postPatch = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' substituteInPlace "./XADMaster.xcodeproj/project.pbxproj" \ --replace "libstdc++.6.dylib" "libc++.1.dylib" '' else '' @@ -43,21 +43,21 @@ stdenv.mkDerivation rec { ''; buildInputs = [ bzip2 icu openssl wavpack zlib ] ++ - lib.optionals stdenv.isLinux [ gnustep.base ] ++ - lib.optionals stdenv.isDarwin [ Foundation AppKit ]; + lib.optionals stdenv.hostPlatform.isLinux [ gnustep.base ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; nativeBuildInputs = [ installShellFiles ] ++ - lib.optionals stdenv.isLinux [ gnustep.make ] ++ - lib.optionals stdenv.isDarwin [ xcbuildHook ]; + lib.optionals stdenv.hostPlatform.isLinux [ gnustep.make ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ]; - xcbuildFlags = lib.optionals stdenv.isDarwin [ + xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-target unar" "-target lsar" "-configuration Release" "MACOSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; - makefile = lib.optionalString (!stdenv.isDarwin) "Makefile.linux"; + makefile = lib.optionalString (!stdenv.hostPlatform.isDarwin) "Makefile.linux"; enableParallelBuilding = true; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin ${lib.optionalString stdenv.isDarwin "Products/Release/"}{lsar,unar} + install -Dm555 -t $out/bin ${lib.optionalString stdenv.hostPlatform.isDarwin "Products/Release/"}{lsar,unar} for f in lsar unar; do installManPage ./Extra/$f.? installShellCompletion --bash --name $f ./Extra/$f.bash_completion diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix index ae9a129c76..2b353598a3 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ] # `lchmod` is not available on Linux, so we remove it to fix "not supported" errors (when the zip file contains symlinks). # Alpine (musl) and Debian (glibc) also add this flag. - ++ lib.optionals stdenv.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; preConfigure = '' sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile diff --git a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix index 6aa2c95fa1..18013b3901 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "wimlib"; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ fuse3 ]; + buildInputs = [ ntfs3g ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ fuse3 ]; src = fetchurl { url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; @@ -22,20 +22,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = lib.optionalString (!stdenv.isDarwin) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace programs/mkwinpeimg.in \ --replace '/usr/lib/syslinux' "${syslinux}/share/syslinux" ''; postInstall = let - path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux fuse3 ]); + path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cdrkit syslinux fuse3 ]); in '' for prog in $out/bin/*; do wrapProgram $prog --prefix PATH : $out/bin:${path} done ''; - doCheck = (!stdenv.isDarwin); + doCheck = (!stdenv.hostPlatform.isDarwin); preCheck = '' patchShebangs tests diff --git a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix index c41a6010ef..a1604f7078 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = "https://github.com/ib/xarchiver"; maintainers = [ lib.maintainers.domenkozar ]; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix index a192b38785..2c225489a3 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; makefile = "unix/Makefile"; - buildFlags = if stdenv.isCygwin then [ "cygwin" ] else [ "generic" ]; + buildFlags = if stdenv.hostPlatform.isCygwin then [ "cygwin" ] else [ "generic" ]; installFlags = [ "prefix=${placeholder "out"}" "INSTALL=cp" @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { ./buffer-overflow-on-utf8-rh-bug-2165653.patch # Fixes forward declaration errors with timezone.c ./fix-time.h-not-included.patch - ] ++ lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; + ] ++ lib.optionals (enableNLS && !stdenv.hostPlatform.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; buildInputs = lib.optional enableNLS libnatspec - ++ lib.optional stdenv.isCygwin libiconv; + ++ lib.optional stdenv.hostPlatform.isCygwin libiconv; meta = with lib; { description = "Compressor/archiver for creating and modifying zipfiles"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix index 6a03b825e9..791c4fd14f 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl /* for pod2man */ ]; CPPFLAGS = [ "-Dunix" ] ++ - lib.optional (!stdenv.isi686 && !stdenv.isx86_64) "-DNOJIT"; + lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DNOJIT"; CXXFLAGS = [ "-O3" "-DNDEBUG" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index caa160cf17..85244c0e0b 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -1,8 +1,6 @@ { lib , callPackage , fetchFromGitHub -, fetchPypi -, fetchpatch , python3Packages }: /* diff --git a/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix b/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix index 78a2b80a0c..147ef1094e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix @@ -30,7 +30,7 @@ buildNpmPackage rec { nativeBuildInputs = [ python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix index 5b72423648..b1daf3aa13 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openblas icu - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix index 1da5620851..1dada2fcfc 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix index c2e93d592f..3ced3d5d13 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 manveru ]; - broken = stdenv.isDarwin; # fails due to old nokogiri https://github.com/sparklemotion/nokogiri/discussions/3152#discussioncomment-8806607 + broken = stdenv.hostPlatform.isDarwin; # fails due to old nokogiri https://github.com/sparklemotion/nokogiri/discussions/3152#discussioncomment-8806607 }; } # TODO: autoreconfHook this diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix index 859cc9dd6d..4628ad4910 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/signon.c \ --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace meson.build \ --replace "-Werror=format-truncation=0" "" \ --replace "-Wno-stringop-overflow" "" @@ -56,10 +56,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ # Needed with GCC 12 "-Wno-error=address" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-sometimes-uninitialized" "-Wno-tautological-pointer-compare" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-Wno-array-bounds" "-Wno-free-nonheap-object" "-Wno-stringop-truncation" diff --git a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix index c74919dbcb..931bcb3274 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -50,7 +50,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreML @@ -70,7 +70,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { --replace '${cudaOldStr}' '${cudaNewStr}' ''; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { WHISPER_COREML = "1"; WHISPER_COREML_ALLOW_FALLBACK = "1"; WHISPER_METAL_EMBED_LIBRARY = "1"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/awsbck/default.nix b/third_party/nixpkgs/pkgs/tools/backup/awsbck/default.nix index 8e00b8787c..756d7aa126 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/awsbck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/awsbck/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dMXaIFc0e6PMYiQrokQoUc1xAVCccE92WzM2fl7tOBQ="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # tests run in CI on the source repo doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix index 386775960a..d213368130 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # libtool.m4 only matches macOS 10.* - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace configure \ --replace "10.*)" "*)" ''; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { IOKit ] # acl relies on attr, which I can't get to build on darwin - ++ lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; configureFlags = [ "--with-sqlite3=${sqlite.dev}" diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index ab43dfbef0..e0c1481083 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -58,14 +58,14 @@ python.pkgs.buildPythonApplication rec { xxHash zstd openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl ]; dependencies = with python.pkgs; [ msgpack packaging - (if stdenv.isLinux then pyfuse3 else llfuse) + (if stdenv.hostPlatform.isLinux then pyfuse3 else llfuse) ]; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index 4fff9111bd..4aa4d64939 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -4,7 +4,6 @@ coreutils, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, fetchPypi, - fetchpatch, installShellFiles, lib, python3Packages, diff --git a/third_party/nixpkgs/pkgs/tools/backup/burp/default.nix b/third_party/nixpkgs/pkgs/tools/backup/burp/default.nix index 4684631efe..dad8fefced 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/burp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/burp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # use openssl_legacy due to burp-2.4.0 not supporting file encryption with openssl 3.0 # replace with 'openssl' once burp-3.x has been declared stable and this package upgraded buildInputs = [ librsync ncurses openssl_legacy zlib uthash ] - ++ lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; configureFlags = [ "--localstatedir=/var" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix b/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix index a3f4dc3f73..12250ee2b6 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix @@ -5,16 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "conserve"; - version = "23.11.0"; + version = "24.8.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "conserve"; rev = "v${version}"; - hash = "sha256-Ck2+3etwfZiDMZHzI2hIBuUKn7L0ZTGEe9yJjXjoRIM="; + hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos="; }; - cargoHash = "sha256-tMj1icGNTFpouts1TE6BIiABexV3vmOW9r5Y/7ynUMM="; + cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE="; + + checkFlags = [ + # expected to panic if unix user has no secondary group, + # which is the case in the nix sandbox + "--skip=test_fixtures::test::arbitrary_secondary_group_is_found" + "--skip=chgrp_reported_as_changed" + ]; meta = with lib; { description = "Robust portable backup tool in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix index 56a5a93139..d3424c4ac0 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -48,10 +48,10 @@ stdenv.mkDerivation rec { xz zlib zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ attr e2fsprogs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index da32f23233..9411c2e13e 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -39,7 +39,7 @@ let self = python3.pkgs.buildPythonApplication rec { # don't try to use gtar on darwin/bsd substituteInPlace testing/functional/test_restart.py \ --replace-fail 'tarcmd = "gtar"' 'tarcmd = "tar"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # tests try to access these files in the sandbox, but can't deal with EPERM substituteInPlace testing/unit/test_globmatch.py \ --replace-fail /var/log /test/log @@ -50,7 +50,7 @@ let self = python3.pkgs.buildPythonApplication rec { --replace-fail '"/tmp/' 'os.environ.get("TMPDIR")+"/' ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # uses /tmp/ "testing/unit/test_cli_main.py::CommandlineTest::test_intermixed_args" ]; @@ -91,9 +91,9 @@ let self = python3.pkgs.buildPythonApplication rec { gnutar # Add 'tar' to PATH. librsync # Add 'rdiff' to PATH. par2cmdline # Add 'par2' to PATH. - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux # Add 'setsid' to PATH. - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ] ++ (with python3.pkgs; [ lockfile @@ -111,7 +111,7 @@ let self = python3.pkgs.buildPythonApplication rec { gnupg ncftp rsync - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); in '' makeWrapperArgsBak=("''${makeWrapperArgs[@]}") diff --git a/third_party/nixpkgs/pkgs/tools/backup/httrack/qt.nix b/third_party/nixpkgs/pkgs/tools/backup/httrack/qt.nix index 061c8b2ad6..d178185229 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/httrack/qt.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/httrack/qt.nix @@ -29,7 +29,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; mainProgram = "httraqt"; homepage = "http://www.httrack.com"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index b95ada9574..307ca6251c 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -21,9 +21,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-FeD0+s79orFDUVsb205W0pdXgDI+p1UrH3GIfKwUqDQ="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration ]; checkFlags = [ "--skip=tests::cli" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix index af62fede40..fdda197f18 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ openssl libsodium xz ] - ++ (lib.optional stdenv.isDarwin Security); + ++ (lib.optional stdenv.hostPlatform.isDarwin Security); meta = with lib; { description = "Data deduplication with compression and public key encryption"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix b/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix index ad7fc761d8..83d205bb9b 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; - buildInputs = [ openssl zlib ] ++ lib.optional stdenv.isLinux e2fsprogs - ++ lib.optional stdenv.isDarwin bzip2; + buildInputs = [ openssl zlib ] ++ lib.optional stdenv.hostPlatform.isLinux e2fsprogs + ++ lib.optional stdenv.hostPlatform.isDarwin bzip2; meta = { description = "Online backups for the truly paranoid"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/wal-e/default.nix b/third_party/nixpkgs/pkgs/tools/backup/wal-e/default.nix deleted file mode 100644 index f1dda5da28..0000000000 --- a/third_party/nixpkgs/pkgs/tools/backup/wal-e/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, lzop, postgresql, pv }: - -python3Packages.buildPythonApplication rec { - pname = "wal-e"; - version = "1.1.1"; - - namePrefix = ""; - - src = fetchFromGitHub { - owner = "wal-e"; - repo = "wal-e"; - rev = "v${version}"; - hash = "sha256-I6suHkAYzDtlNFNPH4SziY93Ryp+NTHkCBuojDvv+U4="; - }; - - # needs tox - doCheck = false; - - propagatedBuildInputs = (with python3Packages; [ - boto - gevent - google-cloud-storage - ]) ++ [ - postgresql - lzop - pv - ]; - - meta = { - description = "Postgres WAL-shipping disaster recovery and replication toolkit"; - mainProgram = "wal-e"; - homepage = "https://github.com/wal-e/wal-e"; - maintainers = [ ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 572a73be3c..effde184d1 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcpcd, iproute2 , adwaita-icon-theme, librsvg, wrapGAppsHook3, gobject-introspection -, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: +, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio }: let pythonPackages = python3Packages; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix index 84cad2a5d9..b4e93adce8 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { libvorbis libmad libao - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices IOKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix index ae4a06bb57..7fd51d5d25 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib bzip2 perl ] ++ - lib.optionals stdenv.isLinux [ libcap ] ++ - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); + lib.optionals stdenv.hostPlatform.isLinux [ libcap ] ++ + lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libusal/scsi-mac-iokit.c \ --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h" substituteInPlace genisoimage/sha256.c \ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD" ''; - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in */CMakeFiles/*.dir/link.txt ; do substituteInPlace "$f" \ --replace "-lrt" "-framework IOKit" diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix index 053aebecaf..d264a0f8bd 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 ]; - buildInputs = if stdenv.isDarwin then [ Carbon IOKit ] else [ acl libcap ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ Carbon IOKit ] else [ acl libcap ]; postPatch = '' sed "/\.mk3/d" -i libschily/Targets.man diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix index a6b75e14be..5b0287efed 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 ]; buildInputs = [ cdrtools ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; makeFlags = [ "prefix=${placeholder "out"}" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "CXX=${stdenv.cc.targetPrefix}c++" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ # error: invalid suffix on literal; C++11 requires a space between literal and identifier "-Wno-reserved-user-defined-literal" # error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'IOByteCount' (aka 'unsigned int') in initializer list diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip3/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip3/default.nix index 92ddefdb86..889f64b52d 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/bzip3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/bzip3/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-arch-native" - ] ++ lib.optionals stdenv.isDarwin [ "--disable-link-time-optimization" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-link-time-optimization" ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix index 0553905086..8b10fa1c98 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix @@ -2,7 +2,6 @@ , fetchurl , makeWrapper , updateAutotoolsGnuConfigScriptsHook -, xz , runtimeShellPackage }: diff --git a/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix b/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix index 89515e31b4..9d5cc34b38 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { cp ./ImageLOL $out/bin ''; - cmakeFlags = [ (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90") ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DPNG_ARM_NEON=off"; + cmakeFlags = [ (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90") ] ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-DPNG_ARM_NEON=off"; meta = with lib; { homepage = "https://github.com/MCredstoner2004/ImageLOL"; diff --git a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix index f485bab4a7..eab035f062 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Mb324ojtLV0S10KhL7Vjf3DhSOtCy1pFMTzvLkTnpXM="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Building the ASM/x86 directory creates an empty archive, # which fails on darwin, so remove it # https://github.com/ckolivas/lrzip/issues/193 diff --git a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix index 106b14b81b..a6eaab1a6e 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkTarget = "tests"; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index ba5fb90c13..f9d3a3d074 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optional stdenv.hostPlatform.isUnix bash; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { substituteInPlace build/cmake/tests/CMakeLists.txt \ --replace 'libzstd_static' 'libzstd_shared' sed -i \ - "1aexport ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ + "1aexport ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ tests/playTests.sh ''; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString buildContrib ( '' cp contrib/pzstd/pzstd $bin/bin/pzstd - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd '' ); diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix index af4e20ac55..c56a4b189e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # # $ tar xf "$(nix-build -A aefs.src)" # $ grep -R FUSE_USE_VERSION - configureFlags = lib.optional stdenv.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; nativeBuildInputs = [ autoreconfHook git ]; @@ -37,6 +37,6 @@ stdenv.mkDerivation { maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix index b5fe1a4e85..78d60b90b3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake readline pkg-config wrapQtAppsHook ]; buildInputs = [ fuse qtbase qttools ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/*.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix index 5881d361c5..88b2c5d3e6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "/usr/local/lib/libosxfuse.dylib" "fuse" ''; @@ -20,14 +20,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - (if stdenv.isDarwin then fuse else fuse3) + (if stdenv.hostPlatform.isDarwin then fuse else fuse3) bzip2 zlib - ] ++ lib.optional stdenv.isLinux attr; + ] ++ lib.optional stdenv.hostPlatform.isLinux attr; - cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FUSE3=OFF"; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FUSE3=OFF"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DUSE_FUSE2"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DUSE_FUSE2"; postFixup = '' ln -s $out/bin/apfs-fuse $out/bin/mount.fuse.apfs-fuse diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index a8013bd860..f086e9416a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = if stdenv.isDarwin then [ fuse ] else [ fuse3 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ fuse ] else [ fuse3 ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-macos-fs-link"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-macos-fs-link"; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix index 04106ee68b..b12966541c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { buildFlags = [ "static" "CC=${stdenv.cc.targetPrefix}cc" - ] ++ lib.optional stdenv.isDarwin "CFLAGS=-D_BSD_SOURCE"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-D_BSD_SOURCE"; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index e4f0bae9b2..e5beaf3841 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -382,7 +382,7 @@ in rec { utf8proc zlib zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ keyutils libcap_ng liburing @@ -457,7 +457,7 @@ in rec { "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' - ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON"; preBuild = # The legacy-option-headers target is not correctly empbedded in the build graph. diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 8583cce73d..4da68dfb75 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ] @@ -107,7 +107,7 @@ buildPythonPackage rec { # save compute time by not running benchmarks "tests/bench" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # aarch64-darwin forbids W+X memory, but this tests depends on it: # * https://cffi.readthedocs.io/en/latest/using.html#callbacks "tests/hazmat/backends/test_openssl_memleak.py" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index 588dcb320a..52444e56cb 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; # ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; # macFUSE needs to be installed for the test to succeed on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix index 7b3760ba5a..06a86a74b5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl glib zlib ]; - CFLAGS = lib.optionalString stdenv.isDarwin "-D__off_t=off_t"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D__off_t=off_t"; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed. Needs autoreconfHook for # this change to effect substituteInPlace configure.ac --replace \ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix index eda54d341f..0305e65146 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # configure.ac:75: error: required file './config.rpath' not found # https://github.com/dosfstools/dosfstools/blob/master/autogen.sh diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix index 719ccd1e23..50c2121997 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, stdenv, - substituteAll, bison, boost, cmake, diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index b8443e8ac8..4d0849b896 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo -, withFuse ? stdenv.isLinux, fuse3 +, withFuse ? stdenv.hostPlatform.isLinux, fuse3 , shared ? !stdenv.hostPlatform.isStatic , e2fsprogs, runCommand }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; configureFlags = - if stdenv.isLinux then [ + if stdenv.hostPlatform.isLinux then [ # It seems that the e2fsprogs is one of the few packages that cannot be # build with shared and static libs. (if shared then "--enable-elf-shlibs" else "--disable-elf-shlibs") diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix index 3946523ccb..93e6fd18f9 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix @@ -10,7 +10,7 @@ xz, zlib, libselinux, - fuseSupport ? stdenv.isLinux, + fuseSupport ? stdenv.hostPlatform.isLinux, selinuxSupport ? false, lzmaSupport ? false, }: diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix index ebdedd5b4a..04430fc23e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { done ''; - buildInputs = lib.optionals stdenv.isLinux [ systemd parted ] - ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd parted ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; buildFlags = [ "all" # f3read, f3write ] - ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe + ++ lib.optional stdenv.hostPlatform.isLinux "extra"; # f3brew, f3fix, f3probe installFlags = [ "PREFIX=${placeholder "out"}" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] - ++ lib.optional stdenv.isLinux "install-extra"; + ++ lib.optional stdenv.hostPlatform.isLinux "install-extra"; postInstall = '' install -Dm555 -t $out/bin f3write.h2w log-f3wr diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix index 8bc7a899cd..e2e1eccae2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage { --replace "#!${perl}/bin/perl" "#!${perl}/bin/perl -I $out/${perl.libPrefix}" ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Perl extension for renaming multiple files"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix index 962685c2d5..34f9da67ae 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix @@ -11,7 +11,7 @@ , nixosTests }: let - generic = { version, sha256, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage { + generic = { version, hash, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; inherit version; @@ -20,7 +20,7 @@ let owner = "Deuxfleurs"; repo = "garage"; rev = "v${version}"; - inherit sha256; + inherit hash; }; postPatch = '' @@ -35,7 +35,7 @@ let buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; checkInputs = [ cacert @@ -96,33 +96,32 @@ rec { garage_0_8_7 = generic { version = "0.8.7"; - sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; + hash = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; cargoHash = "sha256-1cGlJP/RRgxt3GGMN1c+7Y5lLHJyvHEnpLsR35R5FfI="; cargoPatches = [ ./update-time-0.8.patch ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; + }; + + garage_0_9_4 = generic { + version = "0.9.4"; + hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; + cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4="; + cargoPatches = [ ./update-time.patch ]; + broken = stdenv.hostPlatform.isDarwin; + }; + + garage_1_0_1 = generic { + version = "1.0.1"; + hash = "sha256-f6N2asycN04I6U5XQ5LEAqYu/v5jYZiFCxZ8YQ32XyM="; + cargoHash = "sha256-jpc/vaygC5WNSkVA3P01mCRk9Nx/CUumE893tHWoe34="; + broken = stdenv.hostPlatform.isDarwin; }; garage_0_8 = garage_0_8_7; - garage_0_9_4 = generic { - version = "0.9.4"; - sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; - cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4="; - cargoPatches = [ ./update-time.patch ]; - broken = stdenv.isDarwin; - }; - - garage_1_0_0 = generic { - version = "1.0.0"; - sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8="; - cargoHash = "sha256-zol9P01bwlvl1Wap4EekgVpC45izNCt2uKs7x+EEA/E="; - cargoPatches = [ ./update-time.patch ]; - broken = stdenv.isDarwin; - }; - garage_0_9 = garage_0_9_4; - garage_1_x = garage_1_0_0; + garage_1_x = garage_1_0_1; garage = garage_1_x; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/genimage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/genimage/default.nix index 8de22d3efc..3e6ae58049 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/genimage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/genimage/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://git.pengutronix.de/cgit/genimage"; description = "Generate filesystem images from directory trees"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix index 4a1341dce7..2665505357 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { homepage = "https://github.com/hanwen/go-mtpfs"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "go-mtpfs"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix index c8840e0fd3..06039d529d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix @@ -30,7 +30,7 @@ buildGoModule { description = "High-performance, POSIX-ish Amazon S3 file system written in Go"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 + broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 mainProgram = "goofys"; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index 4f5524d673..5106654474 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -28,15 +28,15 @@ stdenv.mkDerivation rec { strictDeps = true; - buildFlags = lib.optionals stdenv.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ]; + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ]; # Fix the build on macOS with macFUSE installed - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace \ "/usr/local/lib/pkgconfig" "/nonexistent" ''; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.h --replace \ "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" \ "#undef HAVE_STRUCT_STAT_ST_BIRTHTIME" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix index ef5eafc405..3e2c75aeb0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { hash = "sha256-N9xN8CJTPD1LLsHHiXPCfH6LWFN0wtRqtkxqPbMe3bg="; }; - patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./UNUSED-darwin.patch; # fails to find X on darwin - configureFlags = lib.optional stdenv.isDarwin "--without-x"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--without-x"; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix index d84f9cc9b9..a0ca5e5a82 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3; maintainers = [ maintainers.qknight ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin mainProgram = "mtpfs"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix index 56d6bdc7fb..5a9426cee4 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ macfuse-stubs DiskArbitration ]; # Note: libgcrypt is listed here non-optionally because its m4 macros are # being used in ntfs-3g's configure.ac. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--enable-extras" "--with-mount-helper=${mount}/bin/mount" "--with-umount-helper=${mount}/bin/umount" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-modprobe-helper=${kmod}/bin/modprobe" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix index 83353394e0..e964f944d3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { VERSION = version; - doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); nativeBuildInputs = [ autoreconfHook @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; # SMART is only supported on Linux and requires the smartmontools package - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/snapraid \ --prefix PATH : ${lib.makeBinPath [ smartmontools ]} ''; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix index 932c7693dc..3654c77cc4 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix @@ -8,7 +8,7 @@ }: let - fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; + fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3; in stdenv.mkDerivation rec { pname = "sshfs-fuse"; inherit version; @@ -33,12 +33,12 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin" ''; # doCheck = true; - checkPhase = lib.optionalString (!stdenv.isDarwin) '' + checkPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The tests need fusermount: mkdir bin cp ${fuse}/bin/fusermount3 bin/fusermount diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix index 2f11bb0047..bc836ac3ab 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchpatch }: let mkSSHFS = args: callPackage (import ./common.nix args) { }; -in if stdenv.isDarwin then +in if stdenv.hostPlatform.isDarwin then mkSSHFS { version = "2.10"; # macFUSE isn't yet compatible with libfuse 3.x sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix index 8aa66de8da..2f0e32799d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # # $ tar xf "$(nix-build -A svnfs.src)" # $ grep -R FUSE_USE_VERSION - configureFlags = lib.optionals stdenv.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; # why is this required? preConfigure='' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix index 30ab2663a6..a4173de6cb 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-bgYF1CY5LVZz9dVFjLSMqb8k+kU6AuGRgPbCZ8uI3KA="; + sha256 = "sha256-ObNBeHmQ4VqnZdUbKxLxuXeRw2jVPQxroO2HK4Wp8tg="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix index 4dc9ca9de6..2518cfb24b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./prevent-kill-on-shutdown.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse' ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # # This must be done in preConfigure because the build process removes # helper from the source directory during the build. - preConfigure = lib.optionalString (!stdenv.isDarwin) '' + preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix index 3f8897c091..9c1b68cc63 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [fuse glib neon]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed. Needs autoreconfHook to # take effect. substituteInPlace configure.ac --replace \ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix index ad3c44faf6..6e7a19ad8e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: let - p = if stdenv.is64bit then { + p = if stdenv.hostPlatform.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; sha256 = "sha256-HH/pLZmDr6m/B3e6MHafDGnNWR83oR2y1ijVMR/LOF0="; diff --git a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix index 7416d4f717..5ed670a77d 100644 --- a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix @@ -92,7 +92,7 @@ in rustPlatform.buildRustPackage rec { homepage = "https://github.com/casperstorm/ajour"; changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md"; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix b/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix index e4d7736843..6ea5f168a8 100644 --- a/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' mkdir -p $out/Applications cp -R Source/PokeFinder.app $out/Applications - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -D Source/PokeFinder $out/bin/PokeFinder mkdir -p $out/share/pixmaps convert "$src/Source/Form/Images/pokefinder.ico[-1]" $out/share/pixmaps/pokefinder.png @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ cmake wrapQtAppsHook python3 ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems imagemagick ]; + nativeBuildInputs = [ cmake wrapQtAppsHook python3 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems imagemagick ]; desktopItems = [ (makeDesktopItem { @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ qtbase qttools ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/third_party/nixpkgs/pkgs/tools/games/ukmm/default.nix b/third_party/nixpkgs/pkgs/tools/games/ukmm/default.nix index 98709602dc..9a640b004b 100644 --- a/third_party/nixpkgs/pkgs/tools/games/ukmm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/ukmm/default.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "ukmm"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix index 0d86e5c75b..12ff88d134 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix index a67fdc1d39..31758877c4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = with maintainers; [ dasisdormax ]; - broken = !stdenv.is64bit; + broken = !stdenv.hostPlatform.is64bit; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 55fce30cd9..ba0dd70254 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { boehmgc ncurses readline gsl libsigsegv zlib perl curl qtbase qtsvg boost (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) - ] ++ lib.optionals stdenv.isLinux [ libtirpc ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]; propagatedBuildInputs = [ glm - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libglut libGLU libGL - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]); @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { # do not use bundled libgc.so configureFlags = [ "--enable-gc=system" ] # TODO add open_memstream to enable XDR/V3D on Darwin (requires memstream or >=10.13 Apple SDK) - ++ lib.optional stdenv.isDarwin "--enable-xdr=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-xdr=no"; env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix index 9eb368b83a..6199a87925 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = lib.optional stdenv.isDarwin "ac_cv_func_calloc_0_nonnull=yes"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "ac_cv_func_calloc_0_nonnull=yes"; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix index 35657cf8fc..9e35c1bfdc 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; - nativeBuildInputs = lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; buildInputs = [ libjpeg lcms2 gettext ]; # Jasper is disabled because the library is abandoned and has many diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix index f03f38742e..4c5883d568 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdmtx imagemagick ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; meta = { description = "Data matrix command-line utilities"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/esshader/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/esshader/default.nix index 38bd4d1b7f..b425ce5721 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/esshader/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/esshader/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ astro ]; platforms = lib.platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "esshader"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix index 6503a2887a..423d8d8d92 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix @@ -30,7 +30,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; buildInputs = [ gnuplot perl ] ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); @@ -45,7 +45,7 @@ perlPackages.buildPerlPackage rec { # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. doCheck = false; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/feedgnuplot '' + '' wrapProgram $out/bin/feedgnuplot \ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix index 97e566b561..c43059c03a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix @@ -17,7 +17,7 @@ assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let - withX = libX11 != null && !aquaterm && !stdenv.isDarwin; + withX = libX11 != null && !aquaterm && !stdenv.hostPlatform.isDarwin; in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; @@ -38,7 +38,7 @@ in ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withQt [ qtbase qtsvg ] ++ lib.optional withWxGTK wxGTK32 - ++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa; + ++ lib.optional (withWxGTK && stdenv.hostPlatform.isDarwin) Cocoa; postPatch = '' # lrelease is in qttools, not in qtbase. @@ -51,7 +51,7 @@ in (if aquaterm then "--with-aquaterm" else "--without-aquaterm") ] ++ lib.optional withCaca "--with-caca"; - CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; + CXXFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin && withQt) "-std=c++11"; # we'll wrap things ourselves dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix index 5cb3c24bc1..e27c35fd72 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { pango bash ] ++ optionals withXorg (with xorg; [ libXrender libXaw libXpm ]) - ++ optionals stdenv.isDarwin [ ApplicationServices Foundation ]; + ++ optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; hardeningDisable = [ "fortify" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - CPPFLAGS = optionalString (withXorg && stdenv.isDarwin) + CPPFLAGS = optionalString (withXorg && stdenv.hostPlatform.isDarwin) "-I${cairo.dev}/include/cairo"; doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs diff --git a/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix index 0e22fe72c5..8c50ffdce6 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin # upgrades to a newer SDK. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; postPatch = '' patchShebangs extresso/extresso diff --git a/third_party/nixpkgs/pkgs/tools/graphics/lepton/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/lepton/default.nix index 27fcca3cac..980f729e97 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/lepton/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/lepton/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git ]; - buildInputs = lib.optionals stdenv.isLinux [ glibc.static ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; meta = with lib; { homepage = "https://github.com/dropbox/lepton"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix index 02cb25d251..3ac1ede77e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}" - (lib.mesonEnable "libdrm" (stdenv.isLinux)) + "-Degl=${if stdenv.hostPlatform.isDarwin then "disabled" else "auto"}" + (lib.mesonEnable "libdrm" (stdenv.hostPlatform.isLinux)) (lib.mesonEnable "osmesa" false) (lib.mesonEnable "wayland" (lib.meta.availableOn stdenv.hostPlatform wayland)) ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index bbd24d056b..8426fbcc20 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Fix path to rgb.txt echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk echo "NETPBMLIBSUFFIX = dylib" >> config.mk diff --git a/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix index 3d9d89af0c..4022c363ef 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; }) - ] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); + ] ++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch); buildInputs = [ qtbase qttools libGLU ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index e127e2a3aa..d0715d8f1a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LZ3YIosDpjDYVACWQsr/0XhgX4fyo8CyZG58WfLSzCs="; - doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; meta = { homepage = "https://github.com/shssoichiro/oxipng"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 7d595c5e4c..b164799e9c 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { buildInputs = [ openexr zlib imagemagick6 fftwFloat fftw gsl libexif perl qtbase netpbm - ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ + ] ++ (if stdenv.hostPlatform.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ libGLU libGL libglut diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix index 4172404393..03d25acd29 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix @@ -14,7 +14,7 @@ let }; platform = platforms."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - download = if stdenv.isDarwin + download = if stdenv.hostPlatform.isDarwin then { extension = "macos.zip"; hash = "sha256-MnL6lH7q/BrACG4fFJNfnvoh0JClVeaJIlX+XIj2aG4="; } else { extension = "linux.tar.gz"; hash = "sha256-rDi7pvDeKQM96GZTjDr6ZDQTGbaVu+OI77xf2egw6Sg="; }; in @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-${download.extension}"; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ unzip ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; # pngout is code-signed on Darwin, so don’t alter the binary to avoid breaking the signature. - dontFixup = stdenv.isDarwin; + dontFixup = stdenv.hostPlatform.isDarwin; installPhase = '' mkdir -p $out/bin cp ${platform.folder}/pngout $out/bin - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/${platform.ld-linux} $out/bin/pngout ''; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix index 810c2365b2..c9e8512b77 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv ApplicationServices ]); diff --git a/third_party/nixpkgs/pkgs/tools/graphics/quirc/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/quirc/default.nix index b2d1e79515..43144ce037 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/quirc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/quirc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/dlbeer/quirc/commit/257c6c94d99960819ecabf72199e5822f60a3bc5.patch?full_index=1"; hash = "sha256-WLQK7vy34VmgJzppTnRjAcZoSGWVaXQSaGq9An8W0rw="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable building of linux-only demos on darwin systems ./0001-Don-t-build-demos.patch ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # don't install static library rm $out/lib/libquirc.a - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Set absolute install name to avoid the need for DYLD_LIBRARY_PATH dylib=$out/lib/libquirc.${finalAttrs.version}.dylib ${stdenv.cc.targetPrefix}install_name_tool -id "$dylib" "$dylib" diff --git a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index 59c2753011..450e36e6d3 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp -r ${models}/models $out/share ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/realesrgan-ncnn-vulkan --add-needed libvulkan.so ''; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/sng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/sng/default.nix deleted file mode 100644 index a8db32128a..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/sng/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, libpng, netpbm }: - -stdenv.mkDerivation rec { - pname = "sng"; - version = "1.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/sng/sng-${version}.tar.gz"; - sha256 = "06a6ydvx9xb3vxvrzdrg3hq0rjwwj9ibr7fyyxjxq6qx1j3mb70i"; - }; - - buildInputs = [ libpng ]; - - configureFlags = [ - "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt" - ]; - - meta = with lib; { - description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; - homepage = "https://sng.sourceforge.net/"; - license = licenses.zlib; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.unix; - mainProgram = "sng"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix index 7122450587..cd7d437c4d 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; # tests fail for unknown reasons on aarch64-darwin - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); meta = with lib; { description = "Example-based texture synthesis written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 129b33427b..c8f41167f8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; version = "8.15.3"; - outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; + outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ninja docbook-xsl-nons gobject-introspection - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk-doc ]; @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { cgif libarchive libhwy - ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; # Required by .pc file propagatedBuildInputs = [ @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dpdfium=disabled" "-Dnifti=disabled" ] - ++ lib.optional (!stdenv.isDarwin) "-Dgtk_doc=true" + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-Dgtk_doc=true" ++ lib.optional (imagemagick == null) "-Dmagick=disabled" ; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 0c60a11db8..da52cb1b6e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pedrohlc ]; changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}"; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index 759841d02e..c21ece5294 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { vulkan-headers vulkan-loader vulkan-volk - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libffi libX11 libXau @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { wayland wayland-protocols wayland-scanner - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moltenvk moltenvk.dev AppKit @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DGLSLANG_INSTALL_DIR=${glslang}" # Hide dev warnings that are useless for packaging "-Wno-dev" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d" # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs. "-DBUILD_CUBE=OFF" diff --git a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index dd2c15c8fd..cf150a59c8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { buildInputs = [ opencv4 ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional stdenv.isDarwin OpenCL - ++ lib.optionals stdenv.isLinux [ ocl-icd opencl-headers ]; + ++ lib.optional stdenv.hostPlatform.isDarwin OpenCL + ++ lib.optionals stdenv.hostPlatform.isLinux [ ocl-icd opencl-headers ]; nativeBuildInputs = [ cmake makeWrapper ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix index 236cf3f7a7..51d4c018e4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin QuartzCore; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin QuartzCore; # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix index 5d5396aea2..6419752cac 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, xorg }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + libpng, + xorg, +}: stdenv.mkDerivation rec { pname = "xcur2png"; @@ -11,6 +19,17 @@ stdenv.mkDerivation rec { sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya"; }; + patches = [ + # https://github.com/eworm-de/xcur2png/pull/3 + ./malloc.diff + + # fix byte overflows due to off-by-one error + (fetchpatch { + url = "https://github.com/eworm-de/xcur2png/commit/aa035462d950fab35d322cb87fd2f0d702251e82.patch"; + hash = "sha256-hlmJ/bcDSl1ADs0jp+JrAgAaMzielUSRVPad+plnSZg="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/malloc.diff b/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/malloc.diff new file mode 100644 index 0000000000..88f4e8e17b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/malloc.diff @@ -0,0 +1,33 @@ +--- a/xcur2png.c ++++ b/xcur2png.c +@@ -16,7 +16,10 @@ + /* Todo: atoi error handling */ + /* help is -h in manual */ + ++#if HAVE_CONFIG_H + #include ++#endif ++#undef malloc + + #define _ATFILE_SOURCE + #include +@@ -34,6 +37,19 @@ + #include + #include + ++ ++void *malloc (); ++ ++/* Allocate an N-byte block of memory from the heap. ++ If N is zero, allocate a 1-byte block. */ ++ ++void* rpl_malloc (size_t n) ++{ ++ if (n == 0) ++ n = 1; ++ return malloc (n); ++} ++ + #define PNG_SETJMP_NOT_SUPPORTED 1 + + #define PROGRESS_SHARPS 50 /* total number of progress sharps */ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix index c3429069d2..951e6b26bf 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix @@ -16,7 +16,7 @@ , docbook_xsl , autoreconfHook , dbus -, enableVideo ? stdenv.isLinux +, enableVideo ? stdenv.hostPlatform.isLinux # The implementation is buggy and produces an error like # Name Error (Connection ":1.4380" is not allowed to own the service "org.linuxtv.Zbar" due to security policies in the configuration file) # for every scanned code. @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig libintl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ] ++ lib.optionals enableDbus [ @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { python3 ]; - checkInputs = lib.optionals stdenv.isDarwin [ + checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="$NIX_LDFLAGS -largp" ''; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index cb0a8f7c7e..f761ffbce2 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.15"; + version = "2.25.16"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-fSB/CnxzqCK63gBpHB3rkUCE492W3jmb4hfQXuJchiQ="; + hash = "sha256-DewkWiPWPcF/8GDdqKMf99UxSXOeZhGsAywYJZAxxKA="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix b/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix index 011f186bbb..eef5fe0df3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { "cp ${writeText "config.def.h" conf} config.def.h"; installFlags = [ "install-completion" ]; - CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; patches = [ # https://github.com/martanne/abduco/pull/22 diff --git a/third_party/nixpkgs/pkgs/tools/misc/aescrypt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aescrypt/default.nix index 67739f5751..2517724c8c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/aescrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/aescrypt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-4uGS0LReq5dI7+Wel7ZWzFXx+utZWi93q4TUSw7AhNI="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; preBuild = '' substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc" diff --git a/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix index 6aed087809..bea3026ea6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/tools/misc/aoc-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aoc-cli/default.nix index 4fec5647e0..693f87389e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/aoc-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/aoc-cli/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; cargoHash = "sha256-EluP4N3UBQeEKVdHTs4O0THXji+nAyE52nGKsxA3AA4="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix b/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix index 0849977658..8e31710ff3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix index e933edf364..7afbce58c1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - sourceRoot = if stdenv.isDarwin then "." else null; + sourceRoot = if stdenv.hostPlatform.isDarwin then "." else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema-agg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asciinema-agg/default.nix index 238a5c8af0..e7f7334de3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/asciinema-agg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/asciinema-agg/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/backdown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/backdown/default.nix index f75388ea86..78ad5be3f3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/backdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/backdown/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "backdown"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Canop"; repo = "backdown"; rev = "v${version}"; - hash = "sha256-w9EdDSGqmHRLXwx5qFo0BngKATKtQsieMt6dPgfOrQ0="; + hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM="; }; - cargoHash = "sha256-BOwhXq/xVuk3KylL3KeIkiIG3SXVASFiYkUgKJhMzuU="; + cargoHash = "sha256-+SxXOpSBuVVdX2HmJ4vF45uf5bvRtPdwaXUb9kq+lK0="; meta = with lib; { description = "File deduplicator"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix index 20bdb11d01..7e1eea61d0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { # Assertion error "test_help_output" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FsOperationFailed "test_get_file_mode" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix index 1c3a805367..0891499b22 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix @@ -55,7 +55,7 @@ let # Run the library tests as they don't have external dependencies doCheck = true; - nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); checkPhase = '' runHook preCheck # test list repeats suites. Unique them @@ -112,7 +112,7 @@ let dontBuild = true; # we've already built doCheck = true; - nativeCheckInputs = [ bat bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bat bash fish zsh ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); checkPhase = '' runHook preCheck bash ./test.sh --compiled --suite ${name} @@ -144,7 +144,7 @@ in { batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); batgrep = script "batgrep" [ less coreutils ripgrep ]; - batman = script "batman" (lib.optionals stdenv.isLinux [ util-linux ]); + batman = script "batman" (lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]); batpipe = script "batpipe" [ less ]; batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); prettybat = script "prettybat" ([] diff --git a/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix index ea5360549b..c6dd28777b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-bgKK7x6Kaz5azvCYWEp7tocI81z+dAEbNBwR/qXktcM="; }; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace lib/Makefile.dynamic \ --replace '-Wl,-soname,$(SONAME)' "" ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH=`pwd`/lib ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bmon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bmon/default.nix index 237eb7476d..a123a3380f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bmon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bmon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; + buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.hostPlatform.isLinux libnl; preConfigure = '' # Must be an absolute path diff --git a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix index b2596746f7..845ccf532b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ dit7ya figsoda ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "boxxy"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix b/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix index f2de104c58..745f39b436 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez , tcl, acl, kmod, coreutils, shadow, util-linux -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index 9097f4e335..17c28c8f3b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -13,8 +13,8 @@ , xorg , zlib , buildPackages -, withClipboard ? !stdenv.isDarwin -, withTrash ? !stdenv.isDarwin +, withClipboard ? !stdenv.hostPlatform.isDarwin +, withTrash ? !stdenv.hostPlatform.isDarwin }: rustPlatform.buildRustPackage rec { @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation libiconv Security diff --git a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix index 08ff99cbb5..a6a376abd9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.14.3"; + version = "1.14.4"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-uYQO+PSvBJN1GYtycpVi1h9bD8RNoVC+R+WKJy+qDMc="; + sha256 = "sha256-jrLlhpPWsc1aOEH36W6MbikAj1nAX8CinHKG+iRk+18="; }; nativeBuildInputs = [ autoconf @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib imagemagick ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/checkpwn/default.nix b/third_party/nixpkgs/pkgs/tools/misc/checkpwn/default.nix index 994fecc6c4..e89e6b8800 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/checkpwn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/checkpwn/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-G+QWnGf+Zp94EHVnYM3Q/iEhEQMU2O/c4i5ya/dY7K4="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix index ca0f6705b9..6c077b2272 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix @@ -1,6 +1,6 @@ { lib, wrapQtAppsHook, fetchFromGitHub, substituteAll, udev, stdenv , pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu, gnused -, withPulseaudio ? stdenv.isLinux, libpulseaudio, quazip +, withPulseaudio ? stdenv.hostPlatform.isLinux, libpulseaudio, quazip }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix index 78ba8e6c3b..9b0369e8fa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libffi wayland-protocols wayland xorg.libX11 alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "-DINSTALL_PREFIX=${placeholder "out"}" ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/cb --add-rpath $out/lib ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix index 32ef248ca8..294746ae9a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix @@ -1,26 +1,46 @@ -{ lib, stdenv, fetchurl, makeWrapper -, gawk, gnused, util-linux, file -, wget, python3, qemu-utils -, e2fsprogs, cdrkit -, gptfdisk }: - +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, makeWrapper +, gawk +, gnused +, util-linux +, file +, wget +, python3 +, qemu-utils +, e2fsprogs +, cdrkit +, gptfdisk +}: let # according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils guestDeps = [ - e2fsprogs gptfdisk gawk gnused util-linux + e2fsprogs + gptfdisk + gawk + gnused + util-linux ]; binDeps = guestDeps ++ [ - wget file qemu-utils cdrkit + wget + file + qemu-utils + cdrkit ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix pname = "cloud-utils"; - version = "0.32"; - src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz"; - sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk"; + version = "0.33"; + src = fetchFromGitHub { + owner = "canonical"; + repo = "cloud-utils"; + rev = "refs/tags/${version}"; + hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; @@ -29,7 +49,7 @@ in stdenv.mkDerivation rec { # $guest output contains all executables needed for cloud-init and $out the rest + $guest # This is similar to debian's package split into cloud-image-utils and cloud-guest-utils # The reason is to reduce the closure size - outputs = [ "out" "guest"]; + outputs = [ "out" "guest" ]; postFixup = '' moveToOutput bin/ec2metadata $guest @@ -48,7 +68,11 @@ in stdenv.mkDerivation rec { dontBuild = true; + passthru.updateScript = gitUpdater { }; + meta = with lib; { + description = "Useful set of utilities for interacting with a cloud"; + homepage = "https://github.com/canonical/cloud-utils"; platforms = platforms.unix; license = licenses.gpl3; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix index eba78d6c22..08ea681eed 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { homepage = "https://github.com/dim-an/cod/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "cod"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix index db58ede25a..2bc64b425e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5/UgEzkJw9XDgtS1jKyWh5ijTp3L+UQLuE5CXcyIgTs="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = with lib; { description = "High performance code minimap render"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix index 2db008551c..564f19f85b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix index 96164902dc..7d61c684f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-zCRM62xwaPaN8+cg+CeaqK/9hKpZmSBBeUOQqAvQGYw="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace "-flto" "" ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix index d9fbd4459f..5bbc3b9581 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c '' - ])) + (optionalString stdenv.isAarch64 '' + ])) + (optionalString stdenv.hostPlatform.isAarch64 '' # Sometimes fails: https://github.com/NixOS/nixpkgs/pull/143097#issuecomment-954462584 sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/cut/cut-huge-range.sh ''); @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { ++ optional withPrefix "--program-prefix=g" # the shipped configure script doesn't enable nls, but using autoreconfHook # does so which breaks the build - ++ optional stdenv.isDarwin "--disable-nls" + ++ optional stdenv.hostPlatform.isDarwin "--disable-nls" ++ optionals (isCross && stdenv.hostPlatform.libc == "glibc") [ # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I # don't know why it is not properly detected cross building with glibc. @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = (!isCross) && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") - && !stdenv.isAarch32; + && !stdenv.hostPlatform.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if isCross then "missing" else null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix index e36bd288b2..9ed7ef6295 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtserialport ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications '' else '' cd .. diff --git a/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix index 102151e2d7..fe37119359 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+XeMRREDX1+v+qOeYiHh7uhadfueYYOxspLY3q1NL6s="; + hash = "sha256-EcCxw3SppuGUgN7AIU9NhpRw7dLDhTHHT5emGOgkDFU="; }; build-system = with python3Packages; [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix index e557862b67..3d9b4161e2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXi xorg.libXtst - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/datefmt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/datefmt/default.nix index 36fdf9fcfe..1c1efd792a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/datefmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/datefmt/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, datefmt, testers }: +{ lib, stdenv, fetchurl, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "datefmt"; version = "0.2.2"; src = fetchurl { - url = "https://cdn.jb55.com/tarballs/datefmt/datefmt-${version}.tar.gz"; + url = "https://cdn.jb55.com/tarballs/datefmt/datefmt-${finalAttrs.version}.tar.gz"; sha256 = "sha256-HgW/vOGVEmAbm8k3oIwIa+cogq7qmX7MfTmHqxv9lhY="; }; makeFlags = [ "PREFIX=$(out)" ]; - passthru.tests.version = testers.testVersion { package = datefmt; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://jb55.com/datefmt"; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jb55 ]; mainProgram = "datefmt"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/dialogbox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dialogbox/default.nix index 7012f9d69a..e6849fa843 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dialogbox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dialogbox/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/martynets/dialogbox/"; description = "Qt-based scriptable engine providing GUI dialog boxes"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix b/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix index 362673a5ca..94efc1af33 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix @@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index f76b7a766e..96d8976922 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -245,7 +245,7 @@ python.pkgs.buildPythonApplication rec { # docx2txt, nixpkgs packages another project named the same, which does not work ]) # oggvideotools is broken on Darwin, please put it back when it will be fixed? - ++ lib.optionals stdenv.isLinux [ oggvideotools ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ] # This doesn't work on aarch64-darwin ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ gnumeric ] ) @@ -272,7 +272,7 @@ python.pkgs.buildPythonApplication rec { # Fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" "test_listing" @@ -288,7 +288,7 @@ python.pkgs.buildPythonApplication rec { "test_libmix_differences" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/comparators/test_git.py" "tests/comparators/test_java.py" "tests/comparators/test_uimage.py" diff --git a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix index 1a73a4d84f..344faf84f6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "dijo"; version = "0.2.7"; - buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; src = fetchFromGitHub { owner = "NerdyPepper"; repo = "dijo"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix index d9738b398b..fa9d7f00a8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-S/ne3iTEnlA3AqcPg3geLzV4bYVuYPjMCITSVJFnWYI="; # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Terminal disk space navigator"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix index fd37b2b9c9..683da47d6a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SKd2CU0F2iR4bSHntu2VKvZyjjf2XJeXJG6XS/fIBMU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix b/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix index d226c2fc8f..a42e57ebc5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { homepage = "https://github.com/skanehira/docui"; license = licenses.mit; maintainers = with maintainers; [ aethelz ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "docui"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/dtool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dtool/default.nix index 8b4349dbb5..0e62d91cdb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dtool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dtool/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-o5Xvc0tnoUgfp5k7EqVuEH9Zyo3C+A+mVqPhMtZCYKw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # FIXME: remove patch when upstream version of rustc-serialize is updated diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index 130a21d070..aed4b2d53c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bqWYXcry+mCUNgYS+7+MWfiV+u+3oZZg1o3Q6Mac+vE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix index 56fe697528..8ef860f32e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , tokyocabinet, ncurses , cairo ? null, pango ? null -, enableCairo ? stdenv.isLinux +, enableCairo ? stdenv.hostPlatform.isLinux }: assert enableCairo -> cairo != null && pango != null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix b/third_party/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix index aedac2d61f..f4e36f271b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { inherit pname version src patches; - CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; postPatch = lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h diff --git a/third_party/nixpkgs/pkgs/tools/misc/ea/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ea/default.nix index d45f3b431d..7ea3b5c11c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ea/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/edid-generator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/edid-generator/default.nix index fc7f012269..e3855fc76f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/edid-generator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/edid-generator/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ flokli nazarewk ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/edk2-uefi-shell/default.nix b/third_party/nixpkgs/pkgs/tools/misc/edk2-uefi-shell/default.nix index 0ec0104726..723833ab45 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/edk2-uefi-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/edk2-uefi-shell/default.nix @@ -38,6 +38,6 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: { description = "UEFI Shell from Tianocore EFI development kit"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg"; maintainers = with lib.maintainers; [ LunNova mjoerg ]; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/third_party/nixpkgs/pkgs/tools/misc/eludris/default.nix b/third_party/nixpkgs/pkgs/tools/misc/eludris/default.nix index e0762d179e..756324c1a8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/eludris/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/eludris/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p eludris" ]; cargoTestFlags = [ "-p eludris" ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix index 984dd60082..22a0075363 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret readline ] - ++ lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libedit ncurses Security ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 59649a048e..54664196d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.8.3"; + version = "2024.9.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AeiEP1D2u2u8LMNKdBvoA2M3uO6Z9oSG2i5HwGin80M="; + hash = "sha256-K28H2kbfiebJfW31CF3M+Vi823wFPWNk6qLPlSaljkk="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix index 67eaacddaf..fa59cb1019 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix @@ -1,30 +1,34 @@ { lib , fetchFromGitHub -, python3 +, python3Packages , softhsm }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "esptool"; - version = "4.7.0"; - - format = "setuptools"; + version = "4.8.0"; + pyproject = true; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; - rev = "v${version}"; - hash = "sha256-yrEwCg0e+8jZorL6jcqeuKUCFoV0oP9HVFh1n/ezjPg="; + rev = "refs/tags/v${version}"; + hash = "sha256-BjoeJxtJ2cin6do82MCBjgAaTF0t7zy6JbzhBqnKAw8="; }; postPatch = '' patchShebangs ci substituteInPlace test/test_espsecure_hsm.py \ - --replace "/usr/lib/softhsm" "${lib.getLib softhsm}/lib/softhsm" + --replace-fail "/usr/lib/softhsm" "${lib.getLib softhsm}/lib/softhsm" ''; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + argcomplete bitstring cryptography ecdsa @@ -32,14 +36,17 @@ python3.pkgs.buildPythonApplication rec { pyserial reedsolo pyyaml - python-pkcs11 ]; - nativeCheckInputs = with python3.pkgs; [ + optional-dependencies = with python3Packages; { + hsm = [ python-pkcs11 ]; + }; + + nativeCheckInputs = with python3Packages; [ pyelftools pytestCheckHook softhsm - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); # tests mentioned in `.github/workflows/test_esptool.yml` checkPhase = '' @@ -60,6 +67,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { + changelog = "https://github.com/espressif/esptool/blob/${src.rev}/CHANGELOG.md"; description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix index 102120a860..ffbfb3a641 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -42,7 +42,7 @@ tcl.mkTclDerivation rec { postInstall = '' tclWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ tcl ]}) - ${lib.optionalString stdenv.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"} + ${lib.optionalString stdenv.hostPlatform.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"} ''; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix index deb97aced8..f7a70b966a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mEgFfg8I+JJuUEvj+sia2aL3BVg3HteQorZ2EOiLo64="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ]; # device::test_physical_device_name test fails on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # ofborg sometimes fails with "Resource temporarily unavailable" diff --git a/third_party/nixpkgs/pkgs/tools/misc/fclones/gui.nix b/third_party/nixpkgs/pkgs/tools/misc/fclones/gui.nix index 8dff1eec49..bf010cfa79 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fclones/gui.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fclones/gui.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { gdk-pixbuf gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix index 814d764a79..9d3a7c4074 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ expect ]; # character_device fails with "File name too long" on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' patchShebangs tests/*.exp diff --git a/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix index a15b2c516e..4eac639897 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3, stdenv }: python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.7"; + version = "7.1.12"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-1QLVhqyH0wb8om2pFJfmgJcYp9DTuT5KZpLy5InlRr8="; + hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40="; }; propagatedBuildInputs = with python3.pkgs; [ defusedxml python-dateutil requests + xxhash ]; installPhase = '' @@ -26,6 +27,14 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + runHook preCheck + + $out/bin/fedifetcher --help>/dev/null + + runHook postCheck + ''; + meta = with lib; { description = "Tool for Mastodon that automatically fetches missing replies and posts from other fediverse instances"; longDescription = '' @@ -34,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { own Mastodon instance. ''; homepage = "https://blog.thms.uk/fedifetcher"; + changelog = "https://github.com/nanos/FediFetcher/releases/tag/v${version}"; license = licenses.mit; maintainers = teams.c3d2.members; mainProgram = "fedifetcher"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix index 46639ea92b..aa1fda03a4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -18,19 +18,19 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-lfn9RKN2TiHEroDaKJTeQ7wLU2tjoUTyD5Ar5QTNOlY="; + hash = "sha256-ktCfIFSGXOqHfqFkXt2ZO8jZFGTRd8wTxukGLZD1PTU="; }; - cargoHash = "sha256-zmqkGmN0fEYW+6U6cUQK27/OSV4JZW1EQiRswvBnA3M="; + cargoHash = "sha256-R5p7f+eEMDs0rs+45XNJC4znrJ9BrPBv5+dvMgoHFdA="; nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ]; - buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postBuild = '' patchShebangs --build ./documentation/build.sh diff --git a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 91fcaf4ac4..c24650d4ff 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -2,13 +2,13 @@ , installShellFiles , Security, AppKit -, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD +, x11Support ? stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isBSD , xclip ? null, xsel ? null , preferXsel ? false # if true and xsel is non-null, use it instead of xclip }: let - usesX11 = stdenv.isLinux || stdenv.isBSD; + usesX11 = stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isBSD; in assert (x11Support && usesX11) -> xclip != null || xsel != null; @@ -58,9 +58,9 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = - if stdenv.isDarwin then [ Security AppKit ] + if stdenv.hostPlatform.isDarwin then [ Security AppKit ] else [ openssl ]; preBuild = lib.optionalString (x11Support && usesX11) ( diff --git a/third_party/nixpkgs/pkgs/tools/misc/findutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/findutils/default.nix index 41432415a2..239aa98b04 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/findutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/findutils/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/cache" ]; - CFLAGS = lib.optionals stdenv.isDarwin [ + CFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 "-D__nonnull\\(params\\)=" diff --git a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix index 190841582a..744876ffb6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ libftdi1 libusb1 ] - ++ lib.optionals (!stdenv.isDarwin) [ pciutils ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pciutils ] ++ lib.optional jlinkSupport libjaylink; postPatch = '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes" - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ]; postInstall = '' install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules diff --git a/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix index b32329efd9..01f231db44 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/alexozer/flitter"; platforms = platforms.unix; mainProgram = "flitter"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/flowgger/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flowgger/default.nix index 6783e9dc80..1cff8298ca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flowgger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flowgger/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; checkFlags = [ # test failed diff --git a/third_party/nixpkgs/pkgs/tools/misc/fondu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fondu/default.nix index 9435d0487b..fe6ab396d1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fondu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fondu/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace /System/Library/Frameworks/CoreServices.framework/CoreServices "-framework CoreServices" ''; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix index fe626a417a..495a3dad83 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withGUI [ gtk3 cairo pango ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; cmakeFlags = [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] ++ lib.optional (!withSpiro) "-DENABLE_LIBSPIRO=OFF" diff --git a/third_party/nixpkgs/pkgs/tools/misc/freshfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/freshfetch/default.nix index 40119d9f0b..ccbaa1f1bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/freshfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/freshfetch/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { # freshfetch depends on rust nightly features RUSTC_BOOTSTRAP = 1; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreFoundation DiskArbitration diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsearch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fsearch/default.nix index 43902b5d99..453e200ea6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fsearch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fsearch/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; mainProgram = "fsearch"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/fsearch.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/fsearch.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix index feeb9f3a3d..95c5b4af05 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eqzqIyQHHklxo3aojCvY06TUPSqChoz6yZ2zzpgRNqs="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; postInstall = '' installManPage docs/fselect.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix index 5483bc872d..7855747c59 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix index 904aca2052..c7226904af 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libsodium xz zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { xdelta ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix index 2aca571e2c..2f1d2d0b6b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix @@ -21,7 +21,7 @@ let hash = "sha256-fbf01qa9wx3k9j8AEqv38fAM3F9tZOcnpH/wa/9rawQ="; }; }; - geekbench_avx2 = lib.optionalString stdenv.isx86_64 "geekbench_avx2"; + geekbench_avx2 = lib.optionalString stdenv.hostPlatform.isx86_64 "geekbench_avx2"; in stdenv.mkDerivation { inherit version; diff --git a/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix b/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix index 2ff3d4c644..d3dcde29dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation rec { doCheck = true; nativeCheckInputs = [ shellspec ksh mksh yash zsh ] - ++ lib.lists.optional (!stdenvNoCC.isDarwin) busybox-sandbox-shell; + ++ lib.lists.optional (!stdenvNoCC.hostPlatform.isDarwin) busybox-sandbox-shell; # Disable checks against yash, since shellspec seems to be broken for yash>=2.54 # (see: https://github.com/NixOS/nixpkgs/pull/218264#pullrequestreview-1434402054) preCheck = '' sed -i '/shellspec -s posh/d' Makefile sed -i '/shellspec -s yash/d' Makefile - '' + lib.strings.optionalString stdenvNoCC.isDarwin '' + '' + lib.strings.optionalString stdenvNoCC.hostPlatform.isDarwin '' sed -i "/shellspec -s 'busybox ash'/d" Makefile ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix index e14acf372a..2e4d05b1c2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "GitHub contributions calender terminal viewer"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ghostie/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ghostie/default.nix index 0a4e1cb695..e6a47a5577 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ghostie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ghostie/default.nix @@ -33,14 +33,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; # 4 out of 5 tests are notification tests which do not work in nix builds doCheck = false; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$(mktemp -d) ''; @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/attriaayush/ghostie/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - broken = stdenv.isx86_64 && stdenv.isDarwin; + broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; mainProgram = "ghostie"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix index 101b5f6a93..8628fdfcff 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Gigalixir Command-Line Interface"; homepage = "https://github.com/gigalixir/gigalixir-cli"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gitrs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gitrs/default.nix index f6a49fe850..99139437b4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gitrs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gitrs/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl.dev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix index 9fd40e7fc3..b9433f23bb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - ncurses - openssl - ] ++ lib.optionals withGeolocation [ libmaxminddb ] ++ lib.optionals stdenv.isDarwin [ gettext ]; + buildInputs = + [ + ncurses + openssl + ] + ++ lib.optionals withGeolocation [ libmaxminddb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; configureFlags = [ "--enable-utf8" diff --git a/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix index b329eeea96..058408ca9f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { "-skip=TestClickUpDown|TestClickHouseFirstThree|TestLockModeAdvisorySession|TestDialectStore|TestGoMigrationStats|TestPostgresSessionLocker" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Database migration tool which supports SQL migrations and Go functions"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix index d1b67d927c..e184c38d5e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/desbma/gotify-desktop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bryanasdev000 genofire ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gotify-desktop"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix index 2697c6b3fe..f3263303f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZRE1vKgi0/UtSe2bdN0BLdtDfAauTfwcqOcl3y63fAA="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix index ca68506faa..d9cffca07f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Multitree-based personal task manager"; homepage = "https://github.com/climech/grit"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub4dos/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grub4dos/default.nix index 8b78c29def..b18298e37b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub4dos/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub4dos/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, nasm }: let arch = - if stdenv.isi686 then "i386" - else if stdenv.isx86_64 then "x86_64" + if stdenv.hostPlatform.isi686 then "i386" + else if stdenv.hostPlatform.isx86_64 then "x86_64" else throw "Unknown architecture"; in stdenv.mkDerivation { pname = "grub4dos"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix index 8e75d2ab1a..628d5e9e7d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix @@ -1,9 +1,7 @@ { lib , stdenv , fetchFromGitea -, substituteAll , testers -, gummy , cmake , libX11 , libXext @@ -18,7 +16,7 @@ , spdlog }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gummy"; version = "0.6.0"; @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "fusco"; repo = "gummy"; - rev = version; + rev = finalAttrs.version; hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE="; }; @@ -66,7 +64,7 @@ stdenv.mkDerivation rec { ln -s $out/libexec/gummyd $out/bin/gummyd ''; - passthru.tests.version = testers.testVersion { package = gummy; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://codeberg.org/fusco/gummy"; @@ -78,4 +76,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix index e036336eb1..2a8b869861 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ]; # tests are failing on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # requires internet access diff --git a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix index b2245eafe5..6123311385 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M="; nativeBuildInputs = [ installShellFiles shared-mime-info ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preCheck = '' export HOME=$TEMPDIR diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix index 2636cb7171..6553c1c70d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -5,7 +5,7 @@ , fixDarwinDylibNames , cmake , libjpeg -, uselibtirpc ? stdenv.isLinux +, uselibtirpc ? stdenv.hostPlatform.isLinux , libtirpc , zlib , szipSupport ? false @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optional fortranSupport gfortran; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { doCheck = true; - excludedTests = lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [ "MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest-shared" "HDP-dumpsds-18" diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix index 226143c44b..80f7c151bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake" "-DBUILD_STATIC_LIBS=${lib.boolToString enableStatic}" - ] ++ lib.optional stdenv.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON" ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON" ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON" ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ++ lib.optionals threadsafe [ "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON" "-DHDF5_BUILD_HL_LIB=OFF" ] # broken in nixpkgs since around 1.14.3 -> 1.14.4.3 # https://github.com/HDFGroup/hdf5/issues/4208#issuecomment-2098698567 - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF" + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF" ; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix index bbc6f512be..83597d4500 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildPhase = let - arch = if stdenv.isx86_64 then "x86_64" else "aarch64"; + arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "aarch64"; in '' runHook preBuild @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/bin $out/lib cp -a build/dist/HDFView/bin/HDFView $out/bin/ cp -a build/dist/HDFView/lib/app $out/lib/ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -a build/dist/HDFView.app $out/Applications/ '' + '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/heimdall/default.nix b/third_party/nixpkgs/pkgs/tools/misc/heimdall/default.nix index ce56a4f405..d750bdb131 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/heimdall/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/heimdall/default.nix @@ -27,11 +27,11 @@ mkDerivation rec { preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; - installPhase = lib.optionalString (stdenv.isDarwin && enableGUI) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && enableGUI) '' mkdir -p $out/Applications mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend @@ -44,7 +44,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "Cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix index 5ce3e969f2..d3a8a40124 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ pacien ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin mainProgram = "hidrd-convert"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix index def3f47769..77e74e8116 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix index 4bdf7b7127..1972c9c793 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix index 44100e1528..d1f41a72a1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { nativeBuildInputs = [ python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix index 16de5fa76f..e4922824d7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-E2y/hQNcpW6b/ZJBlsp+2RDH2OgpX4kbn36aBHA5X6U="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage doc/hyperfine.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/iay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/iay/default.nix index 1ef3d332e7..5973ed258b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/iay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/iay/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation Security ]; - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" "AppKit" ]; meta = with lib; { description = "Minimalistic, blazing-fast, and extendable prompt for bash and zsh"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/idutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/idutils/default.nix index cbdf1b7610..d065800b45 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/idutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/idutils/default.nix @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ emacs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; patches = [ ./nix-mapping.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/immich-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/immich-cli/default.nix deleted file mode 100644 index 8cf8212f8a..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/immich-cli/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, testers -}: - -let - version = "2.2.15"; - src = fetchFromGitHub { - owner = "immich-app"; - repo = "immich"; - # Using a fixed commit until upstream has release tags for cli. - rev = "f7bfde6a3286d4b454c2f05ccf354914f8eccac6"; - hash = "sha256-O014Y2HwhfPqKKFFGtNDJBzCaR6ugI4azw6/kfzKET0="; - }; - meta' = { - description = "CLI utilities for Immich to help upload images and videos"; - homepage = "https://github.com/immich-app/immich"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ felschr pineapplehunter ]; - mainProgram = "immich"; - }; - - open-api-typescript-sdk = buildNpmPackage { - pname = "immich-cli-openapi-typescript-sdk"; - inherit src version; - - npmDepsHash = "sha256-rIN88xw8kdLfhFbT4OReTwzWqNlD4QVAAuvfMyda+V8="; - - postPatch = '' - cd open-api/typescript-sdk - ''; - meta = { - # using inherit for `builtin.unsafeGetAttrPos` to work correctly - inherit (meta') - description - homepage - license - maintainers; - }; - }; - - immich-cli = buildNpmPackage { - pname = "immich-cli"; - inherit src version; - - npmDepsHash = "sha256-r/kCE6FmhbnMVv2Z76hH/1O1YEYSq9VY5kB0xlqWzaM="; - - postPatch = '' - ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk - cd cli - ''; - - passthru = { - inherit open-api-typescript-sdk; - tests.version = testers.testVersion { package = immich-cli; }; - }; - - meta = { - # using inherit for `builtin.unsafeGetAttrPos` to work correctly - inherit (meta') - description - homepage - license - maintainers - mainProgram; - }; - }; -in -immich-cli diff --git a/third_party/nixpkgs/pkgs/tools/misc/inav-blackbox-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/inav-blackbox-tools/default.nix index 43524f6a3f..228035108a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/inav-blackbox-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix index 4d6868d5d3..b4b7d7807c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-k34psGOs6G+B/msmLSDHLNxnjO1yyE4OY6aQU8bt+is="; # include_hidden test tries to use `chflags` on darwin - checkFlags = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix index 9c69888469..6a4b5c3c39 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix index 451089dc18..c40e91c87c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "jsonwatch"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix deleted file mode 100644 index 15310fb935..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, fetchurl, python3Packages }: - -with python3Packages; - -buildPythonApplication rec { - version = "0.4.8"; - pname = "kargo"; - - src = fetchurl { - url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz"; - sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3"; - }; - - propagatedBuildInputs = [ - ansible-core - boto - cffi - cryptography - libcloud - markupsafe - netaddr - pyasn1 - requests - setuptools - ]; - - checkPhase = '' - HOME=$TMPDIR $out/bin/kargo -v - ''; - - meta = with lib; { - homepage = "https://github.com/kubespray/kargo-cli"; - description = "Tool helps to deploy a kubernetes cluster with Ansible"; - platforms = platforms.all; - license = licenses.gpl3; - maintainers = [ ]; - mainProgram = "kargo"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix index 5448fa9427..f4f1410ec5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5jhEcwOdzLqzxQsEBqo4d5ecsg/vhiKuVjGYIwFzihE="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = with lib; { description = "Visualize a log file with sparklines"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix index 20ea8beaaa..cd1f8d0c48 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl' ] - ++ lib.optional (!stdenv.isDarwin) bsd-finger + ++ lib.optional (!stdenv.hostPlatform.isDarwin) bsd-finger ++ lib.optional withAbook abook ++ lib.optional withGnupg gnupg ++ lib.optional withGoobook goobook diff --git a/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix index f0006ff7f1..81f6205986 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { hash = "sha256-fLazKCQnOT3bN3Kz25Q80RLk54EU5U6HCf6kPLcXn9c="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail "-flto" "" \ --replace-fail "lib/LZMA/Alloc.o" "lib/LZMA/CpuArch.o lib/LZMA/Alloc.o" \ --replace-quiet "-Werror" "" ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix index b2c310bc5f..8fd4689aae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { "mdcat" "pandoc" "docx2txt" "libreoffice" "pptx2md" "mdcat" "xlscat" "odt2txt" "wvText" "antiword" "catdoc" "broken_catppt" "sxw2txt" "groff" "mandoc" "unrtf" "dvi2tty" "pod2text" "perldoc" "h5dump" "ncdump" "matdump" "djvutxt" "openssl" "gpg" "plistutil" "plutil" "id3v2" "csvlook" "jq" "zlib-flate" "lessfilter" - ] ++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) [ + ] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [ # resholve only identifies this on darwin/bsd # call site is guarded by || so it's safe to leave dynamic "locale" diff --git a/third_party/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix index 4ddd33ff18..1898bfc7b2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "VR Lighthouse power state management"; homepage = "https://github.com/ShayBox/Lighthouse"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/misc/livedl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/livedl/default.nix index 6db5006959..9a3b4c3fd1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/livedl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/livedl/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ wakira ]; platforms = platforms.linux ++ platforms.darwin; - broken = stdenv.isDarwin; # build fails with go > 1.17 + broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "livedl"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix index 001efe6563..6ba07b3d87 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix @@ -38,7 +38,7 @@ in (rustPlatform.buildRustPackage rec { RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { }; nativeBuildInputs = [ rustPackages.rustfmt ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/lorri/runtime.nix b/third_party/nixpkgs/pkgs/tools/misc/lorri/runtime.nix index 96b14b26e8..7e6883be06 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lorri/runtime.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lorri/runtime.nix @@ -2,7 +2,6 @@ # Plumbing tools: closureInfo , runCommand -, writeText , buildEnv , # Actual dependencies to propagate: bash diff --git a/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix b/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix index 036d500f6b..4427366bbe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "6.1.8"; + version = "6.2.1"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - hash = "sha256-MntHq5nphfjbO0Rx7v6WjsnabSMH5Ke3aR9/embG/rk="; + hash = "sha256-v1EaC4VBOvZFL2GoKlTDBMjSe8+4bxaLFvy2V7e7RW4="; }; - cargoHash = "sha256-w8WIpT8rUe7olB5kdpDyrId6D698AhcqzsfpOlutaHQ="; + cargoHash = "sha256-k17x7BEaBWo4Ka2HIjHd4DrO/tolKR/+s7Mm5ZzJk/Y="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.DisplayServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix index dc8ff42210..ec8e90631b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin mainProgram = "marlin-calc"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index 72b74039f7..d7dc5606a6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.efi = "${finalAttrs.finalPackage}/memtest.efi"; preBuild = '' - cd ${if stdenv.isi686 then "build32" else "build64"} + cd ${if stdenv.hostPlatform.isi686 then "build32" else "build64"} ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix index 50043a132b..89653c26d6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+fKvHrApDXm94LItXv+xSDIE5zD7rTY5IeNSuzQglpg="; }; - buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ libiconv IOKit ]; + buildInputs = [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv IOKit ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 745d18715b..7822fd6d8d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix index 473d7a308f..ace598e053 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0="; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; postPatch = '' patchShebangs --build \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix index 74f449969a..3fb3f7390f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ] - ++ lib.optional stdenv.isi686 "USE_LARGE_FILES=1" - ++ lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; + ++ lib.optional stdenv.hostPlatform.isi686 "USE_LARGE_FILES=1" + ++ lib.optional stdenv.hostPlatform.isLinux "CFLAGS=-lgcc_s"; installFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix b/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix index b42a2eea71..ee5505215f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moar"; - version = "1.27.0"; + version = "1.27.2"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-nuBLO+7AUa2e9WC95kami77si+LrhigGu1ngAoFwjqY="; + hash = "sha256-ZWAQrf4Y/Qse02T5Yt7byGXZheH1y7RvBsPP2xiF5Kw="; }; - vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; + vendorHash = "sha256-Orgh0X/HPfaKvliUvTllhk72LkQ/O3Eh9N/38Cj4Rew="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix index 694e9ac93e..e557a05f30 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper perl libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ]; buildInputs = [ (perl.withPackages (p: [ p.IPCRun p.TimeDate p.TimeDuration ])) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix index e7baa6641c..c4e7ad591e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { curl boost libgcrypt - ] ++ lib.optional stdenv.isLinux systemd; + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd; meta = with lib; { description = "MPD client which submits info about tracks being played to a scrobbler"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mpy-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mpy-utils/default.nix index 0ee7701b73..342b6875c2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mpy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mpy-utils/default.nix @@ -16,6 +16,6 @@ buildPythonApplication rec { homepage = "https://github.com/nickzoic/mpy-utils"; license = licenses.mit; maintainers = with maintainers; [ aciceri ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix index 1ad1bb7ac1..d78c6304a1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix @@ -34,6 +34,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ bezmuth ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/nbench/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nbench/default.nix index 44beea57fb..b8fa6abfba 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nbench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nbench/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\"" substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace "-static" "" ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix index 5209522d25..abde0b0d79 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -5,7 +5,7 @@ , zig , installShellFiles , testers -, pie ? stdenv.isDarwin +, pie ? stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix index 3401f74de9..1c33f4ff73 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix index 54e232eafd..d28688c633 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -3,12 +3,12 @@ , python39 , fetchFromGitHub , fetchpatch -, withXmpp ? !stdenv.isDarwin +, withXmpp ? !stdenv.hostPlatform.isDarwin , withMatrix ? true , withSlack ? true , withEmoji ? true , withPid ? true -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: let diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix index e0af2ff638..752427cdb0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix index 80900bf30a..364b825292 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # filter out one test that fails in the sandbox of nix or with neovim v0.10 # or on macOS preCheck = '' - checkFlagsArray+=('BUSTED=busted --output TAP --exclude-tags=${"nix,v10" + lib.optionalString stdenv.isDarwin ",mac"}') + checkFlagsArray+=('BUSTED=busted --output TAP --exclude-tags=${"nix,v10" + lib.optionalString stdenv.hostPlatform.isDarwin ",mac"}') ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix index f254e77ebd..1218cb1f7b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/azur1s/octofetch"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix index 13c13f086a..004fb35792 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { # Compilation error on Darwin: # error: invalid argument '--std=c++0x' not allowed with 'C' # make[2]: *** [src/libresample/CMakeFiles/resample.dir/build.make:76: src/libresample/CMakeFiles/resample.dir/filterkit.c.o] Error 1 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 2436b68da4..2beca6a815 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake installShellFiles pkg-config ]; buildInputs = [ zstd ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation libresolv Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libresolv Security ]; nativeCheckInputs = [ git diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 017fd1a015..a2a0b255d0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -30,7 +30,7 @@ buildGoModule rec { CGO_ENABLED = 0; # journalctl is required in-$PATH for the journald receiver tests. - nativeCheckInputs = lib.optionals stdenv.isLinux [ systemdMinimal ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal ]; # We don't inject the package into propagatedBuildInputs unless # asked to avoid hard-requiring a large package. For the journald diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/default.nix index d7b09b65f7..ece63fe676 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ostree - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index cab9aba3d9..7b9d9ac51e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , fetchpatch -, substituteAll , pkg-config , gtk-doc , gobject-introspection @@ -34,7 +33,6 @@ , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 -, openssl , python3 }: diff --git a/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix index 09c2481782..b0c4e38c4c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { preCheck = '' ln -s $GOPATH/bin/otel-cli . - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace main_test.go \ --replace-fail 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent coreutils ]}`' ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/otfcc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/otfcc/default.nix index aa0d86253d..d45c800464 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/otfcc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/otfcc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./move-makefiles.patch ]; - buildFlags = lib.optionals stdenv.isAarch64 [ "config=release_arm" ]; + buildFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "config=release_arm" ]; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix index 22bbc4ba72..20d9cc160d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU="; - buildInputs = lib.optionals stdenvNoCC.isDarwin [ + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ Foundation DiskArbitration ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix index de771e9e86..2ccabe6280 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoHash = "sha256-7ChHYcyzRPFkZ+zh9lBOHcOizDvJf2cp9ULoI7Ofmqk="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix index 0a2e3c9ec3..f86b71f72c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-/gYL32kUA4gKTGogMrOghQ3XYFjw3GsDhzynUC/OyXY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.DisplayServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix index 27c532e814..d25b4db906 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix @@ -32,7 +32,7 @@ buildPerlPackage rec { # pgbadger has too many `-Idir` flags on its shebang line on Darwin, # causing the build to fail when trying to generate the documentation. # Rewrite the -I flags in `use lib` form. - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang ./pgbadger ''; @@ -46,7 +46,7 @@ buildPerlPackage rec { TextCSV_XS ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; nativeCheckInputs = [ bzip2 diff --git a/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix index 68519f2eb6..0309832787 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Piston api tool"; homepage = "https://github.com/Shivansh-007/piston-cli"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix index 42e00b9e61..08f84c9a78 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-Epet0CG4p7ruKHYVx0rX7KeOAe9kCer6Y8bguOY9SUs="; + hash = "sha256-0dss+ZJ1hhQGpWySWhyF+T1T+G3BlnKfSosgCJa8MPE="; fetchSubmodules = true; }; - cargoHash = "sha256-gakrHutB6KBYcSZce/MDDnHK6VRPHU2B2xwtmUi4ZWY="; + cargoHash = "sha256-VYF2uhgxUFH/VAy/ttQOULRFFiPRf0D+0WfGlQyYDGc="; meta = with lib; { description = "Better rust version of pokeget"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/poop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/poop/default.nix index d3b444d947..9b42801c5e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/poop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/poop/default.nix @@ -1,39 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, zig_0_11 +{ + lib, + stdenv, + fetchFromGitHub, + zig, }: stdenv.mkDerivation rec { pname = "poop"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "andrewrk"; repo = "poop"; rev = version; - hash = "sha256-ekZpulQ1NpEOCG9KU2I4O0NL8mD+CC7bKF0tZbl7vHo="; + hash = "sha256-zrqR/TTELhsBIX42PysFsHPRs8Lx/zHcmi+VMDw1SdQ="; }; - # fix compilation with zig 0.11 - patches = [ - # https://github.com/andrewrk/poop/pull/41 - (fetchpatch { - name = "update-to-zig-0-11-0.patch"; - url = "https://github.com/andrewrk/poop/commit/15c794d9dea91570485104cda26346f2ae5c9365.patch"; - hash = "sha256-iv3IuYIDPzs98wiTXcO0igngaRRdQnASvzA4bYET54c="; - }) - # https://github.com/andrewrk/poop/pull/36 - (fetchpatch { - name = "update-zig-to-latest-0-11-0-dev-3883-7166407d8.patch"; - url = "https://github.com/andrewrk/poop/commit/b1ca37c0cf637e9bbbf24cd243bafaedf02fa8c7.patch"; - hash = "sha256-/j2zqi0Q2Pl7ZL+4GflwD/MnqcKScT/1SdYJAQ3o4bU="; - }) - ]; - nativeBuildInputs = [ - zig_0_11.hook + zig.hook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix index 53077c5884..77506e95ba 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NAhLTrTshCm1QKGaOdD/YaqD6c3oYZwVBst8fvTlScQ="; nativeBuildInputs = [ pkg-config file perl cmake curl ]; - buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; COMPLETION_OUT = "out"; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix index 0afa9180a4..4901663d0d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix @@ -81,7 +81,7 @@ buildPythonApplication rec { "--forked" ]; - preCheck = lib.optionalString (!(stdenv.isLinux && stdenv.isAarch64)) '' + preCheck = lib.optionalString (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)) '' # Disable outline atomics for rust tests on aarch64-linux. export RUSTFLAGS="-Ctarget-feature=-outline-atomics" '' + '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix index 7a344e9b0c..5ad26ab739 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix @@ -62,7 +62,7 @@ mkDerivation { qtquickcontrols qtquickcontrols2 qtgraphicaleffects - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ qtwayland ]; @@ -83,7 +83,7 @@ mkDerivation { postInstall = '' mkdir -p $out/bin - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' cp qFlipper.app/Contents/MacOS/qFlipper $out/bin ''} cp qFlipper-cli $out/bin @@ -95,7 +95,7 @@ mkDerivation { passthru.updateScript = nix-update-script { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Cross-platform desktop tool to manage your flipper device"; homepage = "https://flipperzero.one/"; license = licenses.gpl3Only; diff --git a/third_party/nixpkgs/pkgs/tools/misc/qrscan/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qrscan/default.nix index 1ad4c526e7..479c610281 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qrscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qrscan/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "qrscan"; homepage = "https://github.com/sayanarijit/qrscan"; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ maintainers.sayanarijit ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix index d121453bd7..c774721eee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "CLI tool that brings currency exchange rates right into your terminal"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix index edf581b183..e9edaacd6a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix @@ -56,7 +56,7 @@ buildPythonApplication rec { pytest-cov-stub ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # `watchdog` dependency does not correctly detect fsevents on darwin. # this only affects `remote --stream-changes` "test/test_file_changes.py" diff --git a/third_party/nixpkgs/pkgs/tools/misc/renameutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/renameutils/default.nix index e3ce23eca0..e09b7c60f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/renameutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/renameutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./install-exec.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/apply.c \ --replace "command = \"mv\"" "command = \"${coreutils}/bin/mv\"" \ --replace "command = \"cp\"" "command = \"${coreutils}/bin/cp\"" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ readline ]; - preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' export ac_cv_func_lstat64=no ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index f1c2d6a589..68baa33188 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; meta = with lib; { description = "Readline wrapper for console programs"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix index 08a0a0c5e1..829987d609 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix @@ -17,7 +17,7 @@ , wrapGAppsHook3 , withGui ? false }: -assert withGui -> !stdenv.isDarwin; +assert withGui -> !stdenv.hostPlatform.isDarwin; stdenv.mkDerivation rec { pname = "rmlint"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix b/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix index 75ea2c24ec..e430a3063e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patchFlags = [ "-p0" ]; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff"; sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.conf \ --subst-var-by PREFIX $out ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 22fd1e1ae4..87bd920db1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2024.7"; + version = "2024.8"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/rpm-ostree/releases/download/v${version}/rpm-ostree-${version}.tar.xz"; - hash = "sha256-Ehh6304Uhhom7aAvSDS2UYKyyJKr4XQF70CX7Pk3yAg="; + hash = "sha256-6aCGP3SJ0DegmhiQkiqBr733C5vuDGTjLMaxNtai3G0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock index a84b6ab431..3211e669bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock @@ -524,9 +524,9 @@ dependencies = [ [[package]] name = "cities-json" -version = "0.4.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4720186a8069da0585af9ec1e2f9e815d7d1bbe47dc817b8597e31a609f898f" +checksum = "b182994ec23e201f9bd45d2e4f6756dc176f9fc12aa957842bf01348725d1e66" dependencies = [ "lazy_static", "rand 0.8.5", @@ -2470,7 +2470,7 @@ dependencies = [ [[package]] name = "rtz" -version = "0.7.0" +version = "0.7.1" dependencies = [ "anyhow", "async-trait", @@ -3568,9 +3568,16 @@ dependencies = [ "serde_json", "url", "utoipa", + "utoipa-swagger-ui-vendored", "zip 1.1.4", ] +[[package]] +name = "utoipa-swagger-ui-vendored" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20d6689d3a5693eec4d21f6b9d7c54f37468b856da8e98a7bb316f7b32df6e3" + [[package]] name = "uuid" version = "1.4.1" diff --git a/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix index 3d7670991a..a5f55342a1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rtz"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "twitchax"; repo = "rtz"; rev = "v${version}"; - hash = "sha256-Wfb3FEZHjWYUtRI4Qn3QNunIXuzW1AIEZkIvtVrjBPs="; + hash = "sha256-V7N9NFIc/WWxLaahkjdS47Qj8sc3HRdKSkrBqi1ngA8="; }; cargoLock = { @@ -28,11 +28,6 @@ rustPlatform.buildRustPackage rec { }; }; - swagger-ui = fetchurl { - url = "https://github.com/juhaku/utoipa/raw/master/utoipa-swagger-ui-vendored/res/v5.17.12.zip"; - hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I="; - }; - nativeBuildInputs = [ pkg-config ]; @@ -41,24 +36,13 @@ rustPlatform.buildRustPackage rec { bzip2 openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; buildFeatures = [ "web" ]; - # ${swagger-ui} is read-only and the copy made by the build script - # is as well. Remove it so that checks can copy it again. - preCheck = '' - find target -name $(basename ${swagger-ui}) -delete - ''; - - env = { - # use local data file instead of requiring network access - SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}"; - }; - meta = with lib; { description = "Tool to easily work with timezone lookups via a binary, a library, or a server"; homepage = "https://github.com/twitchax/rtz"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rust-motd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rust-motd/default.nix index 26b582e5e9..df79acf5f1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rust-motd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rust-motd/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rustypaste-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rustypaste-cli/default.nix index 8f87e508a7..a596683537 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rustypaste-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rustypaste-cli/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-UaOUEuh7NNIhXOKqHEfVRv1hXld7qmdPdazATalXvQU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix index 1469bb6e34..7764781dc0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix index 29f7fe5ea8..e952fa6f25 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libxcrypt - ] ++ lib.optional stdenv.isLinux pam - ++ lib.optional stdenv.isDarwin utmp; + ] ++ lib.optional stdenv.hostPlatform.isLinux pam + ++ lib.optional stdenv.hostPlatform.isDarwin utmp; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/screenfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screenfetch/default.nix index e3ad0e5c51..c4eb669875 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/screenfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/screenfetch/default.nix @@ -7,11 +7,11 @@ let path = lib.makeBinPath ([ coreutils gawk gnused findutils gnugrep ncurses bc pciutils - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ procps xdpyinfo xprop - ] ++ lib.optionals stdenv.isDarwin (with darwin; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin; [ adv_cmds DarwinTools system_cmds diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix index 3217b8f20d..818f84ed37 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { makeFlags = [ "RANLIB:=$(RANLIB)" "SFEED_CURSES_LDFLAGS:=-lncurses" ] # use macOS's strlcat() and strlcpy() instead of vendored ones - ++ lib.optional stdenv.isDarwin "COMPATOBJ:="; + ++ lib.optional stdenv.hostPlatform.isDarwin "COMPATOBJ:="; installFlags = [ "PREFIX=$(out)" ]; # otherwise does not find SIGWINCH - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; meta = with lib; { homepage = "https://codemadness.org/sfeed-simple-feed-parser.html"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix index 3459714252..3c18662db5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installManPage man/man1/shadowenv.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix index cf48868097..3d5e2e84a5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+yTX1wUfVVjsM42X0QliL+0xbzTPheADZibPh/5Czh8="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security curl ]; nativeBuildInputs = [ installShellFiles pkg-config ]; # Needs network connection diff --git a/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix index dcc95b24ef..1b3fd5c580 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec { YAMLSyck ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; prePatch = '' touch Makefile.PL @@ -40,7 +40,7 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/shelldap ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix index bb51fd8899..4e09f021cc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ''; # https://github.com/lotabout/skim/issues/440 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Command-line fuzzy finder written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sshx/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sshx/default.nix index 9ae65dcaee..0929703288 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sshx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sshx/default.nix @@ -8,13 +8,13 @@ , buildNpmPackage }: let - version = "unstable-2023-11-23"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ekzhang"; repo = "sshx"; - rev = "2677f7e1fa3b369132cc7f27f6028a04b92ba5cf"; - hash = "sha256-9fo8hNUzJr4gse0J2tw7j+alqE82+y8McADzTkxryWk="; + rev = "refs/tags/v${version}"; + hash = "sha256-RIQRX4sXlMl73Opi6hK2WD/erdAMNrm40IasHasikuw="; }; mkSshxPackage = { pname, cargoHash, ... }@args: @@ -26,14 +26,17 @@ let cargoHash; nativeBuildInputs = [ protobuf ]; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; cargoBuildFlags = [ "--package" pname ]; + cargoTestFlags = cargoBuildFlags; meta = { description = "Fast, collaborative live terminal sharing over the web"; homepage = "https://github.com/ekzhang/sshx"; + changelog = "https://github.com/ekzhang/sshx/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pinpox kranzes ]; mainProgram = pname; @@ -43,17 +46,17 @@ in { sshx = mkSshxPackage { pname = "sshx"; - cargoHash = "sha256-dA5Aen/qANW8si75pj/RsBknvOo3KDyU5UISAmmcfRE="; + cargoHash = "sha256-PMSKhlHSjXKh/Jxvl2z+c1zDDyuVPzQapvdCdcuaFYc="; }; sshx-server = mkSshxPackage rec { pname = "sshx-server"; - cargoHash = "sha256-1GRWCMXsOzqvORgtwfuywV4wLyX3r4nURhM3Dl5V9Ss="; + cargoHash = "sha256-ySsTjNoI/nuz2qtZ4M2Fd9zy239+E61hUCq1r/ahgsA="; postPatch = '' substituteInPlace crates/sshx-server/src/web.rs \ - --replace 'ServeDir::new("build")' 'ServeDir::new("${passthru.web.outPath}")' \ - --replace 'ServeFile::new("build/spa.html")' 'ServeFile::new("${passthru.web.outPath}/spa.html")' + --replace-fail 'ServeDir::new("build")' 'ServeDir::new("${passthru.web.outPath}")' \ + --replace-fail 'ServeFile::new("build/spa.html")' 'ServeFile::new("${passthru.web.outPath}/spa.html")' ''; passthru.web = buildNpmPackage { @@ -65,7 +68,7 @@ in postPatch = '' substituteInPlace vite.config.ts \ - --replace 'execSync("git rev-parse --short HEAD").toString().trim()' '"${src.rev}"' + --replace-fail 'execSync("git rev-parse --short HEAD").toString().trim()' '"${src.rev}"' ''; npmDepsHash = "sha256-bKePCxo6+n0EG+4tbbMimPedJ0Hu1O8yZsgspmhobOs="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix b/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix index bb84b843a9..e8d96eb424 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starry/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starry/default.nix index a59fb3127f..cb6535baf3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starry/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 37d38016b8..587d07eaf5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys - preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' export HOME=$TMPDIR ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix b/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix index 688454c8de..4977372ee4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/szyszka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/szyszka/default.nix index 980b37a910..8bd133e6da 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/szyszka/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/szyszka/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { atk gdk-pixbuf gtk4 - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation ]); diff --git a/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix index 6298d84c41..7d3721acb3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-56gy9AH3i4OSvExMuR3n/2hF5pJgbn5JJpxZLXKfu2w="; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; # many tests are failing doCheck = false; @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = [ ]; mainProgram = "tab"; - broken = (stdenv.isDarwin && stdenv.isAarch64); # Added 2023-11-13 + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # Added 2023-11-13 }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix index 9ca82d8f1b..c3fa408aab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix index b362ff4183..905c197cc7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { ncurses ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Unexplained fail # https://github.com/NixOS/nixpkgs/pull/298527#issuecomment-2053758845 "--skip=first_run_prompt_accept" diff --git a/third_party/nixpkgs/pkgs/tools/misc/timidity/default.nix b/third_party/nixpkgs/pkgs/tools/misc/timidity/default.nix index 26f84e383c..ce6e0c7ae8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/timidity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/timidity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; buildInputs = [ libjack2 ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio libobjc ]; @@ -43,12 +43,12 @@ stdenv.mkDerivation rec { "--enable-ncurses" "lib_cv_va_copy=yes" "lib_cv___va_copy=yes" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "lib_cv_va_val_copy=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-audio=darwin,jack" "lib_cv_va_val_copy=no" "timidity_cv_ccoption_rdynamic=yes" @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xf $instruments -C $out/share/timidity/ ''; # This fixup step is unnecessary and fails on Darwin - dontRewriteSymlinks = stdenv.isDarwin; + dontRewriteSymlinks = stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://sourceforge.net/projects/timidity/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix index b6a3682ec7..d8749c4115 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage { OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Fastest way to manage projects as tmux sessions"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index af381a0622..d8b40913c9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -10,7 +10,7 @@ , runCommand , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc -, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter +, withUtempter ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl, libutempter , withSixel ? true }: @@ -88,13 +88,13 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir -p $out/share/bash-completion/completions cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/nix-support echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages ''; passthru = { - terminfo = runCommand "tmux-terminfo" { nativeBuildInputs = [ ncurses ]; } (if stdenv.isDarwin then '' + terminfo = runCommand "tmux-terminfo" { nativeBuildInputs = [ ncurses ]; } (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/share/terminfo/74 cp -v ${ncurses}/share/terminfo/74/tmux $out/share/terminfo/74 # macOS ships an old version (5.7) of ncurses which does not include tmux-256color so we need to provide it from our ncurses. diff --git a/third_party/nixpkgs/pkgs/tools/misc/toastify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/toastify/default.nix index b244aec493..6fde17977e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/toastify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/toastify/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Ps2pRLpPxw+OS1ungQtVQ8beoKpc8pjzQEndMNni08k="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$(mktemp -d) ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 38e1f0d95c..70402b22df 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" "AppKit" ]); diff --git a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix index 4ef5279ef4..99167c87fa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; buildInputs = [ libxcrypt - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ optionals (enableStatic && stdenv.cc.libc ? static) [ stdenv.cc.libc @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { make ${if enableMinimal then "allnoconfig" else - if stdenv.isFreeBSD then + if stdenv.hostPlatform.isFreeBSD then "freebsd_defconfig" else - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "macos_defconfig" else "defconfig" diff --git a/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix index 6ecf2723f0..4ae9306f28 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals withQT [ pyqt5 ] ++ lib.optionals withGTK [ pycairo pygobject3 ] ++ lib.optionals withCurses [ urwid ] - ++ lib.optionals stdenv.isLinux [ pydbus pyinotify ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pydbus pyinotify ] ++ lib.optionals (withGTK || withQT) [ pillow ]); dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tty-clock/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tty-clock/default.nix index 0abb0c668b..f5d70cd207 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tty-clock/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tty-clock/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/xorg62/tty-clock"; license = licenses.bsd3; description = "Digital clock in ncurses"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/twm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/twm/default.nix index bb963d5d1d..3625ceef80 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/twm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/twm/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-gJ5go9V8c97pQZICUD1ksLJhOyJXyVXAWssH3fhrRVQ="; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd twm \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix index 2d339fabc3..11a9162af2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, pkg-config, wrapGAppsHook3 , withLibui ? true, gtk3 -, withUdisks ? stdenv.isLinux, udisks, glib +, withUdisks ? stdenv.hostPlatform.isLinux, udisks, glib , libX11 }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # feel free add them if you have a machine to test platforms = with platforms; linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "usbimager"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 0336923647..a71567b590 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; makeFlags = [ "CARGO=${cargo}/bin/cargo" diff --git a/third_party/nixpkgs/pkgs/tools/misc/uwufetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uwufetch/default.nix index 4dba7dac80..ce5e378b9a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uwufetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uwufetch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # fix command_path for package manager (nix-store) substituteInPlace fetch.c \ --replace "/usr/bin" "/run/current-system/sw/bin" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "local/bin" "bin" \ --replace "local/lib" "lib" \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix index 4a3411d05a..a7380bc8b1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Fast text uwuifier"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index 3b08a82308..e93603d044 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -88,8 +88,8 @@ rustPlatform.buildRustPackage { rdkafka zstd ] - ++ lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rust-jemalloc-sys Security libiconv diff --git a/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix index 2b419e5403..780af1846f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { description = "Command line utility for batch-renaming files"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix index dac2f34dba..a458e6c309 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vrc-get/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoHash = "sha256-WFGY5osZIEYeHQchvuE3ddeqh2wzfZNV+SGqW08zYDI="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix index 0eb71743f0..6200ee77d6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-vseTtok0E0ddg9ALQ1ql3NPPxirfyMPHOSWsM2qu2jU="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix index cd7381243c..0d04a21219 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix @@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa AppKit ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; checkFlags = [ "--skip=help" "--skip=help_short" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix index 786062cfff..fd8841b96b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; buildFeatures = [ "ssl" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix index e23f161f90..265f7f9c35 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -16,10 +16,11 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/wootility \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/wv2/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wv2/default.nix index 3a7bd5d395..8a4ccaed89 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wv2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wv2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.cc.isClang [ (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14") ]; # Linking gobject explicitly fixes missing symbols (such as missing `_g_object_unref`) on Darwin. - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" $(pkg-config gobject-2.0 --libs)" ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix index 093e7152bb..a94f9681a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { lib.optional (gccCross != null) gccCross; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; license = lib.licenses.gpl3; homepage = "http://www.linux-mtd.infradead.org/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix index 3973f8d096..eaa27e34d9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-S8IKBXREJ+0z4Qz9i3RH52btg1Mpk6GjKIJf4ivdt14="; buildInputs = lib.optionals useNcurses [ ncurses ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) ; # I'm picking pancurses for Windows simply because that's the example given in Cursive's diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix index fd26b0f5d2..9f16680759 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ytarchive"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; rev = "v${version}"; - hash = "sha256-mQgpwuTIEHeDv/PzBHpK1sraxFj8Ef3y8vN5bLw5E94="; + hash = "sha256-Y1frd7iJJuNFvLL/C1Y+RrqYC/1LF7P3J9rkPAThp9c="; }; - vendorHash = "sha256-sjwQ/zEYJRkeWUDB7TzV8z+kET8lVRnQkXYbZbcUeHY="; + vendorHash = "sha256-hVAiWJKdDQB+6UlARFdjVATCMiGrEK2US62KAxCquvU="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index 6243a2e466..5523b64689 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { postPatch = '' substituteInPlace "ykman/pcsc/__init__.py" \ - --replace 'pkill' '${if stdenv.isLinux then procps else "/usr"}/bin/pkill' + --replace 'pkill' '${if stdenv.hostPlatform.isLinux then procps else "/usr"}/bin/pkill' ''; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 347221ceed..6493c7244c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://developers.yubico.com/yubikey-personalization-gui"; description = "QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index 105d35349e..e069d0c8d8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv DiskArbitration Foundation diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix index b50d159836..5c1ba44d15 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -10,25 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "refs/tags/v${version}"; - hash = "sha256-4Vb0C6k36VQwiruGj7lu6MjDEeTh84JSHw47YMbFb30="; + hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0="; }; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postPatch = lib.optionalString withFzf '' substituteInPlace src/util.rs \ --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoHash = "sha256-G6Aqn+q48s8Qsoa1EMowtw5bnUnnYWhyGr4hNhVYNMo="; + cargoHash = "sha256-ZRsnoLysNzDIi9hDOqwAzbxcyFQgn2Wv3gRNAjV5HfE="; postInstall = '' installManPage man/man*/* diff --git a/third_party/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix index 6bfd3136dc..b1ee701257 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix @@ -34,7 +34,7 @@ , useGcrypt ? false , enableAirolib ? true , enableRegex ? true -, useAirpcap ? stdenv.isCygwin +, useAirpcap ? stdenv.hostPlatform.isCygwin }: let airpcap-sdk = fetchzip { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { hash = "sha256-niQDwiqi5GtBW5HIn0endnqPb/MqllcjsjXw4pTyFKY="; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace lib/osdep/linux.c --replace-warn /usr/local/bin ${lib.escapeShellArg (lib.makeBinPath [ wirelesstools ])} @@ -72,15 +72,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = lib.singleton (if useGcrypt then libgcrypt else openssl) - ++ lib.optionals stdenv.isLinux [ libpcap zlib libnl iw ethtool pciutils ] - ++ lib.optional (stdenv.isCygwin && stdenv.isClang) libiconv + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpcap zlib libnl iw ethtool pciutils ] + ++ lib.optional (stdenv.hostPlatform.isCygwin && stdenv.hostPlatform.isClang) libiconv ++ lib.optional enableAirolib sqlite ++ lib.optional enableRegex pcre2 ++ lib.optional useAirpcap airpcap-sdk; nativeCheckInputs = [ cmocka expect ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram "$out/bin/airmon-ng" --prefix PATH : ${lib.escapeShellArg (lib.makeBinPath [ ethtool iw @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ''; installCheckTarget = "integration"; - nativeInstallCheckInputs = [ cmocka expect ] ++ lib.optionals stdenv.isLinux [ tcpdump hostapd wpa_supplicant screen ]; + nativeInstallCheckInputs = [ cmocka expect ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcpdump hostapd wpa_supplicant screen ]; meta = { description = "WiFi security auditing tools suite"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix index 9611275805..c84f0e75d3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Id/vjne73w+bDVA8wT7fV1DMXeGtYbSAdwl07UfYJbw="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; cargoPatches = [ # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1 @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ]; # Tries to send large UDP packets that Darwin rejects. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "UDP-based load generator"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix index 97eb911bae..f1864ed72d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ gnutls c-ares libxml2 sqlite zlib libssh2 ] ++ - lib.optional stdenv.isDarwin Security; + lib.optional stdenv.hostPlatform.isDarwin Security; outputs = [ "bin" "dev" "out" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 9d13a32335..43ed2dc16c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - nativeCheckInputs = lib.optionals stdenv.isDarwin [ ps ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ps ]; postInstall = '' wrapProgram "$out/bin/assh" \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix b/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix index 64d13a7b14..1155b2b876 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.2-alpha"; env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; - LANG = if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"; + LANG = if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"; nativeBuildInputs = [ ronn mount ]; src = fetchgit { diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 550266b9da..0c5a6d20a6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' ln --force -s ${./Cargo.lock} Cargo.lock diff --git a/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix index 60988da176..264bddf5b0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix @@ -84,7 +84,7 @@ buildGoModule rec { patchShebangs gui/build.sh wrapPythonProgramsIn branding/scripts - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace pkg/helper/linux.go \ --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn substituteInPlace pkg/vpn/launcher_linux.go \ @@ -103,7 +103,7 @@ buildGoModule rec { qttools which wrapQtAppsHook - ] ++ lib.optional (!stdenv.isLinux) qtinstaller; + ] ++ lib.optional (!stdenv.hostPlatform.isLinux) qtinstaller; buildInputs = [ qtbase @@ -112,7 +112,7 @@ buildGoModule rec { qtgraphicaleffects qtquickcontrols qtquickcontrols2 - ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; # FIXME: building on Darwin currently fails # due to missing debug symbols for Qt, # this should be fixable once darwin.apple_sdk >= 10.13 @@ -142,7 +142,7 @@ buildGoModule rec { (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py) install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${pname}.desktop install -m 444 -D providers/${provider}/assets/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bore-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bore-cli/default.nix index 30a0463ace..d182fd22b5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bore-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bore-cli/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PZDie/lBextHu8EV/butg2pJZFfizeOEdD21I3XFoHk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix index 9af98878b8..4d67cb4c94 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" pname ]; # error[E0793]: reference to packed field is unaligned - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # FIXME can’t test --all-targets and --doc in a single invocation cargoTestFlags = [ "--all-targets" "--workspace" ]; checkFeatures = [ "std" ]; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; + ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Libsystem SystemConfiguration ]; @@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec { license = licenses.isc; maintainers = [ ]; mainProgram = "bore"; - broken = stdenv.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident + broken = stdenv.hostPlatform.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix index e2a6a7a3b6..30bb243454 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY="; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; # Testing this project requires sudo, Docker and network access, etc. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cfspeedtest/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cfspeedtest/default.nix index 61bdad2298..f89e8e677c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cfspeedtest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cfspeedtest/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; license = with licenses; [ mit ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ colemickens ]; mainProgram = "cfspeedtest"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix index 4b8b8e8b97..b18cc56422 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnutls libedit nspr nss readline texinfo ] - ++ lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libseccomp pps-tools ]; configureFlags = [ "--enable-ntp-signd" "--sbindir=$(out)/bin" "--chronyrundir=/run/chrony" - ] ++ lib.optional stdenv.isLinux "--enable-scfilter"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter"; patches = [ # Cleanup the installation script diff --git a/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix index 85705a2723..c60e853a7d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { pkg-config ] ++ # for flock - lib.optional stdenv.isLinux util-linux; + lib.optional stdenv.hostPlatform.isLinux util-linux; buildInputs = [ libuv @@ -70,6 +70,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix index b2a4193ff0..8750967107 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ which ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace "xlc_r gcc" "xlc_r gcc $CC" substitute Makefile Makefile.$CC --replace "CC=gcc" "CC=$CC" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix index 7281583b17..ad6ab959e6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-y5/xOP5YzqsqBxG9c4r9ORyaEf5Ed6D10NFCaKQPchI="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix index 90d335885e..f0a66fcaba 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { timeout = 300; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/chrome/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/chrome/default.nix index fd97c69b31..0ab3085749 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/chrome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/chrome/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' cctools ] @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=${ - if stdenv.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt" + if stdenv.hostPlatform.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt" }" "--with-ca-path=${cacert}/etc/ssl/certs" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/firefox/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/firefox/default.nix index 157aedab48..73b4458ec8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/firefox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/firefox/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' cctools ] @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=${ - if stdenv.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt" + if stdenv.hostPlatform.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt" }" "--with-ca-path=${cacert}/etc/ssl/certs" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index 0336573717..567ddcbf7d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -21,7 +21,7 @@ , opensslSupport ? zlibSupport, openssl , pslSupport ? false, libpsl , rtmpSupport ? false, rtmpdump -, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 +, scpSupport ? zlibSupport && !stdenv.hostPlatform.isSunOS && !stdenv.hostPlatform.isCygwin, libssh2 , wolfsslSupport ? false, wolfssl , rustlsSupport ? false, rustls-ffi , zlibSupport ? true, zlib @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; enableParallelBuilding = true; @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { lib.optional rustlsSupport rustls-ffi ++ lib.optional zlibSupport zlib ++ lib.optional zstdSupport zstd ++ - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices SystemConfiguration @@ -152,16 +152,16 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. "--without-ca-bundle" "--without-ca-path" ] ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [ "--without-ssl" - ] ++ lib.optionals (rustlsSupport && !stdenv.isDarwin) [ + ] ++ lib.optionals (rustlsSupport && !stdenv.hostPlatform.isDarwin) [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" - ] ++ lib.optionals (gnutlsSupport && !stdenv.isDarwin) [ + ] ++ lib.optionals (gnutlsSupport && !stdenv.hostPlatform.isDarwin) [ "--with-ca-path=/etc/ssl/certs" ]; @@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; preCheck = '' patchShebangs tests/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # bad interaction with sandbox if enabled? rm tests/data/test1453 rm tests/data/test1086 @@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; } // lib.optionalAttrs (stdenv.hostPlatform.system != "x86_64-darwin") { static = pkgsStatic.curl; - } // lib.optionalAttrs (!stdenv.isDarwin) { + } // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix index d3ae2cd02c..209b4e9d7a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { boost curl ] - ++ lib.optional stdenv.isDarwin Security - ++ lib.optional (!stdenv.isDarwin) libuuid + ++ lib.optional stdenv.hostPlatform.isDarwin Security + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid ++ lib.optional (enableThirdPartyCopy) gsoap; # using the url below since the github release page states diff --git a/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix index 4045748fc4..de3a484f5d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "dCache access protocol client library"; homepage = "https://github.com/dCache/dcap"; changelog = "https://github.com/dCache/dcap/blob/master/ChangeLog"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index 0b1d157af5..1fc91bf1f0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -120,6 +120,6 @@ in buildGo121Module rec { license = licenses.bsd3; maintainers = with maintainers; [ thoughtpolice domenkozar ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 6221034dc2..d07cc72bed 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ freebsd.libcapsicum freebsd.libcasper ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = lib.optionalString (udev != null && stdenv.isLinux) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + postInstall = lib.optionalString (udev != null && stdenv.hostPlatform.isLinux) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; passthru = { inherit enablePrivSep; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index 5c6d90b00a..99744769ff 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, nettle , libidn, libnetfilter_conntrack, nftables, buildPackages -, dbusSupport ? stdenv.isLinux +, dbusSupport ? stdenv.hostPlatform.isLinux , dbus , nixosTests }: @@ -11,7 +11,7 @@ let "-DHAVE_DNSSEC" ] ++ lib.optionals dbusSupport [ "-DHAVE_DBUS" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_CONNTRACK" "-DHAVE_NFTSET" ]); @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' make -C contrib/lease-tools ''; @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { # module can create it in Nix-land? postInstall = '' install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \ $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \ --replace "/usr/local/sbin" "$out/bin" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6 @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] ++ lib.optionals dbusSupport [ dbus ] - ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack nftables ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnetfilter_conntrack nftables ]; passthru.tests = { prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix index e4a5d097f0..0b32a8c908 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "dnsmonster"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix index 30017b2b76..8d1134cff4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { install -Dm755 -t $man/share/man/man8 dnstracer.8 ''; - buildInputs = [] ++ lib.optionals stdenv.isDarwin [ libresolv ]; + buildInputs = [] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libresolv ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lresolv"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lresolv"; meta = with lib; { description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix index e368e10715..397e87f23a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ installShellFiles just pandoc ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix index 005d24ac32..3afaff496a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-96eUCg0mzgUFLOKxpwRfzj1jH2Z+aDohBTztvRVWln0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; OPENSSL_DIR="${lib.getDev openssl}"; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix index d2639bdf53..9705315f8d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - hash = "sha256-hjebDE7Ts93vtoOTquFbfTWdInhI7HXc4pRxIsvNLtg="; + hash = "sha256-/c2Redb6whfM2D8hHBrcSaQ3YsBESLjeoKFb5a2lFbQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix index 58763cc393..c5f360cd25 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv diff --git a/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix index 59f61d9af7..e0b8d8775c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CJ3Xx5jaTD01Ai7YAY4vB7RB5lU1BIXq7530B6+KeX4="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "TUI tool to use the SSH config for connections"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix index 20f8adf71c..cafcf4bdaf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libsodium libuecc openssl - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libmnl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix index e04699ff74..7fed4c99da 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix index 2d23839a3b..ade3fe16e4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "TLS proxy with mutual authentication support for securing non-TLS backend applications"; homepage = "https://github.com/ghostunnel/ghostunnel#readme"; changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix deleted file mode 100644 index 5b00de2fda..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchurl -, cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect -}: - -stdenv.mkDerivation rec { - pname = "globalprotect-openconnect"; - version = "1.4.9"; - - src = fetchurl { - url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; - hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk="; - }; - - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - - buildInputs = [ openconnect qtwebsockets qtwebengine qtkeychain ]; - - patchPhase = '' - substituteInPlace GPService/gpservice.h \ - --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect; - substituteInPlace GPService/CMakeLists.txt \ - --replace /etc/gpservice $out/etc/gpservice; - ''; - - meta = with lib; { - description = "GlobalProtect VPN client (GUI) for Linux based on OpenConnect that supports SAML auth mode"; - homepage = "https://github.com/yuezk/GlobalProtect-openconnect"; - license = licenses.gpl3Only; - maintainers = [ maintainers.jerith666 ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix b/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix index 64441c1674..2d0e4e32de 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Manager for reverse shells"; homepage = "https://github.com/redcode-labs/GodSpeed"; license = with licenses; [ mit ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix index 105d5f6c68..f28306880f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gp-saml-gui/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk="; }; - buildInputs = lib.optional stdenv.isLinux glib-networking; + buildInputs = lib.optional stdenv.hostPlatform.isLinux glib-networking; nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection glib-networking ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { requests pygobject3 openconnect - ] ++ lib.optional stdenv.isLinux webkitgtk; + ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk; preFixup = '' gappsWrapperArgs+=( diff --git a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix index fb8857afff..5079ce509b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pQ95sS2dGVzZUOyuUpJPamW7RLiUTGu9KgpWLg4wn/w="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = lib.optionals stdenv.isLinux [ iputils ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ iputils ]; postInstall = '' installManPage gping.1 diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix index 24e22436b2..d7a01b92dc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl numactl ]; cmakeFlags = [ "-DgRPC_BUILD_TESTS=ON" ]; makeFlags = [ "grpc_cli" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=format-security"; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index f2dc5dfd6e..90d5bc12ca 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -42,9 +42,9 @@ in stdenv.mkDerivation (finalAttrs: { # TODO: make it work on bsd as well makeFlags = [ "PREFIX=${placeholder "out"}" - ("TARGET=" + (if stdenv.isSunOS then "solaris" - else if stdenv.isLinux then "linux-glibc" - else if stdenv.isDarwin then "osx" + ("TARGET=" + (if stdenv.hostPlatform.isSunOS then "solaris" + else if stdenv.hostPlatform.isLinux then "linux-glibc" + else if stdenv.hostPlatform.isDarwin then "osx" else "generic")) ]; @@ -66,7 +66,7 @@ in stdenv.mkDerivation (finalAttrs: { "LUA_LIB_NAME=lua" "LUA_LIB=${lua5_4}/lib" "LUA_INC=${lua5_4}/include" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "USE_SYSTEMD=yes" "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix index 528bf11e7d..10bd63d489 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.in --replace "gcc" "$CC" substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\"" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e 's|#include |#include |' \ libpcap_stuff.c script.c '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix index e83570f62f..cb0e516327 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ronn ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix index 25c7dbb60e..f37f33a23f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; - buildInputs = lib.optional stdenv.isLinux net-snmp; + buildInputs = lib.optional stdenv.hostPlatform.isLinux net-snmp; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/iftop/default.nix b/third_party/nixpkgs/pkgs/tools/networking/iftop/default.nix index c40a8ee512..fdda3245b8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/iftop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/iftop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s"; preConfigure = '' cp ${automake}/share/automake*/config.{sub,guess} config diff --git a/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix index e62266c2dc..645000dffc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-TL7ZsRbpRdYymJHuoCUCqe/U3Vacb9mtKFh85IOl+PA="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' wrapProgram "$out/bin/ifwifi" \ @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec { # `ifwifi` runtime dep [ networkmanager ] # `wifiscanner` crate's runtime deps - ++ (lib.optional stdenv.isLinux iw) - # ++ (lib.optional stdenv.isDarwin airport) # airport isn't packaged + ++ (lib.optional stdenv.hostPlatform.isLinux iw) + # ++ (lib.optional stdenv.hostPlatform.isDarwin airport) # airport isn't packaged )}" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 5bbe7e4f8d..6aedb474c6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ help2man perl /* for `whois' */ ]; buildInputs = [ ncurses /* for `talk' */ libxcrypt ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild. # A commit to revert this change will be included in the fix PR targeting staging. NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--disable-rsh" "--disable-rlogin" "--disable-rexec" - ] ++ lib.optional stdenv.isDarwin "--disable-servers"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix index 0e6480f58d..4627ef3436 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { installManPage doc/innernet.8.gz installShellCompletion doc/innernet.completions.{bash,fish,zsh} installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} - '' + (lib.optionalString stdenv.isLinux '' + '' + (lib.optionalString stdenv.hostPlatform.isLinux '' find . -regex '.*\.\(target\|service\)' | xargs install -Dt $out/lib/systemd/system find $out/lib/systemd/system -type f | xargs sed -i "s|/usr/bin/innernet|$out/bin/innernet|" ''); diff --git a/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix b/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix index 8952c4004f..a73184265f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-hEBMqEMbWV6GxHPY8j2LsQKBAAHxX+r2EO/9OzGHiKo="; }; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ]; configureFlags = [ "--with-openssl=${openssl.dev}" ]; outputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch b/third_party/nixpkgs/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch deleted file mode 100644 index 8fefb2d6f7..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e8a3a20aed135272a9ec0103f4055411c075f043 Mon Sep 17 00:00:00 2001 -From: Michal Sojka -Date: Mon, 7 Nov 2022 00:07:22 +0100 -Subject: [PATCH] Increase imap_vprintf buffer size - -This fixes "Fatal: buffer too small. Please report a bug." error. See -https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/#msg37731590 -for related discussion. - -When using mbsync with XOAUTH2 authentication (needed for Office365 -mailboxes), the access token used for the LOGIN command may not fit -into the currently used buffer of 1000 characters. In my case, I need -the buffer to be at least 2000 characters long. To make this more -future-proof, I increase the buffer size to 4000 characters. ---- - src/drv_imap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drv_imap.c b/src/drv_imap.c -index c5a7aed..7847192 100644 ---- a/src/drv_imap.c -+++ b/src/drv_imap.c -@@ -528,7 +528,7 @@ imap_vprintf( const char *fmt, va_list ap ) - uint totlen = 0; - const char *segs[MAX_SEGS]; - uint segls[MAX_SEGS]; -- char buf[1000]; -+ char buf[4000]; - - d = buf; - ed = d + sizeof(buf); --- -2.38.1 - diff --git a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix index edf20a6e77..280be724a8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -6,27 +6,23 @@ , withCyrusSaslXoauth2 ? false, cyrus-sasl-xoauth2, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "isync"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw"; + url = "mirror://sourceforge/isync/isync-${finalAttrs.version}.tar.gz"; + hash = "sha256-oMgeEJOHvyedoWFFMQM5nneUav7PXFH5QTxedzVX940="; }; - patches = [ - # Fixes "Fatal: buffer too small" error - ./0001-Increase-imap_vprintf-buffer-size.patch - # Fix #202595: SSL error "Socket error: ... unexpected eof while reading" - # Source: https://sourceforge.net/p/isync/isync/ci/b6c36624f04cd388873785c0631df3f2f9ac4bf0/ - ./work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch - ]; + # Fixes "Fatal: buffer too small" error + # see https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/ + env.NIX_CFLAGS_COMPILE = "-DQPRINTF_BUFF=4000"; nativeBuildInputs = [ pkg-config perl ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; buildInputs = [ openssl db cyrus_sasl zlib ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = lib.optionalString withCyrusSaslXoauth2 '' wrapProgram "$out/bin/mbsync" \ @@ -48,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ primeos ]; mainProgram = "mbsync"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch b/third_party/nixpkgs/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch deleted file mode 100644 index 9177085eca..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch +++ /dev/null @@ -1,76 +0,0 @@ -From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen -Date: Mon, 6 Jun 2022 11:55:37 +0200 -Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL - connections - -gmail apparently doesn't send a close notification (SSL_shutdown()) -before closing the TCP socket. ---- - src/drv_imap.c | 7 +++++-- - src/socket.c | 9 +++++++++ - src/socket.h | 1 + - 3 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/drv_imap.c b/src/drv_imap.c -index fb8d165..6286045 100644 ---- a/src/drv_imap.c -+++ b/src/drv_imap.c -@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux ) - error( "IMAP error: unexpected BYE response: %s\n", cmd ); - /* We just wait for the server to close the connection now. */ - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); - } else { - /* We still need to wait for the LOGOUT's tagged OK. */ - } -@@ -1882,10 +1883,12 @@ static void - imap_cleanup_p2( imap_store_t *ctx, - imap_cmd_t *cmd ATTR_UNUSED, int response ) - { -- if (response == RESP_NO) -+ if (response == RESP_NO) { - imap_cancel_store( &ctx->gen ); -- else if (response == RESP_OK) -+ } else if (response == RESP_OK) { - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); -+ } - } - - /******************* imap_open_store *******************/ -diff --git a/src/socket.c b/src/socket.c -index ac3c847..892cece 100644 ---- a/src/socket.c -+++ b/src/socket.c -@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect ) - conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 ); - } - -+void -+socket_expect_eof( conn_t *sock ) -+{ -+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL -+ if (sock->ssl) -+ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF ); -+#endif -+} -+ - int - socket_read( conn_t *conn, char *buf, uint len ) - { -diff --git a/src/socket.h b/src/socket.h -index 5b1edd0..af679aa 100644 ---- a/src/socket.h -+++ b/src/socket.h -@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) ); - void socket_start_deflate( conn_t *conn ); - void socket_close( conn_t *sock ); - void socket_expect_activity( conn_t *sock, int expect ); -+void socket_expect_eof( conn_t *sock ); - int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */ - char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */ - typedef enum { KeepOwn = 0, GiveOwn } ownership_t; --- -2.38.0 - diff --git a/third_party/nixpkgs/pkgs/tools/networking/jwhois/default.nix b/third_party/nixpkgs/pkgs/tools/networking/jwhois/default.nix index b384043cc2..50959152d7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/jwhois/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/jwhois/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { # Work around error from on aarch64-darwin: # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] # TODO: this should probably be fixed at a lower level than this? - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-undef-prefix"; meta = { description = "Client for the WHOIS protocol allowing you to query the owner of a domain name"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix index a3bf468f21..482347a5ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl readline zlib libidn2 gmp libiconv libunistring gettext ]; - hardeningDisable = lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Required to build with clang 16 or `configure` will fail to detect several standard functions. NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix index 7dac682407..c56cea33ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { libcap_ng libxcrypt curl nspr nss ldns # needed to patch shebangs python3 bash - ] ++ lib.optional stdenv.isLinux libselinux; + ] ++ lib.optional stdenv.hostPlatform.isLinux libselinux; prePatch = '' # Replace wget with curl to save a dependency diff --git a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix index bc6f1d3a1f..0ecd2a0033 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; checkFlags = [ # Network errors for all of these tests diff --git a/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix index fc0ceebc71..6cc7af7e17 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-x6aEas3vmdI24nOys+Y+vuwY7k5cYRAj9oOH73zyV+A="; buildInputs = [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 919b4dda86..c9979a0fee 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { readline sasl libxcrypt - ] ++ lib.optionals stdenv.isLinux [ nettools ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nettools ] ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals guileSupport [ guile_2_2 ]; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!guileSupport) "--without-guile"; nativeCheckInputs = [ dejagnu mkpasswd ]; - doCheck = !stdenv.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly. + doCheck = !stdenv.hostPlatform.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly. doInstallCheck = false; # fails preCheck = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index b56f078549..4b804d0c58 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-09-09T07-53-10Z"; + version = "2024-09-16T17-43-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-K0FuG7c8sD4ingJH/al7TBoTCHKGad7I2RYheTjqAR0="; + sha256 = "sha256-j9NEeTUP/pkEhywhNasQQzTwUBcUwq+KVEGGB1hzVw0="; }; vendorHash = "sha256-KNnYxE3kt/eemnhsRf29SZX0Q+ECzdMFVgcmd7uCsyY="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix index 6942e682a8..378bab7451 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (lib.cmakeBool "UPNPC_BUILD_STATIC" stdenv.hostPlatform.isStatic) ]; - doCheck = !stdenv.isFreeBSD; + doCheck = !stdenv.hostPlatform.isFreeBSD; postInstall = '' mv $out/bin/upnpc-* $out/bin/upnpc diff --git a/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix index e5585be469..dca72a66b1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { homepage = "https://github.com/davrodpin/mole"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; # build fails with go > 1.17 + broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "mole"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix index 908307a3b6..230122a257 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config , makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion, fetchpatch -, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: +, withUtempter ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: stdenv.mkDerivation rec { pname = "mosh"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix index 0e3d43d191..aa8585349d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix @@ -11,7 +11,6 @@ libgpg-error, libsecret, pkg-config, - polkit, python3, qt5compat, qtbase, diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix index 40c6d3ec78..800ea3c48f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix index d36dcef4f0..42b79f978f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses jansson ] ++ lib.optional withGtk gtk3 - ++ lib.optional stdenv.isLinux libcap; + ++ lib.optional stdenv.hostPlatform.isLinux libcap; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix index 070c7fabc1..35cbdfa6bc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-v4qyVaeqSSG9cmkSGeweZIVv3Dgk/mHHvUpA0Cbio3c="; + hash = "sha256-+g8DXvNWs7tqgxeZl7FWudbZRRx9N4/Cb6jQkuxnI98="; }; - vendorHash = "sha256-UJsncAKtjgF0dn7xAJQdKD8YEIwtFcpYJVWG9b66KRU="; + vendorHash = "sha256-JMQgDG0MQuDJBrcz7uf872bXkz4BM+bC1v/GhkuxeYU="; meta = with lib; { description = "Website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/narrowlink/default.nix b/third_party/nixpkgs/pkgs/tools/networking/narrowlink/default.nix index 142d6a680b..531b0e7f60 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/narrowlink/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/narrowlink/default.nix @@ -1,8 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, pkg-config -, openssl , stdenv , darwin }: @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix index 68bcc62655..e2924665bd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gnutls - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl linuxHeaders ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { test = nixosTests.nbd; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix index c31e6333b6..883d2e48af 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # gpshare.o:(.bss+0x0): first defined here env.NIX_CFLAGS_COMPILE = toString ([ "-fcommon" ] # these are required for the configure script to work with clang - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-implicit-int" "-Wno-implicit-function-declaration" ]); diff --git a/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix index e5a3837657..5619c5b5c3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] - ++ lib.optional stdenv.isLinux systemd; + ++ lib.optional stdenv.hostPlatform.isLinux systemd; meta = with lib; { description = "Brand new release of the Djbdns"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix index ea111db6d8..cffab15b49 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -2,7 +2,7 @@ , lib , nixosTests , nix-update-script -, buildGo123Module +, buildGoModule , fetchFromGitHub , installShellFiles , pkg-config @@ -29,28 +29,28 @@ let signal = "netbird-signal"; }; in -buildGo123Module rec { +buildGoModule rec { pname = "netbird"; - version = "0.29.3"; + version = "0.29.4"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-0KLx3kxXGriKZqyvcLRoz8y4y729ZQVuOKDkm8p2te4="; + hash = "sha256-W71CE83r/RcPdBjzfT+FSh72UcKcTmIuagkrC1eaeNk="; }; vendorHash = "sha256-CD34U+Z8bUKN0Z4nxIVC+mYDp71Q8q1bmUypRDGgb3U="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; - buildInputs = lib.optionals (stdenv.isLinux && ui) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [ gtk3 libayatana-appindicator libX11 libXcursor libXxf86vm - ] ++ lib.optionals (stdenv.isDarwin && ui) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ Cocoa IOKit Kernel @@ -88,7 +88,7 @@ buildGo123Module rec { --fish <($out/bin/${binary} completion fish) \ --zsh <($out/bin/${binary} completion zsh) '') - modules) + lib.optionalString (stdenv.isLinux && ui) '' + modules) + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' mkdir -p $out/share/pixmaps cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png diff --git a/third_party/nixpkgs/pkgs/tools/networking/netcat-openbsd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netcat-openbsd/default.nix index 3f561716ed..ec82ec1691 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netcat-openbsd/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "nc"; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix index bb4f78b086..c0e0a9d348 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-Aoa3cqjnyPXxS0KRZ+2L0EK5KhjEUVQtQuKbO+ouo3I="; + sha256 = "sha256-LUIKVMI8ljPzAmrq3jYQ+ZDCGs2p+7EO8ECp1A1osUk="; }; - vendorHash = "sha256-AhoS/I1ypHI4oxsBaFGsMA74eX8so1kAf5Fui36uDaE="; + vendorHash = "sha256-1zjXy6x/IzBY7MrtAtynmoneEpjAnYv/H5IsMZtRQAo="; doCheck = false; # Tests require a network connection. diff --git a/third_party/nixpkgs/pkgs/tools/networking/notemap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/notemap/default.nix index 726b24469a..0611665d66 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/notemap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/notemap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libressl - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntopng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ntopng/default.nix index 134c6f6575..04f5648dd3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ntopng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ntopng/default.nix @@ -5,7 +5,6 @@ curl, expat, fetchFromGitHub, - fetchpatch, git, json_c, libcap, diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix index 1ba389e38c..2321455b8b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" "--with-yielding-select=yes" - ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-linuxcaps"; buildInputs = [ openssl perl ] - ++ lib.optionals stdenv.isLinux [ pps-tools libcap ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pps-tools libcap ]; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix index a6d8affd4d..aa983c12a4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-yOSCkOIprQoAGxPi1jsHPmQ9bVaudSNw13jL4jTNehY="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] - ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix index 71bc431354..efd8fe7534 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ks7n/x3RhjQbITL2hxiFkjxpZ5tcYMUyyfR/T7Kq/uU="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/onetun/default.nix b/third_party/nixpkgs/pkgs/tools/networking/onetun/default.nix index 4bc18cee46..61f2ce7f3f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/onetun/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/onetun/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-TRfr4riMzR/MbsV2RiQNlPoPLhHK5EScNBCeyyamfgE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix index 0dccb0e92f..82040f64a8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix @@ -16,7 +16,7 @@ , pcsclite , vpnc-scripts , PCSC -, useDefaultExternalBrowser ? stdenv.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile +, useDefaultExternalBrowser ? stdenv.hostPlatform.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile , xdg-utils , autoreconfHook }: @@ -34,8 +34,8 @@ stdenv.mkDerivation { ]; buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] - ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optionals stdenv.isLinux [ p11-kit pcsclite ] + ++ lib.optional stdenv.hostPlatform.isDarwin PCSC + ++ lib.optionals stdenv.hostPlatform.isLinux [ p11-kit pcsclite ] ++ lib.optional useDefaultExternalBrowser xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index 91ec26c96a..5d416e0160 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -7,7 +7,7 @@ , ppp , systemd , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, withPpp ? stdenv.isLinux +, withPpp ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix index 496ea270c8..c1cf38dfa8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withKerberos (assert krb5 != null; "--with-kerberos5=${lib.getDev krb5}") - ++ lib.optional stdenv.isDarwin "--disable-libutil" + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil" ++ lib.optional (!linkOpenssl) "--without-openssl" ++ lib.optional withLdns "--with-ldns" ++ extraConfigureFlags; @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; enableParallelChecking = false; - nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.isDarwin) hostname; + nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) hostname; preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # construct a dummy HOME export HOME=$(realpath ../dummy-home) @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { # integration tests hard to get working on darwin with its shaky # sandbox # t-exec tests fail on musl - checkTarget = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" + checkTarget = lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" # other tests are less demanding of the environment ++ [ "unit" "file-tests" "interop-tests" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix index d4035df7ce..c7fa7a222f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ lz4 lzo openssl ] - ++ optionals stdenv.isLinux [ libcap_ng libnl pam ] + ++ optionals stdenv.hostPlatform.isLinux [ libcap_ng libnl pam ] ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; configureFlags = optional useSystemd "--enable-systemd" ++ optional pkcs11Support "--enable-pkcs11" - ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; + ++ optional stdenv.hostPlatform.isDarwin "--disable-plugin-auth-pam"; # We used to vendor the update-systemd-resolved script inside libexec, # but a separate package was made, that uses libexec/openvpn. Copy it diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix index d5446fedb5..608ce21c99 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.unix; # Undefined symbols for architecture arm64: "_FSFindFolder" - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix index 26001c37e9..4a09295b79 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = # fix build with linux headers >= 5.13 - lib.optional stdenv.isLinux + lib.optional stdenv.hostPlatform.isLinux (fetchpatch { name = "fix-build-linux-headers-gte-5.13.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch?id=7ce35657f269c3b7016e8940ad36e59cf06e12a4"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/phantomsocks/default.nix b/third_party/nixpkgs/pkgs/tools/networking/phantomsocks/default.nix index bb8aad8740..1a720efb93 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/phantomsocks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/phantomsocks/default.nix @@ -4,8 +4,8 @@ , stdenv , libpcap # Cann't be build with both pcap and rawsocket tags -, withPcap ? (!stdenv.isLinux && !withRawsocket) -, withRawsocket ? (stdenv.isLinux && !withPcap) +, withPcap ? (!stdenv.hostPlatform.isLinux && !withRawsocket) +, withRawsocket ? (stdenv.hostPlatform.isLinux && !withPcap) }: buildGoModule rec { diff --git a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix index f4bb164939..ac84016c4a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lintl"; passthru = { updateScript = gnome.updateScript { diff --git a/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix index 542339b05d..3cd43ec9a8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix @@ -14,17 +14,16 @@ , withMysql ? true, libmysqlclient, zlib, numactl , gnutlsSupport ? false, gnutls , testers -, pmacct }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.7.9"; pname = "pmacct"; src = fetchFromGitHub { owner = "pmacct"; repo = "pmacct"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-3gV6GUhTQnH09NRIJQI0xBn05Bgo3AJsE2cSxNPXITo="; }; @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional gnutlsSupport "--enable-gnutls"; passthru.tests = { - version = testers.testVersion { package = pmacct; command = "pmacct -V"; }; + version = testers.testVersion { package = finalAttrs.finalPackage; command = "pmacct -V"; }; }; meta = with lib; { @@ -70,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix index 3b8b80ffe3..5359195631 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix @@ -16,12 +16,12 @@ , openvpn , electron }: let - version = "1.3.3785.81"; + version = "1.3.4026.10"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-0tlWX9vHiFHewiisI8lwsQdHyEhntu+x415hfbymhIo="; + sha256 = "sha256-3P2MEQy9RE2dY7aRCGQl+kmVIaRZp6VvrcHQUzhiAEY="; }; cli = buildGoModule { @@ -29,7 +29,7 @@ inherit version src; modRoot = "cli"; - vendorHash = "sha256-1sAJbEZHagG6hnZBkb6EbQpSdNmTyTWfKpbektXSWYU="; + vendorHash = "sha256-wwPgyIo14zpA+oCJH0CQ4+7zyP+Itxbd6S0P7t01wBw="; postInstall = '' mv $out/bin/cli $out/bin/pritunl-client @@ -41,14 +41,14 @@ inherit version src; modRoot = "service"; - vendorHash = "sha256-QvuEQX1+sJOGB1AJNhnM3pVPxGmizDu8EN1yRspXjhU="; + vendorHash = "sha256-uy8+R4l3e4YAWMxWWbVHhkwxvbOsY5PF7fs1dVyMIAg="; nativeBuildInputs = [ makeWrapper ]; postPatch = '' sed -Ei service/profile/scripts.go \ -e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed -Ei service/profile/scripts.go \ -e 's|(/usr)?/s?bin/busctl\b|busctl|g' \ -e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \ @@ -57,7 +57,7 @@ postInstall = '' mv $out/bin/service $out/bin/pritunl-client-service - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/lib/systemd/system/ cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/ substituteInPlace $out/lib/systemd/system/pritunl-client.service \ @@ -70,7 +70,7 @@ which gnused gnugrep - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openresolv systemd iproute2 @@ -83,7 +83,7 @@ --prefix PATH : ${lib.makeBinPath hookScriptsDeps} \ --add-flags "--setenv PATH \$PATH" ''; - in lib.optionalString stdenv.isLinux '' + in lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/pritunl-client-service \ --prefix PATH : "${lib.makeBinPath ([ openvpn-wrapped ])}" ''; @@ -113,7 +113,7 @@ in stdenv.mkDerivation { makeWrapper ${electron}/bin/electron $out/bin/pritunl-client-electron \ --add-flags $out/lib/pritunl_client_electron - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/lib/systemd/system/ ln -s ${service}/lib/systemd/system/pritunl-client.service $out/lib/systemd/system/ diff --git a/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix b/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix index 2c28e36656..2dcb9b21b6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { passthru.tests.quicktun = nixosTests.quicktun; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Very simple, yet secure VPN software"; homepage = "http://wiki.ucis.nl/QuickTun"; maintainers = with maintainers; [ h7x4 ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix index d2570cdc21..05f552ea16 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rabtap"; - version = "1.42"; + version = "1.43"; src = fetchFromGitHub { owner = "jandelgado"; repo = "rabtap"; rev = "v${version}"; - sha256 = "sha256-+e8HHd2j8M2EJzfCQtohdlp+24JFZ1kA2/t+VSqFDAI="; + sha256 = "sha256-OUpDk6nfVbz/KP7vZeZV2JfbCzh/KcuxG015/uxYuEI="; }; - vendorHash = "sha256-uRlFzhHtpZSie4Fmtj9YUPn+c7+Gvimlk1q8CcXFYmg="; + vendorHash = "sha256-V7AkqmEbwuW2Ni9b00Zd22ugk9ScGWf5wauHcQwG7b0="; meta = with lib; { description = "RabbitMQ wire tap and swiss army knife"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix b/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix index f8a1cfd466..a1fd639b72 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix @@ -21,10 +21,10 @@ buildGoModule rec { vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Kernel - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXcursor xorg.libXi diff --git a/third_party/nixpkgs/pkgs/tools/networking/rewrk/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rewrk/default.nix index a76d666117..c4f4755f4b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rewrk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rewrk/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix index 9848dbdd17..dba12bf58a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Port listener and reverse shell"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix index ec4725e9f2..ad343c00ca 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "S3 cli client with multi configs with diffent provider"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index d9c834e082..18c7ca632d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.20.4"; + version = "1.21.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-UDr1/5PlK395CnWbp3eDTniltZYrFZ6raVBiqsVaCZs="; + hash = "sha256-B4RufyxqcKd5FJulKRV+33sos+cYrL2/QPmKEYw3aTU="; }; - cargoHash = "sha256-xrD0vImCZwaAaoVWC/Wlj6Gvm0COwmINJdlBlud9+7Y="; + cargoHash = "sha256-2uYLrYFuzvaOZxw2hN4DcrEbwW5rnXxqKoI2q6yZaGU="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; buildFeatures = [ "trust-dns" diff --git a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix index 6a1ce2f4a0..b26b211461 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-MJ1Ym/yBm28V0uXoWRs8DG9pNiT1Bg7qwGek2ad1fek="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isLinux [ + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux [ "-lgcc_s" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix index fb0e8600c4..8d034c1d11 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "sing-box"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-yPIlijm5NBtBT2+bkS0sJvPb/Lwqq/ZOcl5g848BvRA="; + hash = "sha256-A9FfATNCS3UaW6YLORIApsgj0VK2jPyg+Ha2gcq6Keo="; }; vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/slowlorust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slowlorust/default.nix index c48257130b..d5e924d102 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slowlorust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slowlorust/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sockperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sockperf/default.nix index ed071322f2..6181138a7b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sockperf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sockperf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Network Benchmarking Utility"; homepage = "https://github.com/Mellanox/sockperf"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix index b70aaa95aa..322d735e64 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-0YPCBzidE1+LgIYk457eSoerLvQuuZs9cTd7uUt1Lr8="; # Fail for unclear reasons (only on darwin) - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=speedtest::tests::test_get_configuration" "--skip=speedtest::tests::test_get_server_list_with_config" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/srelay/default.nix b/third_party/nixpkgs/pkgs/tools/networking/srelay/default.nix index a8d6a33ac3..d54d4d7901 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/srelay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/srelay/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.bsd3; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "srelay"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix index 8aaebd710e..9972af91f1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] ++ lib.optionals enableTNC [ trousers sqlite libxml2 ] - ++ lib.optionals stdenv.isLinux [ systemd.dev pam iptables ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev pam iptables ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) ++ lib.optionals enableNetworkManager [ networkmanager glib ]; patches = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ./updown-path.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' # glibc-2.26 reorganized internal includes sed '1i#include ' -i src/libstrongswan/utils/utils/memory.h @@ -60,14 +60,14 @@ stdenv.mkDerivation rec { "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-chapoly" "--enable-curl" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-farp" "--enable-dhcp" "--enable-systemd" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--enable-xauth-pam" "--enable-forecast" "--enable-connmark" "--enable-af-alg" ] - ++ lib.optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock" ++ lib.optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { "--enable-nm" "--with-nm-ca-dir=/etc/ssl/certs" ] # Taken from: https://wiki.strongswan.org/projects/strongswan/wiki/MacOSX - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-systemd" "--disable-xauth-pam" "--disable-kernel-netlink" diff --git a/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix b/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix index c62ad29e01..07c91a9081 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # requires internet access checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix index fdff493abd..1d5fbf4c34 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { dbus openssl samba - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" "AppKit" ]); diff --git a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix index a26daf4264..647bc18e27 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-Wno-error=maybe-uninitialized" ]; - hardeningDisable = lib.optionals stdenv.isAarch64 [ + hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [ # error: 'read' writing 1 byte into a region of size 0 overflows the destination "fortify3" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/toxvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/toxvpn/default.nix index 555960da39..dc6ae0daa1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/toxvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/toxvpn/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation { }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ lib.optionals stdenv.isLinux [ libcap systemd ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap systemd ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isLinux [ "-DSYSTEMD=1" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DSYSTEMD=1" ]; postInstall = "$out/bin/toxvpn -h"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix b/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix index 3d6d80ef47..859b8acb5b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [pkg-config]; buildInputs = [openssl] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); diff --git a/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix index eb05a666b4..1e4bd4404f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "trurl"; - version = "0.14"; + version = "0.16"; src = fetchFromGitHub { owner = "curl"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-BzsDvEsUntVwTPY/+kIKOhznDIabfioT2y4cofD+eTg="; + hash = "sha256-Og7+FVCBWohVd58GVxFN3KChcG0Kts1MokiOQXZ1OTc="; }; outputs = [ "out" "dev" "man" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tuic/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tuic/default.nix index fc1270e01a..a2a0bfc2f0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tuic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tuic/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec{ hash = "sha256-VoNr91vDqBlt9asT/dwCeYk13UNiDexNNiKwD5DSn8k="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); diff --git a/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix index 4505568083..7f31297059 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Expose your local web server to the internet with a public URL"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tuntox/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tuntox/default.nix index e59a615e26..07fa3e3160 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tuntox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tuntox/default.nix @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace gitversion.h --replace '7d45afdf7d00a95a8c3687175e2b1669fa1f7745' '365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Makefile --replace ' -static ' ' ' substituteInPlace Makefile --replace 'CC=gcc' ' ' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.mac --replace '.git/HEAD .git/index' ' ' substituteInPlace Makefile.mac --replace '/usr/local/lib/libtoxcore.a' '${libtoxcore}/lib/libtoxcore.a' substituteInPlace Makefile.mac --replace '/usr/local/lib/libsodium.a' '${libsodium}/lib/libsodium.dylib' @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' make - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' make -f Makefile.mac tuntox ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix index 1b36709baa..ab43b9e5a4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tunwg"; - version = "24.01.15+9f04d73"; + version = "24.09.18+760ee81"; src = fetchFromGitHub { owner = "ntnj"; repo = "tunwg"; rev = "v${version}"; - hash = "sha256-M7iMl80uxw0hKg4sK8Tv6U5+nMOK8eTfb9SGn+U2+8E="; + hash = "sha256-+vgl7saHp1Co35nkxQ+IhqYr6GdGd0JIFEFrezQd5Yo="; }; - vendorHash = "sha256-VlH41hOWC5QBCYZxiKCUZRmw2vHRbbPyzToRMU6kDO8="; + vendorHash = "sha256-5BJFAnsmx6lbGQTx/6dIdcsETsllCr6C3wPbB2Gvj5Y="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/uwimap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/uwimap/default.nix index a39f0d4660..a359e7677a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/uwimap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/uwimap/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "RANLIB=${stdenv.cc.targetPrefix}ranlib" - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then "osx" else "lnp") # Linux with PAM modules; - ] ++ lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC"; # -fPIC is required to compile php with imap on x86_64 systems + ] ++ lib.optional stdenv.hostPlatform.isx86_64 "EXTRACFLAGS=-fPIC"; # -fPIC is required to compile php with imap on x86_64 systems hardeningDisable = [ "format" ]; buildInputs = [ openssl - (if stdenv.isDarwin then libkrb5 else pam) # Matches the make target. + (if stdenv.hostPlatform.isDarwin then libkrb5 else pam) # Matches the make target. ]; patches = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("ARRC=${stdenv.cc.targetPrefix}ar rc") ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${openssl.dev}/include/openssl"; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 021d6a7085..b9cb17c1ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.17.1"; + version = "5.19.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-22Jvt64RS1BVHU6y2hIW8jcyzXo/36ogyAfFBbQXtvI="; + hash = "sha256-07VhbxrSG911GD+AT9/d5fSUm3SBl/tbvYKCOtIzpVQ="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-yUVQ3H4m9gyyMFQY2k3gCx/EVKGf0fGZmJ52NW7vTW8="; + vendorHash = "sha256-3OCV4QH4HHJtienFy6w1bdOo6yKL5eGdT/B7SPSnLvg="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix b/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix index c41f4b414a..e06a03b8ed 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; cargoBuildFlags = [ "--workspace" diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix index ce8b04c35f..6ca66d44e6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix @@ -20,10 +20,10 @@ buildPythonApplication rec { sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace vpn_slice/mac.py \ --replace "'/sbin/route'" "'${unixtools.route}/bin/route'" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace vpn_slice/linux.py \ --replace "'/sbin/ip'" "'${iproute2}/bin/ip'" \ --replace "'/sbin/iptables'" "'${iptables}/bin/iptables'" diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix index e0319ed4bf..9a757c73cf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation { preFixup = '' substituteInPlace $out/bin/vpnc-script \ --replace "which" "type -P" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/bin/vpnc-script \ --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" \ --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl" '' + '' wrapProgram $out/bin/vpnc-script \ - --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv iproute2 ])}" + --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openresolv iproute2 ])}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix index 4a9f0936f9..f3f222d5ad 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix @@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; nativeCheckInputs = [ perlPackages.TestPerlCritic perlPackages.TestPod perlPackages.TestPodCoverage ]; # Linting and formatting checks are of no interest for us. @@ -24,7 +24,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' install -Dt $out/bin wakeonlan installManPage blib/man1/wakeonlan.1 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/wakeonlan ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix index b4a34ba22a..a2c16fae07 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Test 01 tries to create a wireguard interface, which requires sudo. doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix index 0fbdd80332..0bfdf8affc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -31,15 +31,16 @@ stdenv.mkDerivation rec { buildInputs = [ libidn2 zlib pcre libuuid ] ++ lib.optional withOpenssl openssl ++ lib.optional withLibpsl libpsl - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices perlPackages.perl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices perlPackages.perl ]; configureFlags = [ (lib.withFeatureAs withOpenssl "ssl" "openssl") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html "--without-included-regex" ]; + __darwinAllowLocalNetworking = true; doCheck = true; preCheck = '' patchShebangs tests fuzz @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's/localhost/127.0.0.1/g' done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # depending on the underlying filesystem, some tests # creating exotic file names fail for f in tests/Test-ftp-iri.px \ @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { checkInputs = [ perlPackages.HTTPDaemon python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ perlPackages.IOSocketSSL ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix index 85512aec06..7445b425f0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { zstd ] ++ lib.optionals sslSupport [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index ebac01f063..855f620b44 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postFixup = '' substituteInPlace $out/lib/systemd/system/wg-quick@.service \ --replace /usr/bin $out/bin - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for f in $out/bin/*; do # Which firewall and resolvconf implementations to use should be determined by the # environment, we provide the "default" ones as fallback. @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ procps iproute2 ]} \ --suffix PATH : ${lib.makeBinPath [ iptables openresolv ]} done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/bin/*; do wrapProgram $f \ --prefix PATH : ${lib.makeBinPath [ wireguard-go ]} diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-vanity-address/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-vanity-address/default.nix index cc7ebc557f..969e9187db 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-vanity-address/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-vanity-address/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SjzcVIQ9HwhP6Y/uCwXGSdZgrYcUQ9kE/Bow8pyOKNo="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-0bkyopkssqH0vfaWkFC3dV2o7Q3EuDEOM8JvRB9ekLU="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wrk2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wrk2/default.nix index 6d29887051..9bc8401efa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wrk2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wrk2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "wrk2"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix index 5df8e7903b..2ab8be19c4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = lib.optionals withNativeTls - (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.SystemConfiguration ] else [ openssl ]); + (if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.SystemConfiguration ] else [ openssl ]); # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix index 1ceb6380aa..60da8d7e6e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix @@ -78,11 +78,11 @@ stdenv.mkDerivation (finalAttrs: { scitokens-cpp zlib ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58 fuse ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd voms ] @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs genversion.sh substituteInPlace cmake/XRootDConfig.cmake.in \ --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )' ''; @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { + '' moveToOutput "bin/xrootd-config" "$dev" moveToOutput "bin/.xrootd-config-wrapped" "$dev" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p "$out/lib/systemd/system" install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket ''; @@ -127,12 +127,12 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableTestRunner [ "-DFORCE_ENABLED=TRUE" "-DENABLE_DAVIX=TRUE" - "-DENABLE_FUSE=${if (!stdenv.isDarwin) then "TRUE" else "FALSE"}" # not supported + "-DENABLE_FUSE=${if (!stdenv.hostPlatform.isDarwin) then "TRUE" else "FALSE"}" # not supported "-DENABLE_MACAROONS=OFF" "-DENABLE_PYTHON=FALSE" # built separately "-DENABLE_SCITOKENS=TRUE" "-DENABLE_TESTS=TRUE" - "-DENABLE_VOMS=${if stdenv.isLinux then "TRUE" else "FALSE"}" + "-DENABLE_VOMS=${if stdenv.hostPlatform.isLinux then "TRUE" else "FALSE"}" ]; postFixup = lib.optionalString (externalEtc != null) '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix index 21d7a2a038..6d1a0958d2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -1,6 +1,5 @@ { lib , runCommandLocal -, buildPlatform , xrootd }: diff --git a/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix b/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix index 7e99d3aa06..bc02bac41d 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix @@ -29,13 +29,13 @@ rustPlatform.buildRustPackage rec { checkInputs = [ cacert ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration gcc.cc.lib ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; }; diff --git a/third_party/nixpkgs/pkgs/tools/nix/gridlock/default.nix b/third_party/nixpkgs/pkgs/tools/nix/gridlock/default.nix index e49750eba5..ddfa9ee983 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/gridlock/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/gridlock/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/info/default.nix b/third_party/nixpkgs/pkgs/tools/nix/info/default.nix index 73c336afe0..7b29f9c43c 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/info/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/info/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { path = lib.makeBinPath ([ coreutils findutils gnugrep - ] ++ (lib.optionals stdenv.isDarwin [ darwin.DarwinTools ])); - is_darwin = if stdenv.isDarwin then "yes" else "no"; + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ])); + is_darwin = if stdenv.hostPlatform.isDarwin then "yes" else "no"; sandboxtest = ./sandbox.nix; relaxedsandboxtest = ./relaxedsandbox.nix; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix index 2784ac2518..9be2431d59 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix @@ -52,9 +52,9 @@ rustPlatform.buildRustPackage rec { openssl zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix index 304c5ff8ce..5075705a2c 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchCrate , fetchFromGitHub -, libiconv , openssl , pkg-config , Security @@ -26,9 +25,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles nix ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Security SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index b0b7bc82e0..70b49237f1 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5KV2VDsPmSgrdZIqCuQ5gjgCVs/Ki6uG6GTwjmtKLlQ="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; meta = with lib; { description = "Generate documentation for Nix functions"; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix index 6e98df7890..cef57884ab 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix @@ -6,6 +6,8 @@ # TODO: replace indirect self-reference by proper self-reference # https://github.com/NixOS/nixpkgs/pull/119942 nixos-install-tools, + nixos-install, + nixos-enter, runCommand, nixosTests, binlore, @@ -18,9 +20,8 @@ in name = "nixos-install-tools-${version}"; paths = lib.attrValues { # See nixos/modules/installer/tools/tools.nix - inherit (config.system.build) - nixos-install nixos-generate-config nixos-enter; - + inherit (config.system.build) nixos-generate-config; + inherit nixos-install nixos-enter; inherit (config.system.build.manual) nixos-configuration-reference-manpage; }; diff --git a/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix b/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix index 7ea75baab1..37f48f5470 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix @@ -21,7 +21,7 @@ in rustPlatform.buildRustPackage rec { cargoHash = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k="; - buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); nativeBuildInputs = [ makeWrapper ]; # (Almost) all tests require internet diff --git a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix index 9cc48659d4..079459f2a2 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withJson "json"; # tests are failing on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Lints and suggestions for the nix programming language"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/akku/overrides.nix b/third_party/nixpkgs/pkgs/tools/package-management/akku/overrides.nix index 8617a3bdb5..ecc11d9453 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/akku/overrides.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/akku/overrides.nix @@ -11,8 +11,8 @@ let # debugging showLibs = pkg: old: { preCheck = "echo $CHEZSCHEMELIBDIRS"; }; runTests = pkg: old: { doCheck = true; }; - brokenOnAarch64 = _: lib.addMetaAttrs { broken = stdenv.isAarch64; }; - brokenOnx86_64Darwin = lib.addMetaAttrs { broken = stdenv.isDarwin && stdenv.isx86_64; }; + brokenOnAarch64 = _: lib.addMetaAttrs { broken = stdenv.hostPlatform.isAarch64; }; + brokenOnx86_64Darwin = lib.addMetaAttrs { broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; in { chez-srfi = joinOverrides [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/ciel/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/ciel/default.nix index ed1103b869..cb13848695 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/ciel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/ciel/default.nix @@ -2,7 +2,6 @@ , bash , dbus , fetchFromGitHub -, fetchpatch , installShellFiles , libgit2 , libssh2 diff --git a/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix index 3db0be269b..2f86a714d5 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-PW9OS/ccRxigP0ikk1XR4QhQX4j9+ALQz0FMKXF3yRA="; + hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ="; }; - cargoHash = "sha256-lNz4E+dcJ6ACkNraM4DUR4yFbkWgAZ4ngbAML8JYVtE="; + cargoHash = "sha256-poQDzC5DLkwLMwt5ieZCSyrQIKkuYq6hu6cj7lcDb4c="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix index 48d1b79651..92b880d142 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -61,12 +61,12 @@ stdenv.mkDerivation rec { (if enableNginxWebApplication then "--with-nginx" else "--without-nginx") (if enableXinetdService then "--with-xinetd" else "--without-xinetd") (if enableS6RCService then "--with-s6-rc" else "--without-s6-rc") - (if stdenv.isDarwin then "--with-launchd" else "--without-launchd") + (if stdenv.hostPlatform.isDarwin then "--with-launchd" else "--without-launchd") "--with-job-template=${jobTemplate}" ] ++ lib.optional enableLegacy "--enable-legacy"; buildInputs = [ getopt netcat ] - ++ lib.optional stdenv.isLinux systemd + ++ lib.optional stdenv.hostPlatform.isLinux systemd ++ lib.optional enableEjabberdDump ejabberd ++ lib.optional enableMySQLDatabase mariadb.out ++ lib.optional enablePostgreSQLDatabase postgresql diff --git a/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index db095e59c4..6b9c1f3c2e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -13,7 +13,7 @@ , autoreconfHook , pkg-config , diffutils -, glibc ? !stdenv.isDarwin +, glibc ? !stdenv.hostPlatform.isDarwin , darwin }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "--with-admindir=/var/lib/dpkg" "PERL_LIBDIR=$(out)/${perl.libPrefix}" "TAR=${gnutar}/bin/tar" - ] ++ lib.optional stdenv.isDarwin "--disable-linker-optimisations"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-linker-optimisations"; enableParallelBuilding = true; @@ -67,13 +67,13 @@ stdenv.mkDerivation rec { --replace '"rm"' \"${coreutils}/bin/rm\" \ --replace '"cat"' \"${coreutils}/bin/cat\" \ --replace '"diff"' \"${diffutils}/bin/diff\" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace src/main/help.c \ --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" ''; buildInputs = [ perl zlib bzip2 xz zstd libmd ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ makeWrapper perl autoreconfHook pkg-config ]; postInstall = diff --git a/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix index fce59cff11..dd1580bc43 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix @@ -65,7 +65,7 @@ assert (hash == null) -> (src != null); enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, enableStatic ? stdenv.hostPlatform.isStatic, - withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), + withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), aws-sdk-cpp, # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, @@ -124,7 +124,7 @@ stdenv.mkDerivation { mdbook-linkcheck doxygen ] - ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]; buildInputs = [ @@ -145,8 +145,8 @@ stdenv.mkDerivation { lix-doc ] ++ lib.optionals (!isLegacyParser) [ pegtl ] - ++ lib.optionals stdenv.isDarwin [ Security ] - ++ lib.optionals (stdenv.isx86_64) [ libcpuid ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ] + ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ] ++ lib.optionals withLibseccomp [ libseccomp ] ++ lib.optionals withAWS [ aws-sdk-cpp ]; @@ -166,7 +166,7 @@ stdenv.mkDerivation { mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} @@ -194,14 +194,14 @@ stdenv.mkDerivation { (lib.mesonBool "enable-tests" true) (lib.mesonBool "enable-docs" enableDocumentation) (lib.mesonEnable "internal-api-docs" enableDocumentation) - (lib.mesonBool "enable-embedded-sandbox-shell" (stdenv.isLinux && stdenv.hostPlatform.isStatic)) + (lib.mesonBool "enable-embedded-sandbox-shell" (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic)) (lib.mesonEnable "seccomp-sandboxing" withLibseccomp) (lib.mesonOption "store-dir" storeDir) (lib.mesonOption "state-dir" stateDir) (lib.mesonOption "sysconfdir" confDir) ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") ]; @@ -219,7 +219,7 @@ stdenv.mkDerivation { mkdir -p $out/nix-support echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for lib in liblixutil.dylib liblixexpr.dylib; do install_name_tool \ -change "${lib.getLib boost}/lib/libboost_context.dylib" \ @@ -272,8 +272,8 @@ stdenv.mkDerivation { # fortify breaks the build with lto and musl for some reason ++ lib.optional stdenv.hostPlatform.isMusl "fortify"; - # hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; - separateDebugInfo = stdenv.isLinux && !enableStatic; + # hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; + separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic; enableParallelBuilding = true; # Used by (1) test which has dynamic port assignment. diff --git a/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix index 789a486554..7f5fda6246 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { # CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0" # https://github.com/shirou/gopsutil/issues/976 - CGO_ENABLED = if stdenv.isLinux then 1 else 0; + CGO_ENABLED = if stdenv.hostPlatform.isLinux then 1 else 0; meta = with lib; { homepage = "https://mynewt.apache.org/"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix index f7b3777f7f..f594b0648b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { # Due to a Rust bug, setting -C relro-level to anything including "off" on # macOS will cause link errors - env = lib.optionalAttrs (withPlugin && stdenv.isLinux) { + env = lib.optionalAttrs (withPlugin && stdenv.hostPlatform.isLinux) { RUSTFLAGS = "-C relro-level=partial"; }; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix index 8b2463ccce..69289b8955 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { boost nix nlohmann_json - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-index/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-index/default.nix index b4b8b08320..433ad82d4d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-index/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-index/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl sqlite ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' substituteInPlace command-not-found.sh \ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix index d87d388cd2..f8e181e9fa 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix @@ -2,15 +2,17 @@ , stdenv , fetchFromGitHub , bzip2 -, nix -, perl +, nixVersions , makeWrapper , nixosTests +, fetchpatch }: let - rev = "e4675e38ab54942e351c7686e40fabec822120b9"; - sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr"; + rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24"; + sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY="; + nix = nixVersions.nix_2_24; + inherit (nix.perl-bindings) perl; in stdenv.mkDerivation { @@ -23,6 +25,14 @@ stdenv.mkDerivation { inherit rev sha256; }; + patches = [ + # Part of https://github.com/edolstra/nix-serve/pull/61 + (fetchpatch { + url = "https://github.com/edolstra/nix-serve/commit/9e434fff4486afeb3cc3f631f6dc56492b204704.patch"; + sha256 = "sha256-TxQ6q6UApTKsYIMdr/RyrkKSA3k47stV63bTbxchNTU="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/nix-command.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/nix-command.patch new file mode 100644 index 0000000000..5bf8eaac87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/nix-command.patch @@ -0,0 +1,40 @@ +From 9e434fff4486afeb3cc3f631f6dc56492b204704 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Wed, 31 Jul 2024 23:53:31 +0200 +Subject: [PATCH] add extra-experimental-features for nix-command + +fixes https://github.com/NixOS/nixpkgs/pull/331230 +--- + nix-serve.psgi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/nix-serve.psgi b/nix-serve.psgi +index 928fa3b..65a8680 100644 +--- a/nix-serve.psgi ++++ b/nix-serve.psgi +@@ -64,7 +64,7 @@ my $app = sub { + return [404, ['Content-Type' => 'text/plain'], ["Incorrect NAR hash. Maybe the path has been recreated.\n"]] + unless $narHash eq "sha256:$expectedNarHash"; + my $fh = new IO::Handle; +- open $fh, "-|", "nix", "dump-path", "--", $storePath; ++ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath; + return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh]; + } + +@@ -75,14 +75,14 @@ my $app = sub { + return [404, ['Content-Type' => 'text/plain'], ["No such path.\n"]] unless $storePath; + my ($deriver, $narHash, $time, $narSize, $refs) = $store->queryPathInfo($storePath, 1) or die; + my $fh = new IO::Handle; +- open $fh, "-|", "nix", "dump-path", "--", $storePath; ++ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath; + return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh]; + } + + elsif ($path =~ /^\/log\/([0-9a-z]+-[0-9a-zA-Z\+\-\.\_\?\=]+)/) { + my $storePath = "$Nix::Config::storeDir/$1"; + my $fh = new IO::Handle; +- open $fh, "-|", "nix", "log", $storePath; ++ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "log", $storePath; + return [200, ['Content-Type' => 'text/plain' ], $fh]; + } + diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix index 91c1f9b268..1d0c6f42f5 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; # needed for nix-prefetch-url postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/README.md b/third_party/nixpkgs/pkgs/tools/package-management/nix/README.md new file mode 100644 index 0000000000..0105b504e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/README.md @@ -0,0 +1,35 @@ +# Steps for Testing New Releases + +## Patch Releases or Updating `nixVersions.{latest,git}` + +Branch to merge into: **master** or **release-$nixos-version** + +Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, **x86_64-darwin**, and **aarch64-darwin**. +If you lack the necessary hardware for these platforms, you may need to ask others for assistance with the builds. +Alternatively, you can request access to the Nix community builder for all platforms [here](https://github.com/NixOS/aarch64-build-box) and [here](https://nix-community.org/community-builder/). + +To build all dependent packages, use: + +``` +nix-review pr +``` + +And to build all important NixOS tests, run: + +``` +# Replace $version with the actual Nix version +nix-build nixVersions.nix_$version.tests +``` + +Be sure to also update the `nix-fallback-paths` whenever you do a patch release for `nixVersions.stable` + +``` +# Replace $version with the actual Nix version +curl https://releases.nixos.org/nix/nix-$version/fallback-paths.nix > nixos/modules/installer/tools/nix-fallback-paths.nix +``` + +## Major Version Bumps + +If you're updating `nixVersions.stable`, follow all the steps mentioned above, but use the **staging** branch for your pull request (or **staging-next** after coordinating with the people in matrix `#staging:nixos.org`) +This is necessary because, at the end of the staging-next cycle, the NixOS tests are built through the [staging-next-small](https://hydra.nixos.org/jobset/nixos/staging-next-small) jobset. +Especially nixos installer test are important to look at here. diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix index 58923e44b4..c26cb41039 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix @@ -76,7 +76,7 @@ in , xz , enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , enableStatic ? stdenv.hostPlatform.isStatic -, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp +, withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , confDir @@ -101,7 +101,7 @@ self = stdenv.mkDerivation { [ "out" "dev" ] ++ lib.optionals enableDocumentation [ "man" "doc" ]; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; hardeningDisable = [ "shadowstack" @@ -126,7 +126,7 @@ self = stdenv.mkDerivation { mdbook ] ++ lib.optionals (atLeast213 && enableDocumentation) [ mdbook-linkcheck - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]; @@ -147,9 +147,9 @@ self = stdenv.mkDerivation { libgit2 ] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [ toml11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security - ] ++ lib.optionals (stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ] ++ lib.optionals atLeast214 [ rapidcheck @@ -177,7 +177,7 @@ self = stdenv.mkDerivation { mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} @@ -206,9 +206,9 @@ self = stdenv.mkDerivation { "--enable-gc" ] ++ lib.optionals (!enableDocumentation) [ "--disable-doc-gen" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" - ] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [ + ] ++ lib.optionals (atLeast210 && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [ "--enable-embedded-sandbox-shell" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system) [ "--with-system=${stdenv.hostPlatform.nix.system}" @@ -234,16 +234,16 @@ self = stdenv.mkDerivation { installCheckTarget = if atLeast210 then "installcheck" else null; # socket path becomes too long otherwise - preInstallCheck = lib.optionalString stdenv.isDarwin '' + preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export TMPDIR=$NIX_BUILD_TOP '' # Prevent crashes in libcurl due to invoking Objective-C `+initialize` methods after `fork`. # See http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES '' # See https://github.com/NixOS/nix/issues/5687 - + lib.optionalString (atLeast25 && stdenv.isDarwin) '' + + lib.optionalString (atLeast25 && stdenv.hostPlatform.isDarwin) '' echo "exit 99" > tests/gc-non-blocking.sh '' # TODO: investigate why this broken + lib.optionalString (atLeast25 && stdenv.hostPlatform.system == "aarch64-linux") '' @@ -253,7 +253,7 @@ self = stdenv.mkDerivation { export MANPATH=$man/share/man:$MANPATH ''; - separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic); + separateDebugInfo = stdenv.hostPlatform.isLinux && (atLeast24 -> !enableStatic); enableParallelBuilding = true; @@ -263,14 +263,6 @@ self = stdenv.mkDerivation { perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; }); tests = { - nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name}; - nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; - - # Basic smoke test that needs to pass when upgrading nix. - # Note that this test does only test the nixVersions.stable attribute. - misc = nixosTests.nix-misc.default; - upgrade = nixosTests.nix-upgrade; - srcVersion = runCommand "nix-src-version" { inherit version; } '' @@ -291,6 +283,16 @@ self = stdenv.mkDerivation { inherit lib pkgs; nix = self; }; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; + + # Basic smoke tests that needs to pass when upgrading nix. + # Note that this test does only test the nixVersions.stable attribute. + misc = nixosTests.nix-misc.default; + upgrade = nixosTests.nix-upgrade; + simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot; + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name}; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index e03fb5bdae..422d47bc9a 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -3,12 +3,14 @@ , stdenv , aws-sdk-cpp , boehmgc +, libgit2 , callPackage , fetchFromGitHub , fetchpatch , fetchpatch2 , runCommand , overrideSDK +, buildPackages , Security , storeDir ? "/nix/store" @@ -66,7 +68,7 @@ let rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp # TestRandomURLMultiThreaded fails rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp - '' + lib.optionalString aws-sdk-cpp.stdenv.isi686 '' + '' + lib.optionalString aws-sdk-cpp.stdenv.hostPlatform.isi686 '' # EPSILON is exceeded rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp ''; @@ -85,6 +87,27 @@ let requiredSystemFeatures = [ ]; }; + libgit2-thin-packfile = libgit2.overrideAttrs (args: { + nativeBuildInputs = args.nativeBuildInputs or [] + # gitMinimal does not build on Windows. See packbuilder patch. + ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ + # Needed for `git apply`; see `prePatch` + buildPackages.gitMinimal + ]; + # Only `git apply` can handle git binary patches + prePatch = args.prePatch or "" + + lib.optionalString (!stdenv.hostPlatform.isWindows) '' + patch() { + git apply + } + ''; + # taken from https://github.com/NixOS/nix/tree/master/packaging/patches + patches = (args.patches or []) ++ [ + ./patches/libgit2-mempack-thin-packfile.patch + ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ + ./patches/libgit2-packbuilder-callback-interruptible.patch + ]; + }); common = args: callPackage @@ -93,6 +116,7 @@ let inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; aws-sdk-cpp = if lib.versionAtLeast args.version "2.12pre" then aws-sdk-cpp-nix else aws-sdk-cpp-old-nix; + libgit2 = if lib.versionAtLeast args.version "2.25.0" then libgit2-thin-packfile else libgit2; }; # https://github.com/NixOS/nix/pull/7585 @@ -151,8 +175,8 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.5"; - hash = "sha256-xEcYQuJz6DjdYfS6GxIYcn8U+3Hgopne3CvqrNoGguQ="; + version = "2.18.7"; + hash = "sha256-ZfcL4utJHuxCGILb/zIeXVVbHkskgp70+c2IitkFJwA="; self_attribute_name = "nix_2_18"; }; @@ -187,10 +211,10 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.6"; - hash = "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w="; + version = "2.24.8"; + hash = "sha256-YPJA0stZucs13Y2DQr3JIL6JfakP//LDbYXNhic/rKk="; self_attribute_name = "nix_2_24"; - }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: # # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer @@ -203,15 +227,15 @@ in lib.makeExtensible (self: ({ git = (common rec { version = "2.25.0"; - suffix = "pre20240910_${lib.substring 0 8 src.rev}"; + suffix = "pre20240920_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "b9d3cdfbd2b873cf34600b262247d77109dfd905"; - hash = "sha256-7zH8TU5g3Bsg6ES0O8RcTm6JGYOMuDCGlSI3AQKbKy8="; + rev = "ca3fc1693b309ab6b8b0c09408a08d0055bf0363"; + hash = "sha256-Hp7dkx7zfB9a4l5QusXUob0b1T2qdZ23LFo5dcp3xrU="; }; self_attribute_name = "git"; - }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: # # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer @@ -241,6 +265,7 @@ in lib.makeExtensible (self: ({ else nix; + # Read ./README.md before bumping a major release stable = addFallbackPathsCheck self.nix_2_18; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs (map ( diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix index f80ce5698a..50e342e96c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation (finalAttrs: { nix perl xz - ] ++ lib.optional (stdenv.isDarwin) Security; + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) Security; # Not cross-safe since Nix checks for curl/perl via # NEED_PROG/find_program, but both seem to be needed at runtime @@ -65,7 +65,7 @@ in stdenv.mkDerivation (finalAttrs: { ]); # `perlPackages.Test2Harness` is marked broken for Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ perl.pkgs.Test2Harness @@ -87,4 +87,6 @@ in stdenv.mkDerivation (finalAttrs: { ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; + + passthru = { inherit perl; }; }) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch new file mode 100644 index 0000000000..fb74b16831 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch @@ -0,0 +1,282 @@ +commit 9bacade4a3ef4b6b26e2c02f549eef0e9eb9eaa2 +Author: Robert Hensing +Date: Sun Aug 18 20:20:36 2024 +0200 + + Add unoptimized git_mempack_write_thin_pack + +diff --git a/include/git2/sys/mempack.h b/include/git2/sys/mempack.h +index 17da590a3..3688bdd50 100644 +--- a/include/git2/sys/mempack.h ++++ b/include/git2/sys/mempack.h +@@ -44,6 +44,29 @@ GIT_BEGIN_DECL + */ + GIT_EXTERN(int) git_mempack_new(git_odb_backend **out); + ++/** ++ * Write a thin packfile with the objects in the memory store. ++ * ++ * A thin packfile is a packfile that does not contain its transitive closure of ++ * references. This is useful for efficiently distributing additions to a ++ * repository over the network, but also finds use in the efficient bulk ++ * addition of objects to a repository, locally. ++ * ++ * This operation performs the (shallow) insert operations into the ++ * `git_packbuilder`, but does not write the packfile to disk; ++ * see `git_packbuilder_write_buf`. ++ * ++ * It also does not reset the memory store; see `git_mempack_reset`. ++ * ++ * @note This function may or may not write trees and blobs that are not ++ * referenced by commits. Currently everything is written, but this ++ * behavior may change in the future as the packer is optimized. ++ * ++ * @param backend The mempack backend ++ * @param pb The packbuilder to use to write the packfile ++ */ ++GIT_EXTERN(int) git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb); ++ + /** + * Dump all the queued in-memory writes to a packfile. + * +diff --git a/src/libgit2/odb_mempack.c b/src/libgit2/odb_mempack.c +index 6f27f45f8..0b61e2b66 100644 +--- a/src/libgit2/odb_mempack.c ++++ b/src/libgit2/odb_mempack.c +@@ -132,6 +132,35 @@ cleanup: + return err; + } + ++int git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb) ++{ ++ struct memory_packer_db *db = (struct memory_packer_db *)backend; ++ const git_oid *oid; ++ size_t iter = 0; ++ int err = -1; ++ ++ /* TODO: Implement the recency heuristics. ++ For this it probably makes sense to only write what's referenced ++ through commits, an option I've carved out for you in the docs. ++ wrt heuristics: ask your favorite LLM to translate https://git-scm.com/docs/pack-heuristics/en ++ to actual normal reference documentation. */ ++ while (true) { ++ err = git_oidmap_iterate(NULL, db->objects, &iter, &oid); ++ if (err == GIT_ITEROVER) { ++ err = 0; ++ break; ++ } ++ if (err != 0) ++ return err; ++ ++ err = git_packbuilder_insert(pb, oid, NULL); ++ if (err != 0) ++ return err; ++ } ++ ++ return 0; ++} ++ + int git_mempack_dump( + git_buf *pack, + git_repository *repo, +diff --git a/tests/libgit2/mempack/thinpack.c b/tests/libgit2/mempack/thinpack.c +new file mode 100644 +index 000000000..604a4dda2 +--- /dev/null ++++ b/tests/libgit2/mempack/thinpack.c +@@ -0,0 +1,196 @@ ++#include "clar_libgit2.h" ++#include "git2/indexer.h" ++#include "git2/odb_backend.h" ++#include "git2/tree.h" ++#include "git2/types.h" ++#include "git2/sys/mempack.h" ++#include "git2/sys/odb_backend.h" ++#include "util.h" ++ ++static git_repository *_repo; ++static git_odb_backend * _mempack_backend; ++ ++void test_mempack_thinpack__initialize(void) ++{ ++ git_odb *odb; ++ ++ _repo = cl_git_sandbox_init_new("mempack_thinpack_repo"); ++ ++ cl_git_pass(git_mempack_new(&_mempack_backend)); ++ cl_git_pass(git_repository_odb(&odb, _repo)); ++ cl_git_pass(git_odb_add_backend(odb, _mempack_backend, 999)); ++ git_odb_free(odb); ++} ++ ++void _mempack_thinpack__cleanup(void) ++{ ++ cl_git_sandbox_cleanup(); ++} ++ ++/* ++ Generating a packfile for an unchanged repo works and produces an empty packfile. ++ Even if we allow this scenario to be detected, it shouldn't misbehave if the ++ application is unaware of it. ++*/ ++void test_mempack_thinpack__empty(void) ++{ ++ git_packbuilder *pb; ++ int version; ++ int n; ++ git_buf buf = GIT_BUF_INIT; ++ ++ git_packbuilder_new(&pb, _repo); ++ ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_assert_in_range(12, buf.size, 1024 /* empty packfile is >0 bytes, but certainly not that big */); ++ cl_assert(buf.ptr[0] == 'P'); ++ cl_assert(buf.ptr[1] == 'A'); ++ cl_assert(buf.ptr[2] == 'C'); ++ cl_assert(buf.ptr[3] == 'K'); ++ version = (buf.ptr[4] << 24) | (buf.ptr[5] << 16) | (buf.ptr[6] << 8) | buf.ptr[7]; ++ /* Subject to change. https://git-scm.com/docs/pack-format: Git currently accepts version number 2 or 3 but generates version 2 only.*/ ++ cl_assert_equal_i(2, version); ++ n = (buf.ptr[8] << 24) | (buf.ptr[9] << 16) | (buf.ptr[10] << 8) | buf.ptr[11]; ++ cl_assert_equal_i(0, n); ++ git_buf_dispose(&buf); ++ ++ git_packbuilder_free(pb); ++} ++ ++#define LIT_LEN(x) x, sizeof(x) - 1 ++ ++/* ++ Check that git_mempack_write_thin_pack produces a thin packfile. ++*/ ++void test_mempack_thinpack__thin(void) ++{ ++ /* Outline: ++ - Create tree 1 ++ - Flush to packfile A ++ - Create tree 2 ++ - Flush to packfile B ++ ++ Tree 2 has a new blob and a reference to a blob from tree 1. ++ ++ Expectation: ++ - Packfile B is thin and does not contain the objects from packfile A ++ */ ++ ++ ++ git_oid oid_blob_1; ++ git_oid oid_blob_2; ++ git_oid oid_blob_3; ++ git_oid oid_tree_1; ++ git_oid oid_tree_2; ++ git_treebuilder *tb; ++ ++ git_packbuilder *pb; ++ git_buf buf = GIT_BUF_INIT; ++ git_indexer *indexer; ++ git_indexer_progress stats; ++ char pack_dir_path[1024]; ++ ++ char sbuf[1024]; ++ const char * repo_path; ++ const char * pack_name_1; ++ const char * pack_name_2; ++ git_str pack_path_1 = GIT_STR_INIT; ++ git_str pack_path_2 = GIT_STR_INIT; ++ git_odb_backend * pack_odb_backend_1; ++ git_odb_backend * pack_odb_backend_2; ++ ++ ++ cl_assert_in_range(0, snprintf(pack_dir_path, sizeof(pack_dir_path), "%s/objects/pack", git_repository_path(_repo)), sizeof(pack_dir_path)); ++ ++ /* Create tree 1 */ ++ ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_2, _repo, LIT_LEN("thinpack blob 2"))); ++ ++ ++ cl_git_pass(git_treebuilder_new(&tb, _repo, NULL)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob2", &oid_blob_2, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_write(&oid_tree_1, tb)); ++ ++ /* Flush */ ++ ++ cl_git_pass(git_packbuilder_new(&pb, _repo)); ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); ++ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); ++ cl_git_pass(git_indexer_commit(indexer, &stats)); ++ pack_name_1 = strdup(git_indexer_name(indexer)); ++ cl_assert(pack_name_1); ++ git_buf_dispose(&buf); ++ git_mempack_reset(_mempack_backend); ++ git_indexer_free(indexer); ++ git_packbuilder_free(pb); ++ ++ /* Create tree 2 */ ++ ++ cl_git_pass(git_treebuilder_clear(tb)); ++ /* blob 1 won't be used, but we add it anyway to test that just "declaring" an object doesn't ++ necessarily cause its inclusion in the next thin packfile. It must only be included if new. */ ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_3, _repo, LIT_LEN("thinpack blob 3"))); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob3", &oid_blob_3, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_write(&oid_tree_2, tb)); ++ ++ /* Flush */ ++ ++ cl_git_pass(git_packbuilder_new(&pb, _repo)); ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); ++ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); ++ cl_git_pass(git_indexer_commit(indexer, &stats)); ++ pack_name_2 = strdup(git_indexer_name(indexer)); ++ cl_assert(pack_name_2); ++ git_buf_dispose(&buf); ++ git_mempack_reset(_mempack_backend); ++ git_indexer_free(indexer); ++ git_packbuilder_free(pb); ++ git_treebuilder_free(tb); ++ ++ /* Assertions */ ++ ++ assert(pack_name_1); ++ assert(pack_name_2); ++ ++ repo_path = git_repository_path(_repo); ++ ++ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_1); ++ git_str_joinpath(&pack_path_1, repo_path, sbuf); ++ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_2); ++ git_str_joinpath(&pack_path_2, repo_path, sbuf); ++ ++ /* If they're the same, something definitely went wrong. */ ++ cl_assert(strcmp(pack_name_1, pack_name_2) != 0); ++ ++ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_1, pack_path_1.ptr)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_1)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_2)); ++ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_3)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_1)); ++ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_2)); ++ ++ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_2, pack_path_2.ptr)); ++ /* blob 1 is already in the packfile 1, so packfile 2 must not include it, in order to be _thin_. */ ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_1)); ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_2)); ++ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_3)); ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_1)); ++ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_2)); ++ ++ pack_odb_backend_1->free(pack_odb_backend_1); ++ pack_odb_backend_2->free(pack_odb_backend_2); ++ free((void *)pack_name_1); ++ free((void *)pack_name_2); ++ git_str_dispose(&pack_path_1); ++ git_str_dispose(&pack_path_2); ++ ++} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch new file mode 100644 index 0000000000..c67822ff75 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch @@ -0,0 +1,930 @@ +commit e9823c5da4fa977c46bcb97167fbdd0d70adb5ff +Author: Robert Hensing +Date: Mon Aug 26 20:07:04 2024 +0200 + + Make packbuilder interruptible using progress callback + + Forward errors from packbuilder->progress_cb + + This allows the callback to terminate long-running operations when + the application is interrupted. + +diff --git a/include/git2/pack.h b/include/git2/pack.h +index 0f6bd2ab9..bee72a6c0 100644 +--- a/include/git2/pack.h ++++ b/include/git2/pack.h +@@ -247,6 +247,9 @@ typedef int GIT_CALLBACK(git_packbuilder_progress)( + * @param progress_cb Function to call with progress information during + * pack building. Be aware that this is called inline with pack building + * operations, so performance may be affected. ++ * When progress_cb returns an error, the pack building process will be ++ * aborted and the error will be returned from the invoked function. ++ * `pb` must then be freed. + * @param progress_cb_payload Payload for progress callback. + * @return 0 or an error code + */ +diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c +index b2d80cba9..7c331c2d5 100644 +--- a/src/libgit2/pack-objects.c ++++ b/src/libgit2/pack-objects.c +@@ -932,6 +932,9 @@ static int report_delta_progress( + { + int ret; + ++ if (pb->failure) ++ return pb->failure; ++ + if (pb->progress_cb) { + uint64_t current_time = git_time_monotonic(); + uint64_t elapsed = current_time - pb->last_progress_report_time; +@@ -943,8 +946,10 @@ static int report_delta_progress( + GIT_PACKBUILDER_DELTAFICATION, + count, pb->nr_objects, pb->progress_cb_payload); + +- if (ret) ++ if (ret) { ++ pb->failure = ret; + return git_error_set_after_callback(ret); ++ } + } + } + +@@ -976,7 +981,10 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list, + } + + pb->nr_deltified += 1; +- report_delta_progress(pb, pb->nr_deltified, false); ++ if ((error = report_delta_progress(pb, pb->nr_deltified, false)) < 0) { ++ GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); ++ goto on_error; ++ } + + po = *list++; + (*list_size)--; +@@ -1124,6 +1132,10 @@ struct thread_params { + size_t depth; + size_t working; + size_t data_ready; ++ ++ /* A pb->progress_cb can stop the packing process by returning an error. ++ When that happens, all threads observe the error and stop voluntarily. */ ++ bool stopped; + }; + + static void *threaded_find_deltas(void *arg) +@@ -1133,7 +1145,12 @@ static void *threaded_find_deltas(void *arg) + while (me->remaining) { + if (find_deltas(me->pb, me->list, &me->remaining, + me->window, me->depth) < 0) { +- ; /* TODO */ ++ me->stopped = true; ++ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); ++ me->working = false; ++ git_cond_signal(&me->pb->progress_cond); ++ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_unlock(me->pb) == 0, NULL); ++ return NULL; + } + + GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); +@@ -1175,8 +1192,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + pb->nr_threads = git__online_cpus(); + + if (pb->nr_threads <= 1) { +- find_deltas(pb, list, &list_size, window, depth); +- return 0; ++ return find_deltas(pb, list, &list_size, window, depth); + } + + p = git__mallocarray(pb->nr_threads, sizeof(*p)); +@@ -1195,6 +1211,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + p[i].depth = depth; + p[i].working = 1; + p[i].data_ready = 0; ++ p[i].stopped = 0; + + /* try to split chunks on "path" boundaries */ + while (sub_size && sub_size < list_size && +@@ -1262,7 +1279,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + (!victim || victim->remaining < p[i].remaining)) + victim = &p[i]; + +- if (victim) { ++ if (victim && !target->stopped) { + sub_size = victim->remaining / 2; + list = victim->list + victim->list_size - sub_size; + while (sub_size && list[0]->hash && +@@ -1286,7 +1303,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + } + target->list_size = sub_size; + target->remaining = sub_size; +- target->working = 1; ++ target->working = 1; /* even when target->stopped, so that we don't process this thread again */ + GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); + + if (git_mutex_lock(&target->mutex)) { +@@ -1299,7 +1316,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + git_cond_signal(&target->cond); + git_mutex_unlock(&target->mutex); + +- if (!sub_size) { ++ if (target->stopped || !sub_size) { + git_thread_join(&target->thread, NULL); + git_cond_free(&target->cond); + git_mutex_free(&target->mutex); +@@ -1308,7 +1325,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + } + + git__free(p); +- return 0; ++ return pb->failure; + } + + #else +@@ -1319,6 +1336,7 @@ int git_packbuilder__prepare(git_packbuilder *pb) + { + git_pobject **delta_list; + size_t i, n = 0; ++ int error; + + if (pb->nr_objects == 0 || pb->done) + return 0; /* nothing to do */ +@@ -1327,8 +1345,10 @@ int git_packbuilder__prepare(git_packbuilder *pb) + * Although we do not report progress during deltafication, we + * at least report that we are in the deltafication stage + */ +- if (pb->progress_cb) +- pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload); ++ if (pb->progress_cb) { ++ if ((error = pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload)) < 0) ++ return git_error_set_after_callback(error); ++ } + + delta_list = git__mallocarray(pb->nr_objects, sizeof(*delta_list)); + GIT_ERROR_CHECK_ALLOC(delta_list); +@@ -1345,31 +1365,33 @@ int git_packbuilder__prepare(git_packbuilder *pb) + + if (n > 1) { + git__tsort((void **)delta_list, n, type_size_sort); +- if (ll_find_deltas(pb, delta_list, n, ++ if ((error = ll_find_deltas(pb, delta_list, n, + GIT_PACK_WINDOW + 1, +- GIT_PACK_DEPTH) < 0) { ++ GIT_PACK_DEPTH)) < 0) { + git__free(delta_list); +- return -1; ++ return error; + } + } + +- report_delta_progress(pb, pb->nr_objects, true); ++ error = report_delta_progress(pb, pb->nr_objects, true); + + pb->done = true; + git__free(delta_list); +- return 0; ++ return error; + } + +-#define PREPARE_PACK if (git_packbuilder__prepare(pb) < 0) { return -1; } ++#define PREPARE_PACK error = git_packbuilder__prepare(pb); if (error < 0) { return error; } + + int git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t size, void *payload), void *payload) + { ++ int error; + PREPARE_PACK; + return write_pack(pb, cb, payload); + } + + int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb) + { ++ int error; + PREPARE_PACK; + + return write_pack(pb, &write_pack_buf, buf); +diff --git a/src/libgit2/pack-objects.h b/src/libgit2/pack-objects.h +index bbc8b9430..380a28ebe 100644 +--- a/src/libgit2/pack-objects.h ++++ b/src/libgit2/pack-objects.h +@@ -100,6 +100,10 @@ struct git_packbuilder { + uint64_t last_progress_report_time; + + bool done; ++ ++ /* A non-zero error code in failure causes all threads to shut themselves ++ down. Some functions will return this error code. */ ++ volatile int failure; + }; + + int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb); +diff --git a/tests/libgit2/pack/cancel.c b/tests/libgit2/pack/cancel.c +new file mode 100644 +index 000000000..a0aa9716a +--- /dev/null ++++ b/tests/libgit2/pack/cancel.c +@@ -0,0 +1,240 @@ ++#include "clar_libgit2.h" ++#include "futils.h" ++#include "pack.h" ++#include "hash.h" ++#include "iterator.h" ++#include "vector.h" ++#include "posix.h" ++#include "hash.h" ++#include "pack-objects.h" ++ ++static git_repository *_repo; ++static git_revwalk *_revwalker; ++static git_packbuilder *_packbuilder; ++static git_indexer *_indexer; ++static git_vector _commits; ++static int _commits_is_initialized; ++static git_indexer_progress _stats; ++ ++extern bool git_disable_pack_keep_file_checks; ++ ++static void pack_packbuilder_init(const char *sandbox) { ++ _repo = cl_git_sandbox_init(sandbox); ++ /* cl_git_pass(p_chdir(sandbox)); */ ++ cl_git_pass(git_revwalk_new(&_revwalker, _repo)); ++ cl_git_pass(git_packbuilder_new(&_packbuilder, _repo)); ++ cl_git_pass(git_vector_init(&_commits, 0, NULL)); ++ _commits_is_initialized = 1; ++ memset(&_stats, 0, sizeof(_stats)); ++ p_fsync__cnt = 0; ++} ++ ++void test_pack_cancel__initialize(void) ++{ ++ pack_packbuilder_init("small.git"); ++} ++ ++void test_pack_cancel__cleanup(void) ++{ ++ git_oid *o; ++ unsigned int i; ++ ++ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_FSYNC_GITDIR, 0)); ++ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, false)); ++ ++ if (_commits_is_initialized) { ++ _commits_is_initialized = 0; ++ git_vector_foreach(&_commits, i, o) { ++ git__free(o); ++ } ++ git_vector_free(&_commits); ++ } ++ ++ git_packbuilder_free(_packbuilder); ++ _packbuilder = NULL; ++ ++ git_revwalk_free(_revwalker); ++ _revwalker = NULL; ++ ++ git_indexer_free(_indexer); ++ _indexer = NULL; ++ ++ /* cl_git_pass(p_chdir("..")); */ ++ cl_git_sandbox_cleanup(); ++ _repo = NULL; ++} ++ ++static int seed_packbuilder(void) ++{ ++ int error; ++ git_oid oid, *o; ++ unsigned int i; ++ ++ git_revwalk_sorting(_revwalker, GIT_SORT_TIME); ++ cl_git_pass(git_revwalk_push_ref(_revwalker, "HEAD")); ++ ++ while (git_revwalk_next(&oid, _revwalker) == 0) { ++ o = git__malloc(sizeof(git_oid)); ++ cl_assert(o != NULL); ++ git_oid_cpy(o, &oid); ++ cl_git_pass(git_vector_insert(&_commits, o)); ++ } ++ ++ git_vector_foreach(&_commits, i, o) { ++ if((error = git_packbuilder_insert(_packbuilder, o, NULL)) < 0) ++ return error; ++ } ++ ++ git_vector_foreach(&_commits, i, o) { ++ git_object *obj; ++ cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJECT_COMMIT)); ++ error = git_packbuilder_insert_tree(_packbuilder, ++ git_commit_tree_id((git_commit *)obj)); ++ git_object_free(obj); ++ if (error < 0) ++ return error; ++ } ++ ++ return 0; ++} ++ ++static int fail_stage; ++ ++static int packbuilder_cancel_after_n_calls_cb(int stage, uint32_t current, uint32_t total, void *payload) ++{ ++ ++ /* Force the callback to run again on the next opportunity regardless ++ of how fast we're running. */ ++ _packbuilder->last_progress_report_time = 0; ++ ++ if (stage == fail_stage) { ++ int *calls = (int *)payload; ++ int n = *calls; ++ /* Always decrement, including past zero. This way the error is only ++ triggered once, making sure it is picked up immediately. */ ++ --*calls; ++ if (n == 0) ++ return GIT_EUSER; ++ } ++ ++ return 0; ++} ++ ++static void test_cancel(int n) ++{ ++ ++ int calls_remaining = n; ++ int err; ++ git_buf buf = GIT_BUF_INIT; ++ ++ /* Switch to a small repository, so that `packbuilder_cancel_after_n_calls_cb` ++ can hack the time to call the callback on every opportunity. */ ++ ++ cl_git_pass(git_packbuilder_set_callbacks(_packbuilder, &packbuilder_cancel_after_n_calls_cb, &calls_remaining)); ++ err = seed_packbuilder(); ++ if (!err) ++ err = git_packbuilder_write_buf(&buf, _packbuilder); ++ ++ cl_assert_equal_i(GIT_EUSER, err); ++} ++void test_pack_cancel__cancel_after_add_0(void) ++{ ++ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; ++ test_cancel(0); ++} ++ ++void test_pack_cancel__cancel_after_add_1(void) ++{ ++ cl_skip(); ++ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; ++ test_cancel(1); ++} ++ ++void test_pack_cancel__cancel_after_delta_0(void) ++{ ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(0); ++} ++ ++void test_pack_cancel__cancel_after_delta_1(void) ++{ ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(1); ++} ++ ++void test_pack_cancel__cancel_after_delta_0_threaded(void) ++{ ++#ifdef GIT_THREADS ++ git_packbuilder_set_threads(_packbuilder, 8); ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(0); ++#else ++ cl_skip(); ++#endif ++} ++ ++void test_pack_cancel__cancel_after_delta_1_threaded(void) ++{ ++#ifdef GIT_THREADS ++ git_packbuilder_set_threads(_packbuilder, 8); ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(1); ++#else ++ cl_skip(); ++#endif ++} ++ ++static int foreach_cb(void *buf, size_t len, void *payload) ++{ ++ git_indexer *idx = (git_indexer *) payload; ++ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); ++ return 0; ++} ++ ++void test_pack_cancel__foreach(void) ++{ ++ git_indexer *idx; ++ ++ seed_packbuilder(); ++ ++#ifdef GIT_EXPERIMENTAL_SHA256 ++ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); ++#else ++ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); ++#endif ++ ++ cl_git_pass(git_packbuilder_foreach(_packbuilder, foreach_cb, idx)); ++ cl_git_pass(git_indexer_commit(idx, &_stats)); ++ git_indexer_free(idx); ++} ++ ++static int foreach_cancel_cb(void *buf, size_t len, void *payload) ++{ ++ git_indexer *idx = (git_indexer *)payload; ++ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); ++ return (_stats.total_objects > 2) ? -1111 : 0; ++} ++ ++void test_pack_cancel__foreach_with_cancel(void) ++{ ++ git_indexer *idx; ++ ++ seed_packbuilder(); ++ ++#ifdef GIT_EXPERIMENTAL_SHA256 ++ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); ++#else ++ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); ++#endif ++ ++ cl_git_fail_with( ++ git_packbuilder_foreach(_packbuilder, foreach_cancel_cb, idx), -1111); ++ git_indexer_free(idx); ++} ++ ++void test_pack_cancel__keep_file_check(void) ++{ ++ assert(!git_disable_pack_keep_file_checks); ++ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, true)); ++ assert(git_disable_pack_keep_file_checks); ++} +diff --git a/tests/resources/small.git/HEAD b/tests/resources/small.git/HEAD +new file mode 100644 +index 0000000000000000000000000000000000000000..cb089cd89a7d7686d284d8761201649346b5aa1c +GIT binary patch +literal 23 +ecmXR)O|w!cN=+-)&qz&7Db~+TEG|hc;sO9;xClW2 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/config b/tests/resources/small.git/config +new file mode 100644 +index 0000000000000000000000000000000000000000..07d359d07cf1ed0c0074fdad71ffff5942f0adfa +GIT binary patch +literal 66 +zcmaz}&M!)h<>D+#Eyypk5{uv*03B5png9R* + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/description b/tests/resources/small.git/description +new file mode 100644 +index 0000000000000000000000000000000000000000..498b267a8c7812490d6479839c5577eaaec79d62 +GIT binary patch +literal 73 +zcmWH|%S+5nO;IRHEyyp$t+PQ$;d2LNXyJgRZve!Elw`VEGWs$&r??@ +Q$yWgB0LrH#Y0~2Y0PnOK(EtDd + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/applypatch-msg.sample b/tests/resources/small.git/hooks/applypatch-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..dcbf8167fa503f96ff6a39c68409007eadc9b1f3 +GIT binary patch +literal 535 +zcmY+AX;Q;542A#a6e8^~FyI8r&I~hf2QJ{GO6(?HuvEG*+#R{4EI%zhfA8r{j%sh$ +zHE~E-UtQd8{bq4@*S%jq3@bmxwQDXGv#o!N`o3AHMw3xD)hy0#>&E&zzl%vRffomqo=v6>_2NRa#TwDdYvTVQyueO*15Nlo%=#DXgC0bhF3vTa`LQGaO9;jeD$OP?~ +za$G4Q{z+Q_{5V?5h;a-noM$P{<>Q~j4o7u%#P6^o^16{y*jU=-K8GYD_dUtdj4FSx +zSC0C!DvAnv%S!4dgk +XB^)11aoGMJPCqWs%IS0YSv(eBT&%T6 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/commit-msg.sample b/tests/resources/small.git/hooks/commit-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..f3780f92349638ebe32f6baf24c7c3027675d7c9 +GIT binary patch +literal 953 +zcmaJy@-{3h^^Cx;#d0zEA@DDc$nY4ez&|=%jTg@_HU*ub=!!y$xW09TSjlj +z(`I@QCsM`!9&80$I98wsQ8yK#)Orb<8re8FjkKh630D$QUDwi~(gkX=RunYm$rDjk +zlp%RUSnzA#6yjdG5?T?2DcYKp+v_lts0ljn&bh3J0bD5@N@1UKZ190O6ZeWr-BuZ^ +zWRebCX%(%=Xoj#(xYk1Cjtr!=tyBesf@m6}8zY6Ijbz9i9ziI_jG9MvR +zDH*e>^ga9IR?2wrSrAVm;eButj4Y>7(E2?b~jsu>& +zRKCJ7bp#19sqYh627wD%D9R$8=Ml$TNlumDypl~$jBu*G>5fIR^FB0h0Ex&TGZNr> +zL5hs1_K>taRb!|ThN9ns7^@4MXKP+6aGI_UK)T-M#rcP$;kN(Vcf#P)+5GzWa{l@J +z>-E{`$1iiNVYxq27}j;uo%;)r3kJI2xCFF~Ux;$Q%) +wjbk6JlDCM`jU&P+UVOvg`|iYl<7~9k>HHB4I;pdlQ=I-^$DrHaN$@lH1?P!0U;qFB + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/fsmonitor-watchman.sample b/tests/resources/small.git/hooks/fsmonitor-watchman.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..41184ebc318c159f51cd1ebe2290559805df89d8 +GIT binary patch +literal 4777 +zcmbtYYi}F368$Xwipg4lq(BeHMvzvH-4;n7DGJBPqq#tw3aed8+IU5-m)yvL>;Cqh +z8FFRGj$`9CA8aoJ?j^$%==FV``-=rhLcPW`McSytRm~mEO7_&_cAVZrf1fFy*ha@8oe%*-aBYE +zcjzZg>LOkgxuUr-XJnHyD;zmPnRaSc#!k_P*d_BttRdc+J6G7za5#+^Y1nkc2Oowk`ya47uUR3Feu?B(w;S{(VYzxh}q-=#zP@uxSx{wbyPUMFU;K(06)$o{07&3yI?q{GqMcQ1c_^M<0< +zF4acAV)Il-V(rCTC1(;bsZ*}bl8dmejAk~yb`B}!^0;g^(o9kGUfZfDOvyp@x4OQt +zSgWh6T|3eq;9MFs8-#z+FDM1h(IjRUP|``PxupgJ7CUHOH90gbgl^2~97`?_X{P)) +zB*$r1cDlF-%azKND}?Gv`2K8-9v5e`gQoft=j?T<&a13c^!wY_$D`5z-X1g?ty&6- +zQN50{8?bUk9AI->^W@~~nkOghHIC2YN+AXkLQG_2-{Pq3%{`3KUMeG$iIn%%^6*NYb +zn|_BdV#C)n4565VccX;uT8&z3vSi!HXGbUj2B!R +zdz~&#fk#L-&k$fLwo$4?>12g@AXOKFekuo#6EHB%gmpD?1eyh%N8s{2wGoTu +z*@6cEZ^ZW!FAF_|JL`NkV7k}0ow|-2jHwbgH0;c@Dq*o?@&c*HnGdyx6^su8Qk%2{ +z*ye(dxO*6-&>qn1+zw}tc6;=sOX{4WB=VqjTS^))y1jlX2Q;=e!qMmFA5lC$#;BxC +z=Y%tRpWxb+_uQAvAw7Q{HGV#R$xb&udLCzZ+HN?kTyB};1EJ8UlQ5!>5eGW@)RX0n +zkjj>EF!3=0Gl^8dzv$B^NMGRxJoqN4A`xq-@wCbrx*u2NmIJ1xZ%H +zh;{|4T3(!E9sY#Ni(wUJYs1MmIc9bl)(4Nl3_wD_BWB>i<1S(LX7m*{Q7PU$muMS* +zM!%0EZx-Vw=Zey;erC?SNxF;pY@^A%-krqzfLV2meBp1vWdyArFYn`DD19T)Hw(?n +z)}{NP(Lk(o*?gl#B@pP7^*r|=;PIDT4|F#{2Hzh-AL0Rv$6uT;n|WzE4=slK?on@(fZeGhRgQCu56qB +z{+n81Az96qnQjMY*-*r-KV*7;Z#4QuJRJJV$M^KdldiMhj?ImK6~FvwJ*L5a){QoM=L5TYHkGO1$UrO3`a>{?Opw|b +zG(#59NQ#jFL9v~vgOVkM@^^(^A}onOE))yWEwhIlk&{ZyseZ^O0b=w8&O=BK{k<5B +k^Q-B@eG}LeHrquz%(SVEp_N)VhYZikCW__82JXfD17`J9Qvd(} + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-applypatch.sample b/tests/resources/small.git/hooks/pre-applypatch.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..625837e25f91421b8809a097f4a3103dd387ef31 +GIT binary patch +literal 481 +zcmY+ATTa6;5Jms9iouO45IBJXEg&Jm9@v1LPHMM_ZR|;#6tQh$71hSXq*MxP;V& +zj0cY7SCL=x4`a46sF)C>94Gk%=3q$W2s;j6iHtB2$R0%gix4oK@&T~=ALd_o*CKxt +I-`Pv{1Bpzc>;M1& + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-commit.sample b/tests/resources/small.git/hooks/pre-commit.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..10b39b2e26981b8f87ea424e735ef87359066dbb +GIT binary patch +literal 1706 +zcmZuxU2ohr5PY_N#pZ0-F<{-v&v-X^RA+u>k}E$4d&uD7=g_fA8+pNNV=4s0|iD3p<=DTXClTS +zXV23tJ;ECmN@M0j@zUAKEYW@3bv!SeYZ8ZH`YQNTApFVNc;F|9r5p4TqGs=>8E?6y +zi|gY{iM#PG1nL?UE9YCnWTk72kgZPG*Usqw!~Qd3c?~@w2?%eg@~)+VlSs6N5Yf2^ +zz;owF#K#r^&KMq1A`oqVGFpD&-!Pv|Rc +zO3KSqA@h9nSc%bm`0)Amk6*J}@14J*1-219l%%7D!Pl}UK>|lVi0Dfgu2jN3WC!uL +z0ej??b2iSehVgdnWHmZV4kUo*QL#aiIp}U=9x)IXk}JJ7VQ;CI9Rtn5e0VcjbYcVt+`x5D+svCGD;Z5hm*E$jSEQZ%SQ(}oLgslTvrKK@9Qf#b!hajVFnp9@oIix;NcI9Wk +xjnh0ya!AWet{I7YpD;y6HXyzI*lfSvH=o6*7mJZPkuaYpm>vzZ`wyGEBtOQPo|pgt + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-push.sample b/tests/resources/small.git/hooks/pre-push.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..02cbd80c287f959fe33975bb66c56293e3f5b396 +GIT binary patch +literal 1431 +zcmaJ>U60!~5PUX&#a1@z9B{IIZkjLT0t5kq9#8~D(I5{+8&J~9;#ndUk~-ZT`r|uG +z$#K$$J{TsKs*LP1}9!GoZ@4I4myMMG_di|of +z%?llx{O8TS-#^;(OioEmPy%kwWQBA1OMzV{hsQ8XFzS1k!~YQoLa5 +zhtP1fA$q6VmMbbAC_9)4I628k*O5J$NR19uHe4QYDK<==I~SQk)Nu%xQ~KH +z53w=!ke(FGb_PpnZfd*+hnXDTn;2*`u^~;?+5C~cn?bRka7NR%06%e6O91{MAgN6J +zmlO8{Biw4&wr&&(z4p3eln`E}XR9m9bNYZ7Ibrg(4yZIXrfgD7N*AFD7L3YSM#j}% +zo__rOS5fr;@8UM<6cl+cv_$YB$PQ&9dv($eM*))g!_cu!QcSh-mqE9i#QDZT)=o#` +z?8!RtE?w6p?GkGZ-6yt_p~5~4ecu|Sf^)6096%h*q-eNiEA1;Xwg)p~Q&iGSG7-IQ +z9aII&`ps$WOojFA`*bjGkFk|E@sHHuD}W^d`7YJ3YE^zrQnqR +zGoq?;YGKe)93o|_=^f%3U1KYZGPOXRRxK7w`UUbMMa3<86OmVH!EKP$8RCrn9mWX+ +zC?9yF!fRVLmud3hF<}x;;sR}f(*r}6Gap3fR6zLHR~kbMgD{98N`L+r&?3p~*0+FX +zcAL%j=(SO}xTJUTvA`&Lf`2mv4koPG9&|;2+68$XxiXKL@ma;l5d2^5Ba_rPh_DHI-u1#&_upttZXp;no03$20|NFiM +zK#D#xQ>!Z3JkX8T-LDVm!B5j7y_{;JDmmTTef+K1oIiPzeEr+Ai*<2PUgnG4^ZB>p +z_fkAvoR1emuf~ri^K$-px=4#D-vY9w& +z`bCv#2zVn=YnJyeNey(Y +zRh`9vtLw~A+5zsjp|W0Nsa|29Rm!B>OoG5a+vi;ari8O>KkU!KAWg_fa3btK2x*_@ +z0bEc7J;Ubghm}n9bOi(Sv_B66nQ7U)J7f0fO}8Wuf*uorcIgEG +zOHc|-V6+HlRhOP}?Cn?@5iwSl43abmBA^2lyL$+cpabCGVES+v^j^FO_}?FIp%En%Ll?Z*7*}TwrZyg5OSZ9rY-`aU~Mc-jjv{Ll)FLMgtB4ujktfQ`Xhqrka +zT=P!A;9w^;Z?PqpLwOLu=cj3L>TdUKw2;DMu)`oVkj}#bcDx4tYg=j%D`+i{W~fVM +zVmZ>W9VMyin9c-0KzI_;iZ-g|OyzuG`Yq%(%dvl;ifnVr0;jWE&S`z|rQu=!yHBBO +zx`OJ;oOQ(KKM<$(bC38o>pD0%|HA(E0TRw7qj$fJ_pRN+7Nm>dSC(gLg{(`t+5Z=?o+}wXU4tHy+&%F&aRhFebeEhR2R5|$#Ycbp^w@t +zTl%=f1t=w+WpJzF<|CE@?SCNAz)%9?w33lQ8vrHJqPfH9@}qs*QXOG71W=ylx;wOB +zcx!Bj^)Yy6WX$a^vBkBJ5CobqlaDx_B0c<3b+8)f84LCrt;e;qxc+7>VbwVK{skNv!wvBiTa^9Iu +zkwP;VK)jH$WJ{`MRwAA9fal!y0dtV;FWg8PTkWU>CwnqD>1ZX2B@;$DlX%C5MI+}{ +z9xQVnffR*~v2KAUj*hCdgul~`bk#mk`o>zk9)<2Uc8?hUZAEvd!`9em)~$Z)zev>w^8 +zyAgCP_$&Y)7HSQ84`xG}OeTavaEswwF|8Xpi5iZzZa@hCiv(J-%bfFC&)HLlO+Rhw +zG6g?9eL5&A!SuJnQ6}LxG%tU+@vZ`i+!+Rz6iYvsTdhnPo7lW{m-}{hya@viX4)XZ +zngaw+j;gloB#|UwI@8sOmQpc`h+bicQJnQIB5eifIMQNgD2+oai33m!34~xU|0Azj +zhu$8z+T5^;Pxx@d{N)pzOJLSa^e;aDf$W%N5XcOf!mGC9l9j$Ev2h6N+6ZQC+CJzl +zaM7?S!SrFLS2DASjj(h6y1WN3N?|bmqmyzm!&nLoE|`rKBOc_yDF$a#FsUn!IQf(t +zdC&Us(kQz*7mvH^j*^MC@>wTDb}g%~sx*ng#>{@lR=XG-Z5_ +z#<9*Oh0joMzt;nS)ObAp)347`D=}r-;nV!TbIq&xrGRGsF6fZg+!VkfUei@_&l-M& +zPqQ+Dw)RV}+)I8RuqAxa`Pv8e&!_gXS=e2-un>=Ktn}-;%lLZxaVn?Q>yZCb2R3Wk +z77zr%;Rq&h|2ncqyKYmFI0148JVY7Q$V5p=dWj+Qqpu%i|xp2C=WaOb2Wudn^h0EcD%$p9YVU1fnoRV9`(cy(vv6K>FXS!2jY>1GnU--7)4usH&K +zao*&P^@9~YmUe|ZdLW@C>H;!*Vt3>Nw4M*;=?j(TBD#O@XCv0|MEhA;z}kTFRv@`tPHhp=&Yh +zg%Zhg4i7o_k{a5i&f5;tZ==%}^Sn4aD_6%qs_XAuJt&EumdH4Yu`UjT<-+XHTuHss+b +YOmM2;hq8Egm*4=7_P9T{21QBYH*F=mfB*mh + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/prepare-commit-msg.sample b/tests/resources/small.git/hooks/prepare-commit-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..b1970da1b6d3f42f00069fd17c325de72cda812e +GIT binary patch +literal 1702 +zcmb_cTW{Mo6n>t6#i?x6xmZ$SFLf{QfG*3r0L?Pg?px55l8$UTGO3bO;spKi{V3XX +z))weX0X>M9bNMcZ-6yG%>(n}JI2|25dr}WZBP@ih?JX^+@ +zu#5O48P>yRX(mfDIhYP)doc1&TADZa@ZGpusJ$6G+e$ZMcmC +zoOosDQPS}l{H?YPsq(4;0SGkATa9eeqAaDcjq8n2wALbFwU@2i@FAaRV!=uw-nwx1gKn2SvY +z>Ff>;2sg!+Hxfkwv1lsiii=p6WenF=5)6LZcQaZ=aS_}+-4Y&?!@HWh|<^gJ21!|T@+%On#w6azxPHV}XsRbe*w +zR_TZ2XEsQa1lPK~biYqg@0-RW@5J1@=<87cFzEUABdCoFH2CZo?}l(Z*!OFqUxo>K +z_d`l#4d9|H6;VPT{X?^{VJ>oL|D7K{BJwwqB>`YcPoGk+9hbvHnoQ{EM|kPgD_`wk +zKm4#2xu;-y`RAm!=L_BnLvJ8$AZm8@?)v<%vwvsw8AF2x6!mTT;c72A_~U9nIq0ST +zv)N0!I!^1p=g8-RQfx5)E_Mb_4I2vtQpI30XZ&t-9h5!Hn + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/push-to-checkout.sample b/tests/resources/small.git/hooks/push-to-checkout.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..a80611e18896f212c390d845e49a3f6d5693b41d +GIT binary patch +literal 2840 +zcmai0U31$u5PXh)#YOS7cE^-rw@uolNhe9&aUS|HtvhX>G$45tVUYj>fRdF?|9kfU +zNR~aG=E)WbEbeyq7JTw}ZuHIE2kUtL<AoeCNptd-NM1aZLhESzC;I`+Ns +zfmNNjdAp^W8#Q*}l>CT7RB9F5(BbI8ly2l~+E};JW|>&d1)=epZ-8vm8ppkbEVn#R +zt30a5A-c(YQR8eM5%;|UAnO>rt!&@x@G@yp+92%w-}%(5P_+P&Wf_zb$f-Qrl5(7z +z2ah(bkE;!DK(&aAMuQ%1TS>ai?wSXCOCSj=_}8x4IbCx^$}9q)whwv)SBt| +zg#MX4;;Oau`m=MI9(^&zPbueY@~>3*ixX%mvR5m_1&nAg@ZKvY1E$O}&EtLiG;mhV +z1xhMIm~fGjmf_#{62f`y;09?I7M1W2tWQvz<}i9lR>OpQyUJi45_&*pQus&EkwY<> +zI|ZAx=*3i9a-)g)hXkvO7>UJ5MNgL(Z+-wpXVcgbSgpmFmbf1~DPA(OVGI&FNLeIE +zNH!_aiH$vsif$_j7=T2{cS(!DOI`~bn@)vSd-0d7xL=DF;UNP|tW}4ih>DvHtu9tY_pbJ6x(6E*hxgC +zzNDao%qlr-IE%YGbS4hF!n!on7#W3$bX-_hbZAaws^nHu#)Dx=WzdbJ>AKzAy@T$x +zSWE^x9+|TEHVEPyaPYa0DOChp?AeHSBBDbZNokQpAY{lE!7geZI=jV)G^2@l)&91Zb1+`T+oq9wWF +zRV~kGTGce0O~p^6mj{kT5kL(pv>r;Lvd7VDX*P>A^Th`$3cWO0L81p4Ysdo3ZP1(SrR-peEdTo;-@bkB((G +zPHYQXUL!@Q$e(OQ;R9r%@Afz+50I7>*^^c&&|E*r-jN)LH=pM4AqMwWxSv|nqjddE +Z4{_hwv8!W(T +zYw`X3V>TCdnSD1ru8&`j=2DIPbCT@SnIgUw>$+lEYP}+x8(BMYnr=iT3*ndq)xzaV +z>I+qjv}vC#8_9M+b1p#uNS0M0)q

8!3p_LRQ0MA3M`!2foxzRUjbFY@}O~(ki=S +zqscnq8cU*dY)D$$cqE}n)V0yIk>CNKHCrndOtSP*HbOb;nbwAHSb;R+gs^?^Dve%) +zoW}t(*D}$>O3ab0TS^-;J|u&sb-PkZzo#kn*#xYt(;FGuwzSb^g&RDiGcOz9TB;Hu`nJh)$W=C=XCSm2AY=$w3G3P-V#Oo+N*;#2 +z4ijJ-pBZ=;T(RTgp_HYrD!uW-dTMfkuqY5jwOy)~gM;#=P^i{!l7`pXTS^s(&^{RU +zydaw}OpS#^D1cXM8?FW+fh`t7D(g;yr6|}fdaNtZBx3hlK~IpkTu3!Qq%R+zAo#t}Bs8^3$vHD+-TGT@`F>H1Cc#WAVW;&$S6%fE2d6@kLS0g&ihIM{}0z +z8#XhD>b>3{(BH|Px7}&lJ4%y1v(CihZJx@8MPoGdl*BJGD;usf*iS7%;{Joe; +zNFuBa>*~o&qETDPo~u&~$FxE1xb^x&(CbE`Y3GfsibL2rl+L;>P6j&Y3U>K$mkp*6 +zd`Q{<^+^&;GskGjwD-%!boR&i-TCA9UOR|@=GYb5x#+dhd7fkaVIR^pol`Mv+rUbmZ43dVL6^S7g3{NsPiG$iy$5EDB% +z6KIgnb$H(n&t3e4E6d4V7w^B?JS}JkG)PM6+X3Co`SQs($O*AA+MG~{S7RJ=cy-l& +z>~%3y`tjfx2>uOutB_^s +ziwG=e=ch|FQ0IkN91US7rhdQkXhwwt$gU0WEVDjo=IPb+?6PC=s8}J*ua(Ms))`UL +fi$|vMHn?H_tSE3ettp-hLlsZCxaLX8(nU;bVRB;Ce6@s#eu2|WvLz>- +zvy(&>Gyfp@+BtKnpqWkKi^+v{4jn_pNw_zeuxETifiGO|)w}OANj2n2D^K=o3j6P6uOL70#cbA{uzWXDlk1wr9GV1X(2W{RuTvjXV +zCmd8u +zH%V`94=q3)Dk)PHNrnFC(T1)Om6f{Usj;u1R->&XoCYVK2V3ZlgZuF?N}1+33OER*x +z*9Z=L=zI8CN>A_^jYjt0F$psO$sL=38q5q|SG)qCN6{^>RFh5E&l5GZ$pEahnF&d+ +z5c>64t}uJPkf~_!VUj#&N%nC-gUMj%=@B=!V>&}xtj2%@-mOm#rQUSJ3(ccmc+fza +znZ#uxF>N?QN5UrIEd!5RgHEfW#;(nKYF+D<*rdshJ$X-z2OZ2X;)nn@KSVdVhaA?}@3;6gZxb4v +zozoWSr{{+!h}zGpumG3H`=AvWpm^9kW;J$Jp^Xl*?8ckr`fqN%c|Z;VC0|cM4vSrk +zH_O8Yvh85nvJp^;``wo8=z0f`FWg?`>gO#y1hjX1{}rTlg9rwIKia8eyGexA3GnuR +z`Rg~XZoW;0pA)vI8=p5!+6sIn#C^FCvR>ffv39h6SCNi9v);%WD;WZ`of_MgwyRWy +z-yY%n*Y>X89W-v4`Ff%bx$Vkn}$!Ay}rnY6F$m-Kg*KD_+;Lx#g4|^&N +I02NaX#p`nv=Kufz + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b b/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b +new file mode 100644 +index 0000000000000000000000000000000000000000..822bc151862ec3763cf2d3fa2372b93bbd3a4b65 +GIT binary patch +literal 30 +mcmb>0i}&W3IZ_@1U=^!a~EV1casc=c+{&un1qQN*i9hD|0|m(2n|iwp*q%W +z%N;b$hu%cM`$TMo*~EnC1BFP&Pfj~;jZVKXQ96s_PhV<-XAROi+@-v8dBLUa`!;GB +k^iXlEv8$>R)1G>9th&t3j;s7J{?^9n|7U^`%mXoWC24Q^m!3%@{ + +literal 0 +HcmV?d00001 + diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix index 92a2270e2d..76890f4bd5 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ m4 pkg-config tcl ]; buildInputs = [ bzip2 elfutils libarchive openssl xz zlib ] - ++ lib.optional stdenv.isLinux libbsd; + ++ lib.optional stdenv.hostPlatform.isLinux libbsd; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix index 71f1653dbd..4a520f2018 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { tomlkit trove-classifiers virtualenv - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xattr ] ++ lib.optionals (pythonOlder "3.11") [ tomli @@ -102,18 +102,18 @@ buildPythonPackage rec { httpretty pytest-mock pytest-xdist - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; preCheck = ('' export HOME=$TMPDIR - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''); - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + postCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' unset no_proxy ''; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix index ac9c498a9c..ae4352ca01 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config pandoc ]; buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp - ++ lib.optional stdenv.isLinux libcap; + ++ lib.optional stdenv.hostPlatform.isLinux libcap; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "--enable-zstd" "--localstatedir=/var" "--sharedstatedir=/com" - ] ++ lib.optional stdenv.isLinux "--with-cap"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-cap"; postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" diff --git a/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix b/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix index 74a0c39cb2..8bf7ae9480 100644 --- a/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcsclite libusb1 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/adreaper/default.nix b/third_party/nixpkgs/pkgs/tools/security/adreaper/default.nix index 8737602506..4e7c554e91 100644 --- a/third_party/nixpkgs/pkgs/tools/security/adreaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/adreaper/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-lU39kj/uz0l7Rodsu6+UMv2o579eu1KUbutUNZni7bM="; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/ADReaper $out/bin/$pname ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix b/third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix index 516edc55db..c20429968f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 openssl - ] ++ lib.optional stdenv.isDarwin AppKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; nativeCheckInputs = [ rage diff --git a/third_party/nixpkgs/pkgs/tools/security/age-plugin-yubikey/default.nix b/third_party/nixpkgs/pkgs/tools/security/age-plugin-yubikey/default.nix index e69d4dc789..9022442f62 100644 --- a/third_party/nixpkgs/pkgs/tools/security/age-plugin-yubikey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/age-plugin-yubikey/default.nix @@ -30,8 +30,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux pcsclite - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux pcsclite + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation PCSC diff --git a/third_party/nixpkgs/pkgs/tools/security/amber/default.nix b/third_party/nixpkgs/pkgs/tools/security/amber/default.nix index 5cb9659656..a02c0a7236 100644 --- a/third_party/nixpkgs/pkgs/tools/security/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/amber/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Joy+SO1zR78Eh5eK2bxyT0l3hCuLX/J3u/UvN+++6vg="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Manage secret values in-repo via public key cryptography"; diff --git a/third_party/nixpkgs/pkgs/tools/security/ares-rs/default.nix b/third_party/nixpkgs/pkgs/tools/security/ares-rs/default.nix index 433cdaa579..b23f13de05 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ares-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ares-rs/default.nix @@ -1,25 +1,26 @@ -{ lib -, rustPlatform -, fetchFromGitHub +{ + lib, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { pname = "ares-rs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "bee-san"; repo = "ares"; - rev = "refs/tags/${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug="; }; - cargoHash = "sha256-7zDq66oWT+j6t9LEBUoeby8MQ1Ihhvk3KLwWPQAThyc="; + cargoHash = "sha256-c50HCwWwW4Fyg6hC1JqBfKtwq6kgReSOIBYXvwm04yA="; meta = with lib; { description = "Automated decoding of encrypted text without knowing the key or ciphers used"; homepage = "https://github.com/bee-san/ares"; - changelog = "https://github.com/bee-san/Ares/releases/tag${version}"; + changelog = "https://github.com/bee-san/Ares/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "ares"; diff --git a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix index 392744dd5d..1e93dae959 100644 --- a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,21 +18,27 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-3/wXxcKjbvlXUjvGgMidORVgeo2c5IuPgjLnY2Nj9oU="; + hash = "sha256-lyko4xwTn03/Es8icOx8GIrjC4XDXvZPDYHYILw8Opo="; }; - cargoHash = "sha256-UeMZlBSbeH/dn5j9vxNkZQ3vkNOxIyPLUOcZe2ZllTM="; + cargoHash = "sha256-I45SaawWAK7iTZDFhJT4YVO439D/3NmWLp3FtFmhLC0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = [ sqlite ] - ++ lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cargoBuildFlags = [ "--package" "arti" ]; cargoTestFlags = [ "--package" "arti" ]; + checkFlags = [ + # problematic tests that were fixed after the release + "--skip=reload_cfg::test::watch_single_file" + "--skip=reload_cfg::test::watch_multiple" + ]; + meta = with lib; { description = "Implementation of Tor in Rust"; mainProgram = "arti"; diff --git a/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix b/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix index b44f8bec2f..e30a00ff5b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { libcap zlib openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage docs/${pname}.1 diff --git a/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix b/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix index 9570229940..657a2923d2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.26"; + version = "0.6.27"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c7JhUDnANW4QihsfCioYiCe19JfqhTYP+pZgUSV6lHQ="; + hash = "sha256-8WLuz3+pn6BMnhZGUfRYj0IwOm6xuqd6zj+J2XbCPy4="; }; vendorHash = "sha256-xCNuFO+J0NXq8CPZXB0R2RmLLH27Vh/GMrBKk+mGk04="; diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix index db11044479..5594bc106b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libusb1 ] - ++ lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnfnetlink libnetfilter_queue ]; meta = with lib; { description = "Man in the middle tool"; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden-directory-connector/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden-directory-connector/default.nix index 7546f42626..65b682a0fc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -13,14 +13,14 @@ let common = { name, npmBuildScript, installPhase }: buildNpmPackage rec { pname = name; - version = "2024.3.2"; + version = "2024.9.0"; nodejs = nodejs_18; src = fetchFromGitHub { owner = "bitwarden"; repo = "directory-connector"; rev = "v${version}"; - hash = "sha256-CB5HrT+p63zANg1SEoynk6hPPW5DcC9Qfo2+QDy2iwc="; + hash = "sha256-Vop5Y1prdjA5SOQsA1HNBr3IBhe9Ya8d8M6CsS9xohg="; }; postPatch = '' @@ -32,7 +32,7 @@ let --replace-fail "AppImage" "dir" ''; - npmDepsHash = "sha256-6WYNaF6z8OwWmi/Mv091LsuTUEUhWd8cDD11QKE8A5U="; + npmDepsHash = "sha256-8rmZSl5K2l97QHaNtcfW202TtcEa3HIjEjO/AkaZkdQ="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/third_party/nixpkgs/pkgs/tools/security/boofuzz/default.nix b/third_party/nixpkgs/pkgs/tools/security/boofuzz/default.nix index 5c2418cad6..b254b9d3d1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/boofuzz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/boofuzz/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { "TestNoResponseFailure" "TestProcessMonitor" "TestSocketConnection" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_time_repeater" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix index 463501a05e..4c58039e89 100644 --- a/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0="; diff --git a/third_party/nixpkgs/pkgs/tools/security/bws/default.nix b/third_party/nixpkgs/pkgs/tools/security/bws/default.nix index 4621bb1da5..0482ee9545 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bws/default.nix @@ -32,17 +32,17 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ perl ]; buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix index 93c0c1aa49..0282bf20f7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; mainProgram = "cdk"; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 + broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix b/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix index 3a6c14ea5f..6ea34ed4a8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { node-gyp # required for sqlite3 bindings pnpm_9.configHook python3 # required for sqlite3 bindings - ] ++ lib.optional stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ xcbuild ]; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; diff --git a/third_party/nixpkgs/pkgs/tools/security/certdump/default.nix b/third_party/nixpkgs/pkgs/tools/security/certdump/default.nix index 8615fda62b..409650ac93 100644 --- a/third_party/nixpkgs/pkgs/tools/security/certdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/certdump/default.nix @@ -41,6 +41,6 @@ buildDotnetModule rec { license = licenses.asl20; maintainers = [ maintainers.baloo ]; # net5 has no osx-arm64 target available - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/certinfo/default.nix b/third_party/nixpkgs/pkgs/tools/security/certinfo/default.nix index f40b2a1eff..3d48985d78 100644 --- a/third_party/nixpkgs/pkgs/tools/security/certinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/certinfo/default.nix @@ -12,11 +12,11 @@ buildGoModule rec { }; # clipboard functionality not working on Darwin - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ libX11 ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/security/chainsaw/default.nix b/third_party/nixpkgs/pkgs/tools/security/chainsaw/default.nix index b529956a96..5789f48898 100644 --- a/third_party/nixpkgs/pkgs/tools/security/chainsaw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/chainsaw/default.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1w3DYP69aOphoqbsZIF9aX56Lftg2niKClmImLTa5DE="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + ]; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/security/cherrybomb/default.nix b/third_party/nixpkgs/pkgs/tools/security/cherrybomb/default.nix index 139ac5aea1..38783319e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cherrybomb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cherrybomb/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pj4+rG8XbrxVuNgnTVUTPmgrPBRSnoBnqFhOO/JGGWI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix index 304b10ca8a..73c1ade5bd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { pname = "chipsec"; version = "1.10.6"; - disabled = !stdenv.isLinux; + disabled = !stdenv.hostPlatform.isLinux; src = fetchFromGitHub { owner = "chipsec"; diff --git a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix index b44ccd5394..8747106509 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config rustc rust-bindgen rustfmt cargo python3 ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack json_c check - ] ++ lib.optional stdenv.isLinux systemd - ++ lib.optional stdenv.isDarwin Foundation; + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; cmakeFlags = [ "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd" diff --git a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix index 098bd180b5..2d34dc0164 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.19.0"; + version = "11.23.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-37i7lbkw70DpwCUvZtv6548l6csx3ozG+1gPTKhJQFg="; + hash = "sha256-oZCKNsbDdsqlh763/T23+A03Qt8f/XyC8MItMah+U3w="; }; proxyVendor = true; - vendorHash = "sha256-8+qS6fR/5oYHP1QhoHfByQ7AayYPYVg4xEtF3617aJM="; + vendorHash = "sha256-QqK527y4W+B7jhRoOkpt9QRyERA6Tn4Dwaq+gzN3k4U="; subPackages = [ "apps/cnspec" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix index 24092e5842..7d416cbdb6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -23,8 +23,8 @@ buildGoModule rec { }; buildInputs = - lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) - ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; + lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite) + ++ lib.optionals (stdenv.hostPlatform.isDarwin && pivKeySupport) [ PCSC ]; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix b/third_party/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix index 2a27f7b6a3..a8f75da90f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cyclonedx-gomod"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-gomod"; rev = "refs/tags/v${version}"; - hash = "sha256-RM8ZH1mO+72ptoU7YKXlCZAyDhYZ7MFXyDYrqBQwsDI="; + hash = "sha256-s5kzyQPf29RZPnPtgFf4IVHnOtVZOtGSQqy1BNVVykQ="; }; - vendorHash = "sha256-1ibMneSOYs5C6Ul8m/rVXVFBJHZrH1D5eWRwVVJ6a+A="; + vendorHash = "sha256-Sz2NCznyD0tMuho9kr+U35I8bS/WK276nPdt83k1zfU="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/security/dieharder/default.nix b/third_party/nixpkgs/pkgs/tools/security/dieharder/default.nix index 2cc5f719aa..c7804f0c5f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dieharder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dieharder/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gsl -, dieharder, testers }: +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dieharder"; version = "3.31.1"; src = fetchurl { - url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${version}.tgz"; + url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${finalAttrs.version}.tgz"; hash = "sha256-bP8P+DlMVTVJrHQzNZzPyVX7JnlCYDFGIN+l5M1Lcn8="; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ gsl ]; passthru = { - tests.version = testers.testVersion { package = dieharder; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ zhaofengli ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix b/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix index f56811cc27..e481744ee7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix @@ -4,20 +4,19 @@ , coreutils , lib , testers -, donkey }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "donkey"; version = "1.2.0"; src = fetchFromGitLab { owner = "donkey"; repo = "donkey"; - rev = "tags/release/${version}"; + rev = "tags/release/${finalAttrs.version}"; hash = "sha256-2xgb9l0Eko39HJVROAWEIP3qLg5t/5h/rm2MoXoKnJI="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; buildInputs = [ libmd ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { export INSTALL_DATA="${coreutils}/bin/install -m 444" ''; - passthru.tests.version = testers.testVersion { package = donkey; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Alternative for S/KEY's 'key' command"; @@ -51,4 +50,4 @@ The name "Donkey" is an acronym of "Don't Key". maintainers = with maintainers; [ raboof ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix b/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix index a8e812219b..f3bfb9fbff 100644 --- a/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix @@ -110,7 +110,7 @@ mkDerivation ( mainProgram = "echidna-test"; } - // lib.optionalAttrs (stdenv.isDarwin && stdenv.isAarch64) { + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { # https://github.com/NixOS/nixpkgs/pull/304352 postInstall = with haskellPackages; '' diff --git a/third_party/nixpkgs/pkgs/tools/security/feroxbuster/default.nix b/third_party/nixpkgs/pkgs/tools/security/feroxbuster/default.nix index f4e361332e..64975a04c9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/feroxbuster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/feroxbuster/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix index 2799a99097..52dc4a9bd7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--prefix" - (if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH") + (if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH") ":" (lib.makeLibraryPath [ nss ]) ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/freeze/default.nix b/third_party/nixpkgs/pkgs/tools/security/freeze/default.nix index 28ef216570..e828ed79bf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/freeze/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/freeze/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { "-w" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/Freeze $out/bin/freeze ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix index 0c326c2dac..f1e9a19768 100644 --- a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "Simple yet robust commandline random password generator"; diff --git a/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix b/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix index e0da2fdaf3..caf04cee0d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.rraval ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gfshare.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gfshare.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix b/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix index af20cb3ff7..61c5daf41a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.31.0"; + version = "1.32.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-ShczC0DvAO92apkNq5oyYRbkqGdqwl6vaCY1hn8O6so="; + hash = "sha256-yqR5kgXhR4YUih46RuSlOmD2CgdN40QpUho6WTha60U="; }; pythonRelaxDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix index 994cee822a..b898147d9a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { python3 python3Packages.pip ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild desktopToDarwinBundle ]; @@ -196,6 +196,6 @@ stdenv.mkDerivation (finalAttrs: { roblabla vringar ]; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix index 55f224da51..8f39076b4e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper icoutils - ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib diff --git a/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix index 5303e169e8..83e8b91f8b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { nativeCheckInputs = [ git ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export PATH=$TMPDIR/usr/bin:$PATH diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index 3d1a186b14..d8aee0952d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.19.0"; + version = "8.19.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-p4Va6qI/khXetN1ECRvFrsza5vqPVKKoUobhERWxDhI="; + hash = "sha256-VC8Bf6jcxXdBws7IParh9Srk34JiYVx5Tk2LLilrNJ4="; }; vendorHash = "sha256-DgCtWRo5KNuFCdhGJvzoH2v8n7mIxNk8eHyZFPUPo24="; diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix index 5181f78e8a..e0fdf3361f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix @@ -4,7 +4,7 @@ , adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib , enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite -, guiSupport ? stdenv.isDarwin, pinentry +, guiSupport ? stdenv.hostPlatform.isDarwin, pinentry , nixosTests }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in - '' + lib.optionalString (stdenv.isLinux && withPcsc) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config" ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}" - ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver"; postInstall = if enableMinimal then '' diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/24.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/24.nix index ef1b2e1db5..8c709e9b73 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg/24.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/24.nix @@ -4,8 +4,8 @@ , adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib , enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite -, guiSupport ? stdenv.isDarwin, pinentry -, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss +, guiSupport ? stdenv.hostPlatform.isDarwin, pinentry +, withTpm2Tss ? !stdenv.hostPlatform.isDarwin && !enableMinimal, tpm2-tss , nixosTests }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' + lib.optionalString (stdenv.isLinux && withPcsc) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}" ++ lib.optional withTpm2Tss "--with-tss=intel" - ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver"; postInstall = if enableMinimal then '' diff --git a/third_party/nixpkgs/pkgs/tools/security/go365/default.nix b/third_party/nixpkgs/pkgs/tools/security/go365/default.nix index 381df6d746..12fad05158 100644 --- a/third_party/nixpkgs/pkgs/tools/security/go365/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/go365/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-Io+69kIW4DV2EkA73pjaTcTRbDSYBf61R7F+141Jojs="; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/Go365 $out/bin/$pname ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index fc16820d1c..68b794214f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { git gnupg xclip - ] ++ lib.optional stdenv.isLinux wl-clipboard + ] ++ lib.optional stdenv.hostPlatform.isLinux wl-clipboard ); postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix b/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix index 28305ceb4e..6cbe088d68 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gotestwaf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.19"; + version = "0.5.5"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-ax2HPhdaqawpFe2AZg3SVsEJLG7gEgL7632iRADpaa8="; + hash = "sha256-stGjxv9cgYxxclQpyytN6dhFm2G1Gxbf9MdyKw6gEC4="; }; - vendorHash = null; + vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4="; # Some tests require networking as of v0.4.0 doCheck = false; @@ -28,11 +28,6 @@ buildGoModule rec { "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}" ]; - postFixup = '' - # Rename binary - mv $out/bin/cmd $out/bin/${pname} - ''; - passthru.tests.version = testers.testVersion { command = "gotestwaf --version"; package = gotestwaf; @@ -41,10 +36,10 @@ buildGoModule rec { meta = with lib; { description = "Tool for API and OWASP attack simulation"; - mainProgram = "gotestwaf"; homepage = "https://github.com/wallarm/gotestwaf"; changelog = "https://github.com/wallarm/gotestwaf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "gotestwaf"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/gowitness/default.nix b/third_party/nixpkgs/pkgs/tools/security/gowitness/default.nix index ab31281bbd..d4b893d9f8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gowitness/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gowitness/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "gowitness"; - version = "2.5.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "sensepost"; repo = "gowitness"; rev = "refs/tags/${version}"; - hash = "sha256-37OorjzxDu27FNAz4LTtQdFjt0tL9jSb9tGZhlq797Q="; + hash = "sha256-yKG4qLjeZThFEMqMnUv4ryvM2e3uH5GLuVP3oa6XHtE="; }; - vendorHash = "sha256-Exw5NfR3nDYH+hWMPOKuVIRyrVkOJyP7Kwe4jzQwnsI="; + vendorHash = "sha256-PjbC10Dh3tDF0mP2k4ei6ZSS3ND2wAaB1+Llmj37TR8="; ldflags = [ "-s" @@ -23,10 +24,10 @@ buildGoModule rec { meta = with lib; { description = "Web screenshot utility"; - mainProgram = "gowitness"; homepage = "https://github.com/sensepost/gowitness"; changelog = "https://github.com/sensepost/gowitness/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "gowitness"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix index ba07ffb9e6..5c4dd4620e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals x11Support [ libxcb libxkbcommon - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation libiconv diff --git a/third_party/nixpkgs/pkgs/tools/security/graphw00f/default.nix b/third_party/nixpkgs/pkgs/tools/security/graphw00f/default.nix index da0bd6b2a3..bb5b3a36d5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/graphw00f/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/graphw00f/default.nix @@ -1,23 +1,22 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "graphw00f"; - version = "1.1.17"; + version = "1.1.18"; format = "other"; src = fetchFromGitHub { owner = "dolevf"; - repo = pname; + repo = "graphw00f"; rev = "refs/tags/${version}"; - hash = "sha256-VeTFwn4PANGoW2Cb/IJ1KJb4YkjjDpaU7DLv0YwRwDU="; + hash = "sha256-gM6I3TLCuVKO1dTHl2jrXtmLOv29pTqrV18nGW5TYFY="; }; - propagatedBuildInputs = with python3.pkgs; [ - requests - ]; + dependencies = with python3.pkgs; [ requests ]; installPhase = '' runHook preInstall @@ -28,11 +27,12 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + meta = with lib; { description = "GraphQL Server Engine Fingerprinting utility"; - mainProgram = "graphw00f"; homepage = "https://github.com/dolevf/graphw00f"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "graphw00f"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix index 76123a7c89..7792165d25 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -6,7 +6,7 @@ }: let makefile = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then "makefile.mac" else "makefile"; in diff --git a/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix index 2dc57e8c07..988864cbf7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jwt \ diff --git a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix index ae16b3f00c..04c6923af0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix @@ -23,18 +23,18 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LcnvCWGVdBxhDgQDoGHXRppGeEpfjOv/F0dZMN2bOF8="; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isLinux [ python3 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration AppKit ]; preCheck = '' export HOME=$TMPDIR ''; checkFlags = [ "--skip=kbs2::config::tests::test_find_config_dir" ] - ++ lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; postInstall = '' mkdir -p $out/share/kbs2 diff --git a/third_party/nixpkgs/pkgs/tools/security/keepwn/default.nix b/third_party/nixpkgs/pkgs/tools/security/keepwn/default.nix index 9c878f37fd..8306cbe441 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keepwn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keepwn/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { termcolor ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/KeePwn $out/bin/$pname ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/kepler/default.nix b/third_party/nixpkgs/pkgs/tools/security/kepler/default.nix index e4d2fc914c..35e601dac1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kepler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kepler/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { openssl postgresql zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix index d8457c4872..103066261a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; tags = [ "production" ]; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix b/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix index ae5bd80e29..b2bd09d1f4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation IOKit diff --git a/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix b/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix index 5a3b0a7586..f7e636f8fa 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ "${with perlPackages; makePerlPath ([ CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser - ] ++ lib.optional stdenv.isDarwin MacPasteboard)}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin MacPasteboard)}" ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/kubeclarity/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubeclarity/default.nix index 585b4d35cd..25a6582695 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubeclarity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubeclarity/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs lvm2 ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix index 508601c109..6030c40b55 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "9.3.0"; + version = "9.4.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-qJAhxwVM/tYdCWLL1snUYjXGfgdcHkBFrI9xBg1/EXU="; + sha256 = "sha256-Vw+4/GVuTM4KioZnFk2RH6rmXD6zQO29NepAr2TwHjI="; }; - vendorHash = "sha256-6sxzRI22xiZOQds20iU5OsU+JqcNB2wOUrOZrOH1Sa4="; + vendorHash = "sha256-X0GPKR6l1v5312hOmelrcqp4KT3LwsGkvKoqUfEM0uU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix index 6c6bb7451e..8a832892b5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.63"; + version = "1.0.66"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-LL8uyzj97Fp7Vbv4WC8OjI2YUzml7v08ITXkDoJAbT4="; + hash = "sha256-zXXTeuEgcGaMkJGWwWQ6DpKPEZp6fjy5i4jRr4AvApQ="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix index ff9b297d53..21875006f4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Tool to wipe drives in a secure way"; diff --git a/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix b/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix index 5211f42b96..45db3985d5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 ] - ++ lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); diff --git a/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix b/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix index cdbf6df4dd..0936e0d980 100644 --- a/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix @@ -92,7 +92,7 @@ python3.pkgs.buildPythonApplication rec { "test_pdf_report" "test_self_check_db_negative_enabled" "test_self_check_db_positive_enable" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AsyncioProgressbarExecutor is slower on darwin than it should be, # Upstream issue: https://github.com/soxoj/maigret/issues/679 "test_asyncio_progressbar_executor" diff --git a/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix index a6aa990c1d..9606fe0f11 100644 --- a/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix broken install command substituteInPlace Makefile --replace "-pm755" "-pDm755" ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix b/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix index 53b0e38a0d..318284a431 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { { suffix = "donna"; configureFlags = ["--enable-donna"]; } ] ++ lib.optionals stdenv.hostPlatform.isx86 [ { suffix = "donna-sse2"; configureFlags = ["--enable-donna-sse2"]; } - ] ++ lib.optionals (!stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ { suffix = "amd64-51-30k"; configureFlags = ["--enable-amd64-51-30k"]; } { suffix = "amd64-64-24k"; configureFlags = ["--enable-amd64-64-24k"]; } ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix b/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix index e17081487d..78bf95ac6c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-gdoOBW5MD94RiKINVtTDvBQRZaJ9tlgu0eh7MxuMezg="; # Tests fails on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Fast HTTP enumerator"; diff --git a/third_party/nixpkgs/pkgs/tools/security/mpw/default.nix b/third_party/nixpkgs/pkgs/tools/security/mpw/default.nix index 4ee765bdbd..5900c72bcf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mpw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mpw/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { # Some tests are expected to fail on ARM64 # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 (mpw is a predecessor to spectre-cli and this issue is relevant to mpw as well) - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/tools/security/nbtscanner/default.nix b/third_party/nixpkgs/pkgs/tools/security/nbtscanner/default.nix index b70f554f33..ec6d9a1d66 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nbtscanner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nbtscanner/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ./Cargo.lock.patch ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "NetBIOS scanner written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/security/netexec/default.nix b/third_party/nixpkgs/pkgs/tools/security/netexec/default.nix index 33447f9851..06163309b1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/netexec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/netexec/default.nix @@ -101,6 +101,6 @@ python.pkgs.buildPythonApplication rec { # FIXME: failing fixupPhase: # $ Rewriting #!/nix/store/-python3-3.11.7/bin/python3.11 to #!/nix/store/-python3-3.11.7 # $ /nix/store/-wrap-python-hook/nix-support/setup-hook: line 65: 47758 Killed: 9 sed -i "$f" -e "1 s^#!/nix/store/-python3-3.11.7^#!/nix/store/-python3-3.11.7^" - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix index c675bcc982..28d9c74e5d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { wrapQtAppsHook ]; - buildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ + buildInputs = [ qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix b/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix index 1e5b418c3f..aa42558604 100644 --- a/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix @@ -3,7 +3,7 @@ let # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream securityDependency = - if stdenv.isDarwin then xmlsec + if stdenv.hostPlatform.isDarwin then xmlsec else pam; in stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency ]; - configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-pam" ]; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix b/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix index 048631e2b7..8693d35dfa 100644 --- a/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://tails.boum.org"; description = "GTK application to display Tor circuits and streams"; mainProgram = "onioncircuits"; diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix index b154efb747..b10d8718b7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix b/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix index b767261b4e..412053af2b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix @@ -2,7 +2,7 @@ , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages -, withApplePCSC ? stdenv.isDarwin +, withApplePCSC ? stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] - ++ lib.optional stdenv.isDarwin Carbon + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix index 748ec2ccf3..fb8ef894bb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix @@ -3,7 +3,7 @@ , which, openssh, procps, qrencode, makeWrapper, pass , xclip ? null, xdotool ? null, dmenu ? null -, x11Support ? !stdenv.isDarwin , dmenuSupport ? (x11Support || waylandSupport) +, x11Support ? !stdenv.hostPlatform.isDarwin , dmenuSupport ? (x11Support || waylandSupport) , waylandSupport ? false, wl-clipboard ? null , ydotool ? null, dmenu-wayland ? null @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { patches = [ ./set-correct-program-name-for-sleep.patch ./extension-dir.patch - ] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./no-darwin-getopt.patch; nativeBuildInputs = [ makeWrapper ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { openssh procps qrencode - ] ++ lib.optional stdenv.isDarwin openssl + ] ++ lib.optional stdenv.hostPlatform.isDarwin openssl ++ lib.optional x11Support xclip ++ lib.optional waylandSupport wl-clipboard ++ lib.optionals (waylandSupport && dmenuSupport) [ ydotool dmenu-wayland ] @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ -e '/which gpg/ d' \ tests/setup.sh - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # 'pass edit' uses hdid, which is not available from the sandbox. rm -f tests/t0200-edit-tests.sh rm -f tests/t0010-generate-tests.sh diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix index d3f196a205..4aa96fe409 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { ]; # Tests freeze on darwin with: pass-audit-1.1 (checkPhase): EOFError - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ python3.pkgs.green pass diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsc-tools/default.nix index c696fad309..39efa56655 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pcsc-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pcsc-tools/default.nix @@ -8,7 +8,7 @@ , pkg-config , wrapGAppsHook3 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, dbusSupport ? stdenv.isLinux, dbus +, dbusSupport ? stdenv.hostPlatform.isLinux, dbus , pcsclite , PCSC , wget @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { dbus ] ++ [ perlPackages.perl pcsclite - ] ++ lib.optional stdenv.isDarwin PCSC + ] ++ lib.optional stdenv.hostPlatform.isDarwin PCSC ++ lib.optional systemdSupport systemd; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix index eedec6b239..955611a465 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix @@ -12,7 +12,7 @@ , polkit , systemdLibs , udev -, dbusSupport ? stdenv.isLinux +, dbusSupport ? stdenv.hostPlatform.isLinux , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs , udevSupport ? dbusSupport , libusb1 @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ python3 ] ++ lib.optionals systemdSupport [ systemdLibs ] ++ lib.optionals (!systemdSupport && udevSupport) [ udev ] - ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation IOKit ] ++ lib.optionals dbusSupport [ dbus ] ++ lib.optionals polkitSupport [ polkit ] ++ lib.optionals (!udevSupport) [ libusb1 ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/quill/default.nix b/third_party/nixpkgs/pkgs/tools/security/quill/default.nix index 71ffc7af5c..3aa2e6525b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/quill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/quill/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; meta = with lib; { homepage = "https://github.com/dfinity/quill"; diff --git a/third_party/nixpkgs/pkgs/tools/security/rblake2sum/default.nix b/third_party/nixpkgs/pkgs/tools/security/rblake2sum/default.nix index 9052ffb68a..92b4f57474 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rblake2sum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rblake2sum/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-egwL3z7uB4AcRwPT0uPrenyh4FSxhbZKMdkPhRztMbs="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Recursive blake2 digest (hash) of a file-system path"; diff --git a/third_party/nixpkgs/pkgs/tools/security/rblake3sum/default.nix b/third_party/nixpkgs/pkgs/tools/security/rblake3sum/default.nix index 62f290cdf3..af04b20144 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rblake3sum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rblake3sum/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-SE/Zg/UEV/vhB/VDcn8Y70OUIoxbJBh6H2QgFMkWPc4="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Recursive blake3 digest (hash) of a file-system path"; diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index c04ed415fb..597b4c0ada 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -36,15 +36,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = [ bash ] # for git-credential-rbw - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.frameworks.AppKit ]; - preConfigure = lib.optionalString stdenv.isLinux '' + preConfigure = lib.optionalString stdenv.hostPlatform.isLinux '' export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" export OPENSSL_LIB_DIR="${lib.getLib openssl}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/ripasso/cursive.nix b/third_party/nixpkgs/pkgs/tools/security/ripasso/cursive.nix index b7cc5d969d..fe216b91ff 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ripasso/cursive.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ripasso/cursive.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { gpgme xorg.libxcb nettle - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/rucredstash/default.nix b/third_party/nixpkgs/pkgs/tools/security/rucredstash/default.nix index 972695ad56..43166eb0bf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rucredstash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rucredstash/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-TYobVjjzrK3gprZcYyY98EvdASkq4urB+WiLlbJbwmk="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix index fc3ab5b2e0..6af9b974ac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { patchShebangs fixtures/.rustscan_scripts/* ''; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = [ perl diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 14e408275e..1afba85be3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { vendorHash = "sha256-gtl8T8wXnpLgDZc6qSgFKpA+XbcLNHf20ieBkyNdE+s="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; subPackages = [ "." diff --git a/third_party/nixpkgs/pkgs/tools/security/schleuder/default.nix b/third_party/nixpkgs/pkgs/tools/security/schleuder/default.nix index cce88366a3..8429cb0ea0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/schleuder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/schleuder/default.nix @@ -24,7 +24,7 @@ bundlerApp { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Schleuder is an encrypting mailing list manager with remailing-capabilities"; longDescription = '' Schleuder is a group's email-gateway: subscribers can exchange diff --git a/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix index d1deaa0ec4..d199ee3772 100644 --- a/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - nativeCheckInputs = lib.optionals stdenv.isLinux [ util-linux ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]; meta = with lib; { description = "Encryption utility"; diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index 96d15250e1..81091848a9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { nettle openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix index 9df5da79e8..a2dda44938 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ libgpg-error gpgme gettext installShellFiles ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; buildFeatures = [ "vault" "extract" "completions" "substitute" "process" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/snowcrash/default.nix b/third_party/nixpkgs/pkgs/tools/security/snowcrash/default.nix index 69d310afb9..b787b0da59 100644 --- a/third_party/nixpkgs/pkgs/tools/security/snowcrash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/snowcrash/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "." ]; - postFixup = lib.optionals (!stdenv.isDarwin) '' + postFixup = lib.optionals (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/SNOWCRASH $out/bin/${pname} ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/softhsm/default.nix b/third_party/nixpkgs/pkgs/tools/security/softhsm/default.nix index e4c428b90b..d755e131d8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/softhsm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/softhsm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc Security ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security ]; buildInputs = [ botan2 sqlite ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix index a241e87801..387bf00e37 100644 --- a/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ pcsclite udev ] - ++ lib.optionals stdenv.isDarwin [ PCSC IOKit CoreFoundation AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ PCSC IOKit CoreFoundation AppKit ]; postInstall = '' install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules diff --git a/third_party/nixpkgs/pkgs/tools/security/spectre-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/spectre-cli/default.nix index 923046cdad..ba63b823e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/spectre-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/spectre-cli/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # Some tests are expected to fail on ARM64 # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); checkPhase = '' mv ../spectre-cli-tests ../spectre_tests.xml ./ diff --git a/third_party/nixpkgs/pkgs/tools/security/ssdeep/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssdeep/default.nix index 68b8afdf67..b3ec01ebdb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssdeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssdeep/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix index 6694a9edaa..4c59595ec9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix @@ -63,7 +63,7 @@ buildPythonApplication rec { setuptools sshpubkeys wrapt - ] ++ lib.optionals stdenv.isDarwin [ setuptools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ setuptools ]; # fix for darwin users nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix index 4cf19ea2da..b65ba77ff2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-wGtNaejzAOgOuYDEKz6xMCaoaHsiDuQZj0KKpcejphE="; + sha256 = "sha256-cEEFz/iVhvfo8CffC9wkIRnF26xL+roaqKsLmUgfUiA="; }; - vendorHash = "sha256-w/REcFeH58DTQwgotxSBVR4y7aQ9rBDX2U0A4vJno7s="; + vendorHash = "sha256-FH+etKil0oiiB5tvDYS2nu1HG4yZTWZuRhtYnbq4Os4="; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix index 2090c4d396..e52453e800 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { installManPage docs/_build/man/* wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \ + --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.hostPlatform.isLinux [ iptables nettools ])}" \ ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix index ab699f8f02..6c12b20a61 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "refs/tags/${version}"; - hash = "sha256-we55Oo9sIZ1FQn94xejlCKwlZBDMrQs/1f++blXTTUM="; + hash = "sha256-K0OJvb9jym7P6ehtV5M/edq4ZKwacn8D5IC4PyttqZY="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix index 549cfa6a52..f37c05f93f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix @@ -32,8 +32,8 @@ buildGoModule rec { nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; buildInputs = - lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ] - ++ lib.optionals (hsmSupport && stdenv.isDarwin) [ PCSC ]; + lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ] + ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ PCSC ]; postPatch = '' substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill" diff --git a/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix index fd05210117..ba35b7c110 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-5ECiAUgRWZ7hti/gr/RrOO0NV2Cd1EPVHJ5/0F+fzsc="; + hash = "sha256-MxGhG8ehXT7ftXfoVHMSpyIr25tWj5Yq50nZZW/q5sQ="; }; - vendorHash = "sha256-iobfA3I4/ckWdpjmxm4NfmxHzg0vUx9+rY8gBLcC+Ps="; + vendorHash = "sha256-5TWofXHtiBhfsSg3UgSju+7EO+t9bUktsd/WUAH5R5U="; proxyVendor = true; @@ -48,6 +48,6 @@ buildGoModule rec { maintainers = with maintainers; [ qbit ]; mainProgram = "step-kms-plugin"; # can't find pcsclite header files - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix index b39c43a8e1..6b1bdb4c03 100644 --- a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: { openssl libtasn1 glib json-glib gnutls - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse libseccomp ]; configureFlags = [ "--localstatedir=/var" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-cuse" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix index 8b00431b6c..1d34fdd4e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl libpcap ] - ++ lib.optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://tcpcrypt.org/"; description = "Fast TCP encryption"; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix index aa0e9fd8fb..412691d2b9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace-fail "-lcurses" "-lncurses" ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-undef-prefix"; nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index 30eb8360fe..164526a8e1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl zlib xz zstd scrypt ] ++ - lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; + lib.optionals stdenv.hostPlatform.isLinux [ libseccomp systemd libcap ]; patches = [ ./disable-monotonic-timer-tests.patch ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] ++ # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599 - lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ] + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "--disable-seccomp" ] ; NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # disable tests on linux aarch32 # https://gitlab.torproject.org/tpo/core/tor/-/issues/40912 - doCheck = !(stdenv.isLinux && stdenv.isAarch32); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32); postInstall = '' mkdir -p $geoip/share/tor diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/torsocks.nix b/third_party/nixpkgs/pkgs/tools/security/tor/torsocks.nix index 0ad36688bd..8b09bfc3bf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/torsocks.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/torsocks.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ src/bin/torsocks.in - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i \ -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ src/bin/torsocks.in diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 683e322887..0362b8545d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.82.2"; + version = "3.82.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-reQJE3UG1bWS3RrMW2c4nq/2AOQ3mYtbXVKu+cwzrJM="; + hash = "sha256-Kv7IS7kladdTbPPWbgylqPrqSdn4r9USUMm4rnC4H08="; }; - vendorHash = "sha256-h3thO9sYYv2yiVcBPEu36RiYgYNnumRc73bNXNOIdA4="; + vendorHash = "sha256-dRxnxwxQKdFNf6Ng0E2AQDef1zb3RlBH7glczfYKWMQ="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 32ad1196ed..007edb9c6a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { postInstall = '' echo "complete -C $out/bin/vault vault" > vault.bash installShellCompletion vault.bash - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/vault \ --prefix PATH ${lib.makeBinPath [ gawk glibc ]} ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index 7a829e1ad2..9cfdc187ea 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 137f9e6c95..f28bc52fdb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security CoreServices SystemConfiguration ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security CoreServices SystemConfiguration ] ++ lib.optional (dbBackend == "mysql") libmysqlclient ++ lib.optional (dbBackend == "postgresql") postgresql; diff --git a/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix b/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix index 8567798ea8..90af2f2206 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix @@ -47,18 +47,18 @@ stdenv.mkDerivation rec { libedit curl openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite.dev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.PCSC libiconv ]; - preBuild = lib.optionalString stdenv.isLinux '' + preBuild = lib.optionalString stdenv.hostPlatform.isLinux '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags libpcsclite) $NIX_CFLAGS_COMPILE" ''; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DDISABLE_LTO=ON" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix b/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix index f43e83e575..f2e290ade6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix @@ -12,12 +12,12 @@ buildGoModule rec { }; buildInputs = - lib.optional stdenv.isLinux (lib.getDev pcsclite) - ++ lib.optional stdenv.isDarwin (darwin.apple_sdk.frameworks.PCSC); + lib.optional stdenv.hostPlatform.isLinux (lib.getDev pcsclite) + ++ lib.optional stdenv.hostPlatform.isDarwin (darwin.apple_sdk.frameworks.PCSC); - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; @@ -29,7 +29,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/lib/systemd/user substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" diff --git a/third_party/nixpkgs/pkgs/tools/security/zmap/default.nix b/third_party/nixpkgs/pkgs/tools/security/zmap/default.nix index 1749c9ef6d..b7a9986434 100644 --- a/third_party/nixpkgs/pkgs/tools/security/zmap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/zmap/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Fast single packet network scanner designed for Internet-wide network surveys"; maintainers = with maintainers; [ ma27 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix index 464c5f67ed..e950cd957e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-WIJyCpnlD6/c7PG+ZPmUT8qfPelRY9Od1Dk9Ro1y1yY="; }; - buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ]; + buildInputs = [ oniguruma ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap acl liburing ]; configureFlags = [ "--enable-release" ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix index d38b018128..0f67b4111a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - hash = "sha256-kjSyIgLTObTOKMG5dk49XmWPXZpCWbLdpkmAsJcFliA="; + hash = "sha256-A5hOBxj8tKlkHd8zDHfDoU6fIu8gDpt3/usbiDk0/G0="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { autoAddDriverRunpath ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.IOKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix index 50e72498bf..465bba682b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU="; }; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ ocl-icd opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix index bbcc9f704b..b75cdb19de 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libtool - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ] ++ plugins.buildInputs; diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix index 9ca18b0620..7202ec795e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix @@ -51,10 +51,10 @@ let plugins = { amqp.buildInputs = [ yajl - ] ++ lib.optionals stdenv.isLinux [ rabbitmq-c ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rabbitmq-c ]; apache.buildInputs = [ curl ]; ascent.buildInputs = [ curl libxml2 ]; - battery.buildInputs = lib.optionals stdenv.isDarwin [ + battery.buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; bind.buildInputs = [ curl libxml2 ]; @@ -63,30 +63,30 @@ let curl_json.buildInputs = [ curl yajl ]; curl_xml.buildInputs = [ curl libxml2 ]; dbi.buildInputs = [ libdbi ]; - disk.buildInputs = lib.optionals stdenv.isLinux [ + disk.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; dns.buildInputs = [ libpcap ]; ipmi.buildInputs = [ openipmi ]; iptables.buildInputs = [ libpcap - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ iptables libmnl ]; java.buildInputs = [ jdk libgcrypt libxml2 ]; log_logstash.buildInputs = [ yajl ]; lua.buildInputs = [ lua ]; memcachec.buildInputs = [ libmemcached cyrus_sasl ]; - modbus.buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; + modbus.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmodbus ]; mqtt.buildInputs = [ mosquitto ]; mysql.buildInputs = lib.optionals (libmysqlclient != null) [ libmysqlclient ]; netlink.buildInputs = [ libpcap - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libmnl ]; network.buildInputs = [ libgcrypt ]; @@ -104,15 +104,15 @@ let redis.buildInputs = [ hiredis ]; rrdcached.buildInputs = [ rrdtool libxml2 ]; rrdtool.buildInputs = [ rrdtool libxml2 ]; - sensors.buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; - sigrok.buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; - smart.buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; - snmp.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - snmp_agent.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + sensors.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ lm_sensors ]; + sigrok.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsigrok udev ]; + smart.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libatasmart udev ]; + snmp.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ net-snmp ]; + snmp_agent.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ net-snmp ]; varnish.buildInputs = [ curl varnish ]; virt.buildInputs = [ libvirt libxml2 yajl - ] ++ lib.optionals stdenv.isLinux [ lvm2 udev ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lvm2 udev ]; write_http.buildInputs = [ curl yajl ]; write_kafka.buildInputs = [ yajl rdkafka ]; write_log.buildInputs = [ yajl ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix index c386536e1f..518d54898d 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-j1qSMPNCtAxClqYqWkRNQmtxkitYi7g/9KtQ5XqcX3w="; }; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ ./einval.patch # patches needed for musl libc, borrowed from alpine packaging. @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ autoreconfHook po4a ]; - buildInputs = lib.optional (!stdenv.isDarwin) libcap; + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) libcap; postUnpack = '' sed -i \ diff --git a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix index d73d8dda7a..11c1c1d945 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python3 zlib ] - ++ lib.optional (!stdenv.isDarwin) libaio; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libaio; # ./configure does not support autoconf-style --build=/--host=. # We use $CC instead. diff --git a/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix b/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix index a1a09826c5..bdf846e029 100644 --- a/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "mac" ]; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "mac" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index dfb1179a08..4ba0492148 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { installManPage gdu.1 ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # https://github.com/dundee/gdu/issues/371 diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix index 5305b127a1..b2279e0f13 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix b/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix index 2718be70c7..798d1b223e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs gdisk_test.sh - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.mac --replace \ "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6" substituteInPlace Makefile.mac --replace \ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "/usr/local/Cellar/ncurses/6.2/lib/libncurses.dylib" "${ncurses.out}/lib/libncurses.dylib" ''; - buildPhase = lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; + buildPhase = lib.optionalString stdenv.hostPlatform.isDarwin "make -f Makefile.mac"; buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix b/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix index cd9fd43615..484ab05a85 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-P+qez0oVsHBiaBYban2o8MRvF8ElLf5zb+p+tYunWWA="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; buildFeatures = [ "cli" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index 55e9b5e936..c0a689c4c6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -3,11 +3,11 @@ , IOKit , libcap , libnl -, sensorsSupport ? stdenv.isLinux, lm_sensors +, sensorsSupport ? stdenv.hostPlatform.isLinux, lm_sensors , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: -assert systemdSupport -> stdenv.isLinux; +assert systemdSupport -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "htop"; @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ] - ++ lib.optional stdenv.isLinux pkg-config + ++ lib.optional stdenv.hostPlatform.isLinux pkg-config ; buildInputs = [ ncurses ] - ++ lib.optional stdenv.isDarwin IOKit - ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl ] ++ lib.optional sensorsSupport lm_sensors ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-affinity" "--enable-capabilities" "--enable-delayacct" diff --git a/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix b/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix index 3bbcd917fb..bd0dba9a02 100644 --- a/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar - ant -f build.xml -Dbits=${if stdenv.isi686 then "32" else "64"} + ant -f build.xml -Dbits=${if stdenv.hostPlatform.isi686 then "32" else "64"} runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix index 682158af76..b55d5227b0 100644 --- a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; buildFeatures = lib.optional withCmd "cmd"; @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ bmanuel linj ]; platforms = platforms.unix; mainProgram = "kanata"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index c7c7554914..b8746229d8 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -42,15 +42,15 @@ withDBengine ? true, withDebug ? false, withEbpf ? false, - withIpmi ? (stdenv.isLinux), - withNetfilter ? (stdenv.isLinux), - withNetworkViewer ? (stdenv.isLinux), + withIpmi ? (stdenv.hostPlatform.isLinux), + withNetfilter ? (stdenv.hostPlatform.isLinux), + withNetworkViewer ? (stdenv.hostPlatform.isLinux), withSsl ? true, - withSystemdJournal ? (stdenv.isLinux), + withSystemdJournal ? (stdenv.hostPlatform.isLinux), zlib, }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { version = "1.47.1"; @@ -96,7 +96,7 @@ stdenv'.mkDerivation (finalAttrs: { zlib libyaml ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreFoundation @@ -104,7 +104,7 @@ stdenv'.mkDerivation (finalAttrs: { libossp_uuid ] ) - ++ lib.optionals (stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libcap libuuid lm_sensors @@ -153,7 +153,7 @@ stdenv'.mkDerivation (finalAttrs: { # Relocate one folder above. mv $out/usr/* $out/ '' - + lib.optionalString (stdenv.isLinux) '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org diff --git a/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix b/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix index f9aeba937a..88dafe7f4f 100644 --- a/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Tool for creating NATS account and user access configurations"; diff --git a/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix b/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix index 56e1912324..6d1e778da3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ ed ]; - buildInputs = [ perl which ] ++ (if !stdenv.isDarwin then [ + buildInputs = [ perl which ] ++ (if !stdenv.hostPlatform.isDarwin then [ fontconfig freetype # fontsrv uses these libX11 libXext libXt xorgproto ] else [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { CC9='$(command -v $CC)' CFLAGS='$NIX_CFLAGS_COMPILE' LDFLAGS='$(for f in $NIX_LDFLAGS; do echo "-Wl,$f"; done | xargs echo)' - ${lib.optionalString (!stdenv.isDarwin) "X11='${libXt.dev}/include'"} + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "X11='${libXt.dev}/include'"} EOF # make '9' available in the path so there's some way to find out $PLAN9 diff --git a/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix b/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix index c19f7a54f0..0287a3d3a5 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-Wno-error=format"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/third_party/nixpkgs/pkgs/tools/system/runit/default.nix b/third_party/nixpkgs/pkgs/tools/system/runit/default.nix index 2553c07cd6..10333d0f60 100644 --- a/third_party/nixpkgs/pkgs/tools/system/runit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/runit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++ - lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; + lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; postPatch = '' sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Both of these are originally hard-coded to gcc echo ${stdenv.cc.targetPrefix}cc > conf-cc - echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld + echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.hostPlatform.isDarwin "-Xlinker -x "}> conf-ld ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix b/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix index 15bedadcce..c153b3033f 100644 --- a/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2Plus; maintainers = [ ]; - broken = stdenv.isDarwin; # https://github.com/amanusk/s-tui/issues/49 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/amanusk/s-tui/issues/49 mainProgram = "s-tui"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 55ec05d2a9..b8c594dde4 100644 --- a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -1,13 +1,15 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, enableMail ? false -, gnused -, hostname -, mailutils -, IOKit -, ApplicationServices +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + enableMail ? false, + gnused, + hostname, + mailutils, + systemdLibs, + IOKit, + ApplicationServices, }: let @@ -18,7 +20,13 @@ let sha256 = "sha256-0dtLev4JjeHsS259+qOgg19rz4yjkeX4D3ooUgS4RTI="; name = "smartmontools-drivedb.h"; }; - scriptPath = lib.makeBinPath ([ gnused hostname ] ++ lib.optionals enableMail [ mailutils ]); + scriptPath = lib.makeBinPath ( + [ + gnused + hostname + ] + ++ lib.optionals enableMail [ mailutils ] + ); in stdenv.mkDerivation rec { @@ -45,7 +53,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ systemdLibs ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + ApplicationServices + ]; enableParallelBuilding = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index ebd209d2c8..c189606cd0 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # install phase without checking the dependencies. This will prevent # triggering the rebuild. Why this only happens on i686 remains a # mystery, though. :-( - enableParallelBuilding = (!stdenv.isi686); + enableParallelBuilding = (!stdenv.hostPlatform.isi686); meta = with lib; { description = "Stress test a computer system"; diff --git a/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix b/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix index e4d24802a5..8761576d19 100644 --- a/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix @@ -7,8 +7,8 @@ , libjpeg , zlib , libewf -, enableNtfs ? !stdenv.isDarwin, ntfs3g ? null -, enableExtFs ? !stdenv.isDarwin, e2fsprogs ? null +, enableNtfs ? !stdenv.hostPlatform.isDarwin, ntfs3g ? null +, enableExtFs ? !stdenv.hostPlatform.isDarwin, e2fsprogs ? null , enableQt ? false, qtbase ? null, qttools ? null, qwt ? null }: diff --git a/third_party/nixpkgs/pkgs/tools/system/tree/default.nix b/third_party/nixpkgs/pkgs/tools/system/tree/default.nix index 069723b7bd..fbd0f08d11 100644 --- a/third_party/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/tree/default.nix @@ -4,14 +4,14 @@ let # These settings are found in the Makefile, but there seems to be no # way to select one or the other setting other than editing the file # manually, so we have to duplicate the know how here. - systemFlags = lib.optionalString stdenv.isDarwin '' + systemFlags = lib.optionalString stdenv.hostPlatform.isDarwin '' CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp" LDFLAGS= - '' + lib.optionalString stdenv.isCygwin '' + '' + lib.optionalString stdenv.hostPlatform.isCygwin '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS=-s TREE_DEST=tree.exe - '' + lib.optionalString (stdenv.isFreeBSD || stdenv.isOpenBSD) '' + '' + lib.optionalString (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isOpenBSD) '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS=-s ''; # use linux flags by default diff --git a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix index 4af272ccb4..ffb530600b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix @@ -7,7 +7,7 @@ , makeWrapper }: -assert nvidiaSupport -> stdenv.isLinux; +assert nvidiaSupport -> stdenv.hostPlatform.isLinux; rustPlatform.buildRustPackage rec { pname = "zenith"; @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; buildFeatures = lib.optional nvidiaSupport "nvidia"; diff --git a/third_party/nixpkgs/pkgs/tools/system/zx/default.nix b/third_party/nixpkgs/pkgs/tools/system/zx/default.nix index 757ee6d75d..152fef3acc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/zx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/zx/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.1.7"; + version = "8.1.8"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-oQL3EI4yTQOi+BM9ZkTILYulWD13Pof3JC1KVLSJWcA="; + hash = "sha256-d/U37QWC6e41P9GuohpWjP0MNZCzHbxFMBBASpIKpQk="; }; - npmDepsHash = "sha256-colrMoVN5uGVBeCvDfEU9tjjW9qkaiSKHPmTZ83EgCk="; + npmDepsHash = "sha256-2v8pGIB5W2jgjsJPKBjymAv2rzq9judVdYZexohAclo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/amber/default.nix b/third_party/nixpkgs/pkgs/tools/text/amber/default.nix index 0b81281fad..ce8243770b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/amber/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-nBSgP30Izskq9RbhVIyqWzZgG5ZWHVdiukldw+Q0rco="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; meta = with lib; { description = "Code search-and-replace tool"; diff --git a/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix b/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix index 3546b79e0a..c752c9cf11 100644 --- a/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cp ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoBuildFlags = [ "-p" "autocorrect-cli" ]; cargoTestFlags = [ "-p" "autocorrect-cli" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/chars/default.nix b/third_party/nixpkgs/pkgs/tools/text/chars/default.nix index 509953e805..ca2ad027c2 100644 --- a/third_party/nixpkgs/pkgs/tools/text/chars/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/chars/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-wqyExG4haco6jg1zpbouz3xMR7sjiVIAC16PnDU2tc8="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Commandline tool to display information about unicode characters"; diff --git a/third_party/nixpkgs/pkgs/tools/text/clima/default.nix b/third_party/nixpkgs/pkgs/tools/text/clima/default.nix index 65483e1152..f7e6ee15d7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/clima/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/clima/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jKY+Ta6lqMBUlqSViKk3W0CiO8oU+ucmleKDYRA54HQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix b/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix index 20cee369e7..b7b08a7627 100644 --- a/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation { makeFlags = [ "INSTALL=install" ]; - buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ]; + buildFlags = [ (if stdenv.hostPlatform.isDarwin then "osx-all" else "gcc-all") ]; - installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; + installTargets = [ (if stdenv.hostPlatform.isDarwin then "osx-install" else "gcc-install") ]; meta = with lib; { description = "Tool that supports Japanese incremental search with Romaji"; diff --git a/third_party/nixpkgs/pkgs/tools/text/coloursum/default.nix b/third_party/nixpkgs/pkgs/tools/text/coloursum/default.nix index 78f583e3f7..8e84a1de14 100644 --- a/third_party/nixpkgs/pkgs/tools/text/coloursum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/coloursum/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dhcTpff4h37MHNbLoYUZiolSclSGcFrMJ3kKLCZAVAw="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Colourise your checksum output"; diff --git a/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix index 1a1b70c951..14f33ae0c5 100644 --- a/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix @@ -7,18 +7,17 @@ , installShellFiles , jre , makeWrapper -, crowdin-cli , testers , unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-D0wx570pU1FuyoQ62ZPN1v9jC9tRrJuuQet8D8w2v+M="; + url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; + hash = "sha256-158zbgYw4FP/vQVsSs9tt9VcisBWpRn/D4ORiM24PYY="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = crowdin-cli; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { mainProgram = "crowdin"; @@ -48,4 +47,4 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ DamienCassou ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix b/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix index 0f438e4ff5..458a76cf59 100644 --- a/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix @@ -41,7 +41,7 @@ buildGoModule { homepage = "https://github.com/Debian/dcs"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isAarch64 - || stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dcs.x86_64-darwin + broken = stdenv.hostPlatform.isAarch64 + || stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dcs.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix b/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix index 9abc2fac51..fbdf221d12 100644 --- a/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-RmQu55OnKfeuDGcJrfjhMKnxDatdowkvh3Kh4N8I8Sg="; - buildInputs = (lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional stdenv.hostPlatform.isDarwin Security); preCheck = '' export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr diff --git a/third_party/nixpkgs/pkgs/tools/text/discount/default.nix b/third_party/nixpkgs/pkgs/tools/text/discount/default.nix index e71b5941ea..d2219955d3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/discount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/discount/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/libmarkdown.dylib" "$out/lib/libmarkdown.dylib" for exe in $out/bin/*; do install_name_tool -change libmarkdown.dylib "$out/lib/libmarkdown.dylib" "$exe" diff --git a/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix b/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix index e7b2f3b107..f8cc3055e9 100644 --- a/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sFrABp4oYhel+GONFsTbunq+4We2DicvF9A3FT/ZArc="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; meta = with lib; { description = "Utility that makes sweeping changes to large, shared code bases"; diff --git a/third_party/nixpkgs/pkgs/tools/text/fst/default.nix b/third_party/nixpkgs/pkgs/tools/text/fst/default.nix index 1f1b2950e1..c43a781cf6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/fst/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/fst/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yTbEaw+BbjVks3j7/b75kGoUjVftLaVYvYIdI/bbfdk="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix index 941e102cb3..103f9e16eb 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -7,16 +7,16 @@ , autoreconfHook # no-pma fix /* Test suite broke on: - stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 - || stdenv.isDarwin # XXX: `locale' segfaults - || stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff? - || stdenv.isFreeBSD + stdenv.hostPlatform.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 + || stdenv.hostPlatform.isDarwin # XXX: `locale' segfaults + || stdenv.hostPlatform.isSunOS # XXX: `_backsmalls1' fails, locale stuff? + || stdenv.hostPlatform.isFreeBSD */ -, doCheck ? (interactive && stdenv.isLinux), glibcLocales ? null +, doCheck ? (interactive && stdenv.hostPlatform.isLinux), glibcLocales ? null , locale ? null }: -assert (doCheck && stdenv.isLinux) -> glibcLocales != null; +assert (doCheck && stdenv.hostPlatform.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { autoreconfHook ] ++ lib.optionals interactive [ removeReferencesTo - ] ++ lib.optionals (doCheck && stdenv.isLinux) [ + ] ++ lib.optionals (doCheck && stdenv.hostPlatform.isLinux) [ glibcLocales ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { readline ] ++ lib.optionals withSigsegv [ libsigsegv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ locale ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix index 86bf2beaa9..eaf7799a48 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix @@ -109,14 +109,14 @@ let #! No such device # mdb_env_open(env, /dev/null) #! Operation not supported by device - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; }; mbs = buildExtension { inherit gawkextlib; name = "mbs"; extraBuildInputs = [ glibcLocales ]; #! "spät": length: 5, mbs_length: 6, wcswidth: 4 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; }; mpfr = buildExtension { inherit gawkextlib; diff --git a/third_party/nixpkgs/pkgs/tools/text/glogg/default.nix b/third_party/nixpkgs/pkgs/tools/text/glogg/default.nix index 7a6562aab1..04aac6b0b8 100644 --- a/third_party/nixpkgs/pkgs/tools/text/glogg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/glogg/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "0hf1c2m8n88frmxmyn0ndr8129p7iky49nq565sw1asaydm5z6pb"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace glogg.pro \ --replace "boost_program_options-mt" "boost_program_options" ''; @@ -21,7 +21,7 @@ mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/glogg.app $out/Applications/glogg.app rm -fr $out/{bin,share} diff --git a/third_party/nixpkgs/pkgs/tools/text/gnugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/gnugrep/default.nix index 7298fe881b..bbb876703f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gnugrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gnugrep/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation { outputs = [ "out" "info" ]; # the man pages are rather small nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - buildInputs = [ pcre2 libiconv runtimeShellPackage ]; + buildInputs = [ pcre2 libiconv ] ++ lib.optional (!stdenv.hostPlatform.isWindows) runtimeShellPackage; # cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator - doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD && !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64; + doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64; # On macOS, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. diff --git a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix index a2f91efc94..868de0fb67 100644 --- a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -15,7 +15,7 @@ let enableParallelBuilding = true; nativeBuildInputs = [ pkg-config swig perl ] - ++ lib.optional stdenv.isDarwin gcc; + ++ lib.optional stdenv.hostPlatform.isDarwin gcc; buildInputs = [ getopt lua boost libxcrypt ]; @@ -35,15 +35,15 @@ let # This has to happen _before_ the main build because it does a # `make clean' for some reason. - preBuild = lib.optionalString (!stdenv.isDarwin) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -C extras/swig $makeFlags perl ''; - postCheck = lib.optionalString (!stdenv.isDarwin) '' + postCheck = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' perl -Iextras/swig extras/swig/testmod.pl ''; - preInstall = lib.optionalString (!stdenv.isDarwin) '' + preInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/${perl.libPrefix} install -m644 extras/swig/highlight.{so,pm} $out/${perl.libPrefix} make -C extras/swig clean # Clean up intermediate files. @@ -59,5 +59,5 @@ let }; in - if stdenv.isDarwin then self + if stdenv.hostPlatform.isDarwin then self else perl.pkgs.toPerlModule self diff --git a/third_party/nixpkgs/pkgs/tools/text/html2text/default.nix b/third_party/nixpkgs/pkgs/tools/text/html2text/default.nix index 247ee8e814..afa4bb1140 100644 --- a/third_party/nixpkgs/pkgs/tools/text/html2text/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/html2text/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = { description = "Convert HTML to plain text"; diff --git a/third_party/nixpkgs/pkgs/tools/text/hyx/default.nix b/third_party/nixpkgs/pkgs/tools/text/hyx/default.nix index 3cbcac2096..e41f9bbfce 100644 --- a/third_party/nixpkgs/pkgs/tools/text/hyx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/hyx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-dufx3zsabeet7Rp0d60MIuNqisIQd6UgE7WDZYNHl3E="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "-Wl,-z,relro,-z,now -fpic -pie" "" ''; diff --git a/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix index e2751197c7..a4c4a134c4 100644 --- a/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-raSz/+u7P04qHmvdfYoWKOKtNtaFlgmT8Nw0ImhCMkU="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; passthru.tests = { version = testers.testVersion { package = igrep; command = "ig --version"; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix b/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix index 3dea94d091..844f35612f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' cat >> local.h < 1.5) chronic (~> 0.10) @@ -14,4 +14,4 @@ DEPENDENCIES papertrail BUNDLED WITH - 2.1.4 + 2.5.16 diff --git a/third_party/nixpkgs/pkgs/tools/text/papertrail/default.nix b/third_party/nixpkgs/pkgs/tools/text/papertrail/default.nix index 5e2b080f98..a01bc3fb88 100644 --- a/third_party/nixpkgs/pkgs/tools/text/papertrail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/papertrail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript, testers, papertrail }: let papertrail-env = bundlerEnv { @@ -21,6 +21,8 @@ in stdenv.mkDerivation { passthru.updateScript = bundlerUpdateScript "papertrail"; + passthru.tests.version = testers.testVersion { package = papertrail; }; + meta = with lib; { description = "Command-line client for Papertrail log management service"; mainProgram = "papertrail"; diff --git a/third_party/nixpkgs/pkgs/tools/text/papertrail/gemset.nix b/third_party/nixpkgs/pkgs/tools/text/papertrail/gemset.nix index dcdfcdf7ea..abfbed17a9 100644 --- a/third_party/nixpkgs/pkgs/tools/text/papertrail/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/text/papertrail/gemset.nix @@ -1,5 +1,7 @@ { ansi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14ims9zfal4gs2wpx2m5rd8zsrl2k794d359shkrsgg3fhr2a22l"; @@ -8,6 +10,8 @@ version = "1.5.0"; }; chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -16,11 +20,14 @@ version = "0.10.2"; }; papertrail = { + dependencies = ["ansi" "chronic"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vb7bh7qh5hr4v3w711bl0yrr3rlhz5c3h3qx3fq31dr5y4100v7"; + sha256 = "170zhgahrgpwj4cb9xj8104yqcf9gva8qk5vqpmw3g8rq29jxshy"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.2"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix b/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix index b2427e4f5f..e287c2a5cc 100644 --- a/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jeRKtKv8Lg/ritl42dMbEQpXaNlCIaHTrw0xtPQitMc="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Simple command line tool for converting Chinese characters to space-separate pinyin words"; diff --git a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix index 6133bc409d..101a08422c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ dasj19 ]; # configure: error: GTK+ build of wxWidgets is required - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/rare-regex/default.nix b/third_party/nixpkgs/pkgs/tools/text/rare-regex/default.nix index b565ed8ade..1c9bece2ff 100644 --- a/third_party/nixpkgs/pkgs/tools/text/rare-regex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/rare-regex/default.nix @@ -2,7 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub -, withPcre2 ? stdenv.isLinux +, withPcre2 ? stdenv.hostPlatform.isLinux , pcre2 , testers , rare-regex diff --git a/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix index 1356dc64d7..6dcf1d84af 100644 --- a/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-UjuJTA+MP5EItLD2z/THeh+6dJ2byIrOBqQfUiAWSvk="; + hash = "sha256-Vbze2WSrZOboLFcsnRYbfsWz6gbMEszDWEMQUNZAzLY="; }; - cargoHash = "sha256-2J+7uwDzoviytbPQ+B36/oJwysBtbiJXKU7zW5vCCEU="; + cargoHash = "sha256-/R2RSsNRpCI/LTXlF0UtdIjWrBDJaEOASTeAtyNwS0M="; meta = with lib; { description = "Diff filter highlighting which line parts have changed"; diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix index daed3da28e..d65c399d5c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix @@ -40,7 +40,7 @@ in rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ makeWrapper poppler_utils ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = path; diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix index a89cd2ae39..e3270f359f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -28,7 +28,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config; buildInputs = lib.optional withPCRE2 pcre2 - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; buildFeatures = lib.optional withPCRE2 "pcre2"; diff --git a/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix b/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix index 0a87425a16..5cad6650d2 100644 --- a/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sed -iE '/ld.so.conf.d/d' Makefile ''; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath $out/lib build/bin/rosie install_name_tool -id $out/lib/librosie.dylib build/lib/librosie.dylib ''; diff --git a/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix b/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix index 439dcb0715..bcc7952d74 100644 --- a/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix b/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix index 4453f7317d..be4d46facc 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EyLompGEin12q6SC1M1D0QsE42HVEq5O/E99qi54cGo="; - buildInputs = (lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional stdenv.hostPlatform.isDarwin Security); meta = with lib; { description = "Find and replace text in source files"; diff --git a/third_party/nixpkgs/pkgs/tools/text/sd/default.nix b/third_party/nixpkgs/pkgs/tools/text/sd/default.nix index e5bde42000..d1c7e36a65 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sd/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installManPage gen/sd.1 diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix index a3915a2d66..2dc71926f2 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html ''; - preConfigure = lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin '' autoreconf -fi ''; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # Clang 16 fails to build due to inappropriate definitions in the `config.h` generated by the # existing configure scripts. Regenerate them to make sure they detect its features correctly. ++ lib.optional stdenv.cc.isClang autoreconfHook - ++ lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + ++ lib.optionals stdenv.hostPlatform.isCygwin [ autoconf automake libtool ]; doCheck = false; # fails diff --git a/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix b/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix index 568b49371f..c5e5986d6b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377 env.NIX_CFLAGS_COMPILE = "-fcommon"; - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre zlib xz ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix index 07ed74f91c..715b9d8ce9 100644 --- a/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook }: +{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook, llvmPackages }: stdenv.mkDerivation rec { pname = "source-highlight"; @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { # necessary to build on FreeBSD native pending inclusion of # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - buildInputs = [ boost ]; + buildInputs = [ boost ] + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (llvmPackages.compiler-rt.override { + doFakeLibgcc = true; + }); configureFlags = [ "--with-boost=${boost.out}" @@ -71,4 +74,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; }; +} // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { + # Force linking to "libgcc" so tests pass + NIX_CFLAGS_COMPILE = "-lgcc"; } diff --git a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix index 431b046471..f812bc9c6b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/tools/text/teip/default.nix b/third_party/nixpkgs/pkgs/tools/text/teip/default.nix index 90a41a8cf3..ab140f2a57 100644 --- a/third_party/nixpkgs/pkgs/tools/text/teip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/teip/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { # tests are locale sensitive preCheck = '' - export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + export LANG=${if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"} ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/termbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/termbook/default.nix index 437016e25e..7172de5e41 100644 --- a/third_party/nixpkgs/pkgs/tools/text/termbook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/termbook/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix index e355e58d2e..a367c61d5b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip copyDesktopItems ]; buildInputs = [ jre ]; - desktopItems = lib.optional (!stdenv.isDarwin) (makeDesktopItem { + desktopItems = lib.optional (!stdenv.hostPlatform.isDarwin) (makeDesktopItem { name = "basex"; exec = "basexgui %f"; icon = "${./basex.svg}"; # icon copied from Ubuntu basex package diff --git a/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix b/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix index b779a6c962..62b6a83d3f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-y9f9eBMhSBx6L3cZyZ4VkNSB7yJ55khCskUp6t4HBq4="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Fast CSV toolkit written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/biber-ms/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/biber-ms/default.nix index 27821bbd8a..38452d7f96 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/biber-ms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/biber-ms/default.nix @@ -33,7 +33,7 @@ perlPackages.buildPerlModule { TextCSV_XS TextRoman URI UnicodeLineBreak XMLLibXML XMLLibXMLSimple XMLLibXSLT XMLWriter autovivification ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; preConfigure = '' cp '${multiscriptBltxml}' t/tdata/multiscript.bltxml @@ -41,7 +41,7 @@ perlPackages.buildPerlModule { postInstall = '' mv "$out"/bin/biber{,-ms} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang "$out"/bin/biber-ms ''; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/biber/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/biber/default.nix index f14096900e..1e5a4ec216 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/biber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/biber/default.nix @@ -20,9 +20,9 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/biber ''; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix index 2c1167fc21..862c82c9d5 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "bibtex-tidy"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "FlamingTempura"; repo = "bibtex-tidy"; - rev = "9658d907d990fd80d25ab37d9aee120451bf5d19"; - hash = "sha256-4TrEabxIVB0Vu/E1ClKwk7lXcnPgoVh3RjLYsPwH2yQ="; + rev = "v${version}"; + hash = "sha256-sMgy29deEfc3DFSC0Z4JZCeNAFpBKNYj+mJnFI1pSY4="; }; - npmDepsHash = "sha256-VzzHGmW7Rb6dEdBxd84GXKSPasqfTkn+5rNw9C2lt8k="; + npmDepsHash = "sha256-FKde5/ZZcS5g0fUaDjhRlKGLiS8kk1PvkZw9PUmvAAE="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix index f47c9dac0f..4dfb307689 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib cups libpng libjpeg ] - ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation SystemConfiguration ]; # do not generate universal binary on Darwin # because it is not supported by Nix's clang diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index bf9e06deca..e898d73269 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ which dieHook ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; - preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' echo 'HAVE_SANDBOX_INIT=0' > configure.local ''; @@ -85,13 +85,13 @@ stdenv.mkDerivation rec { in # Check that soVersion is up to date even if we are not on darwin - lib.optionalString (enableShared && !stdenv.isDarwin) '' + lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' test -f $lib/lib/liblowdown.so.${soVersion} || \ die "postInstall: expected $lib/lib/liblowdown.so.${soVersion} is missing" '' # Fix lib extension so that fixDarwinDylibNames detects it, see # . - + lib.optionalString (enableShared && stdenv.isDarwin) '' + + lib.optionalString (enableShared && stdenv.hostPlatform.isDarwin) '' darwinDylib="$lib/lib/liblowdown.${soVersion}.dylib" mv "$lib/lib/liblowdown.so.${soVersion}" "$darwinDylib" diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix index b6a77b55f6..49dbc74422 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { fontconfig libiconv ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AppKit ; passthru = { # So it will be easier to inspect this environment, in comparison to others inherit luaEnv; # Copied from Makefile.am - tests.test = lib.optionalAttrs (!(stdenv.isDarwin && stdenv.isAarch64)) ( + tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) ( runCommand "sile-test" { nativeBuildInputs = [ poppler_utils sile ]; @@ -90,11 +90,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs build-aux/*.sh - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e 's|@import AppKit;|#import |' src/macfonts.m ''; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index 0cc8b18de9..815cc01f8b 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -45,12 +45,12 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "external-harfbuzz" ]; buildInputs = [ icu fontconfig harfbuzz openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); postInstall = '' # Makes it possible to automatically use the V2 CLI API ln -s $out/bin/tectonic $out/bin/nextonic - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ --replace Exec=tectonic Exec=$out/bin/tectonic install -D dist/appimage/tectonic.desktop -t $out/share/applications/ diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix index 4cff637d77..a6c46c6c7d 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://nllgg.nl/Ted/"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ obadz ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/blahtexml/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/blahtexml/default.nix index 9d88ac3b0b..8f4b1980d3 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/blahtexml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/blahtexml/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; nativeBuildInputs = [ texliveFull ]; # scheme-full needed for ucs package - buildInputs = [ xercesc ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ xercesc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildFlags = [ "doc" ] ++ - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then [ "blahtex-mac" "blahtexml-mac" ] else [ "blahtex-linux" "blahtexml-linux" ]); diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix index 6000a13ec6..02471c8631 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # fixes "error: conflicting types for 'calloc'", etc. - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 57d texk/kpathsea/c-std.h ''; - preConfigure = if stdenv.isCygwin then '' + preConfigure = if stdenv.hostPlatform.isCygwin then '' find ./ -name "config.guess" -exec rm {} \; -exec ln -s ${automake}/share/automake-*/config.guess {} \; '' else null; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "--without-oxdvik" "--without-texinfo" "--without-texi2html" "--with-system-zlib" "--with-system-pnglib" "--with-system-ncurses" ] # couldn't get gsftopk working on darwin - ++ lib.optional stdenv.isDarwin "--without-gsftopk"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--without-gsftopk"; postUnpack = '' mkdir -p $out/share/texmf diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texpresso/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texpresso/default.nix index 8653782da7..73c111bd22 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texpresso/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texpresso/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildFlags = [ "texpresso" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=implicit-function-declaration" ]); diff --git a/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index 3433bde6e1..24c11d8695 100644 --- a/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix b/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix index 12764ad927..5059cfa0c8 100644 --- a/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; # Patch binaries to use our dylib - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' find $out/bin -maxdepth 1 -executable -type f -exec install_name_tool -change @rpath/libap4.dylib $out/lib/libap4.dylib {} \; ''; diff --git a/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix b/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix index acb59fd21b..8c5942d852 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ] ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS" ++ lib.optional opensslSupport "CRYPTO=OPENSSL" - ++ lib.optional stdenv.isDarwin "SYS=darwin" + ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin" ++ lib.optional stdenv.cc.isClang "CC=clang"; propagatedBuildInputs = [ zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/video/swfmill/default.nix b/third_party/nixpkgs/pkgs/tools/video/swfmill/default.nix index 9e8fea8b53..e7e28c09a2 100644 --- a/third_party/nixpkgs/pkgs/tools/video/swfmill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/swfmill/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt freetype libpng libxml2 ]; # fatal error: 'libxml/xpath.h' file not found - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${libxml2.dev}/include/libxml2"; meta = { description = "Xml2swf and swf2xml processor with import functionalities"; diff --git a/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix b/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix index 2e91b2dc85..0da53e2e96 100644 --- a/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ siriobalmelli ]; platforms = platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix b/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix index e54d37b157..83463e22c4 100644 --- a/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' wrapProgram $out/bin/yaydl \ diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index 455e6f108c..b2927b7c50 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -23,7 +23,7 @@ let gnupg gnutar squashfsTools - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # repack-windows deps cdrkit hivex diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix index c980a45bbe..a745a2e39d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -4,7 +4,6 @@ , bash , bashInteractive , util-linux -, boto , setuptools , distro }: @@ -21,7 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ bash ]; - propagatedBuildInputs = [ boto setuptools distro ]; + propagatedBuildInputs = [ setuptools distro ]; postPatch = '' for file in $(find google_compute_engine -type f); do diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix index 78dd09d53c..ee521f6b52 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-k8ZSiV+9pEmczTCb51rj5HP1rm6Us78HWi81uJhL9EM="; + hash = "sha256-f9V3dws4zvjh3H61FWNv9r/G9EplWR0aA2af2EdjhBs="; }; - vendorHash = "sha256-R1B6JQBD2qOEWFngMDkQH0rxvLNdVGS6B3aF+UWH3C4="; + vendorHash = "sha256-S4SyuidH8sxJbuG7yHgSP/iHcuP1h5EHaW8X6gG4GNw="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix index 46e1614385..6df3491c08 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix @@ -65,15 +65,15 @@ stdenv.mkDerivation { libxcrypt-legacy xercesc zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Libsystem libxml2 ]; nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; postUnpack = '' # The linux package wraps ovftool.bin with ovftool. Wrapping @@ -103,7 +103,7 @@ stdenv.mkDerivation { # Darwin dylibs are under `lib` in the zip. install -m 755 -d "$out/lib" install -m 644 -t "$out/lib" \ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' libcrypto.so.1.0.2 \ libcurl.so.4 \ libgoogleurl.so.59 \ @@ -112,7 +112,7 @@ stdenv.mkDerivation { libvim-types.so \ libvmacore.so \ libvmomi.so - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' lib/libcrypto.1.0.2.dylib \ lib/libcurl.4.dylib \ lib/libgoogleurl.59.0.30.45.2.dylib \ @@ -151,17 +151,17 @@ stdenv.mkDerivation { # Install final executable install -m 755 -d "$out/bin" makeWrapper "$out/libexec/ovftool" "$out/bin/ovftool" \ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' --prefix LD_LIBRARY_PATH : "$out/lib" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' --prefix DYLD_LIBRARY_PATH : "$out/lib" '' + '' runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "$out/lib" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' change_args=() # Change relative @loader_path dylibs to absolute paths. @@ -208,7 +208,7 @@ stdenv.mkDerivation { ''; # These paths are need for install check tests - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/locale")) (allow file-read* (subpath "/var/db/timezone")) (allow file-read* (subpath "/System/Library/TextEncodings")) @@ -216,7 +216,7 @@ stdenv.mkDerivation { doInstallCheck = true; - postInstallCheck = lib.optionalString stdenv.isDarwin '' + postInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$TMPDIR # Construct a dummy /etc/passwd file - ovftool attempts to determine the # user's "real" home using this diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix index d57755244a..e670c5fce4 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ cmocka inih wayland wayland-protocols ] - ++ lib.optional stdenv.isLinux libseccomp; + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp; - mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; + mesonFlags = lib.optional stdenv.hostPlatform.isLinux "-Dseccomp=enabled"; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 60cd920181..17682f1443 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -55,7 +55,7 @@ let aliases; in -mapAliases ({ +mapAliases { # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs. forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); @@ -227,6 +227,7 @@ mapAliases ({ cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 certmgr-selfsigned = certmgr; # Added 2023-11-30 + challenger = taler-challenger; # Added 2024-09-04 chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 @@ -263,6 +264,7 @@ mapAliases ({ crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 + clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 @@ -413,6 +415,7 @@ mapAliases ({ elixir_ls = elixir-ls; # Added 2023-03-20 # Emacs + emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 @@ -452,6 +455,8 @@ mapAliases ({ ### F ### + fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 + fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 @@ -492,7 +497,7 @@ mapAliases ({ francis = kdePackages.francis; # added 2024-07-13 fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 - fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. + fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 @@ -555,6 +560,7 @@ mapAliases ({ glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 glfw-wayland = glfw; # Added 2024-04-19 glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 + globalprotect-openconnect = throw "'globalprotect-openconnect' has been renamed to/replaced by 'gpauth' and 'gpclient'"; # Added 2024-09-21 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = lieer; # Added 2020-04-19 gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 @@ -754,6 +760,7 @@ mapAliases ({ kube3d = k3d; # Added 2022-0705 kafkacat = kcat; # Added 2021-10-07 kak-lsp = kakoune-lsp; # Added 2024-04-01 + kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 @@ -856,16 +863,10 @@ mapAliases ({ linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1; linuxPackages_4_14 = linuxKernel.packages.linux_4_14; linuxPackages_4_19 = linuxKernel.packages.linux_4_19; - linuxPackages_4_9 = linuxKernel.packages.linux_4_9; + linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_18 = linuxKernel.packages.linux_5_18; - linuxPackages_5_19 = linuxKernel.packages.linux_5_19; - linuxPackages_5_4 = linuxKernel.packages.linux_5_4; - linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_6_1 = linuxKernel.packages.linux_6_1; - linuxPackages_6_2 = linuxKernel.packages.linux_6_2; - linuxPackages_6_3 = linuxKernel.packages.linux_6_3; linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_6_5 = linuxKernel.packages.linux_6_5; linuxPackages_6_6 = linuxKernel.packages.linux_6_6; @@ -886,16 +887,10 @@ mapAliases ({ linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1; linux_4_14 = linuxKernel.kernels.linux_4_14; linux_4_19 = linuxKernel.kernels.linux_4_19; - linux_4_9 = linuxKernel.kernels.linux_4_9; + linux_5_4 = linuxKernel.kernels.linux_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_18 = linuxKernel.kernels.linux_5_18; - linux_5_19 = linuxKernel.kernels.linux_5_19; - linux_5_4 = linuxKernel.kernels.linux_5_4; - linux_6_0 = linuxKernel.kernels.linux_6_0; linux_6_1 = linuxKernel.kernels.linux_6_1; - linux_6_2 = linuxKernel.kernels.linux_6_2; - linux_6_3 = linuxKernel.kernels.linux_6_3; linux_6_4 = linuxKernel.kernels.linux_6_4; linux_6_5 = linuxKernel.kernels.linux_6_5; linux_6_6 = linuxKernel.kernels.linux_6_6; @@ -978,6 +973,7 @@ mapAliases ({ mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 + mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 @@ -1181,6 +1177,7 @@ mapAliases ({ optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = orchis-theme; # Added 2021-06-09 oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 + onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 @@ -1189,12 +1186,14 @@ mapAliases ({ osxfuse = macfuse-stubs; # Added 2021-03-20 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 + oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 ### P ### PageEdit = pageedit; # Added 2024-01-21 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = metal-cli; # Added 2021-10-25 + paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 @@ -1518,6 +1517,7 @@ mapAliases ({ swtpm-tpm2 = swtpm; # Added 2021-02-26 Sylk = sylk; # Added 2024-06-12 symbiyosys = sby; # Added 2024-08-18 + sync = taler-sync; # Added 2024-09-04 syncthing-cli = syncthing; # Added 2021-04-06 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 @@ -1554,6 +1554,7 @@ mapAliases ({ tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 + toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 @@ -1616,6 +1617,7 @@ mapAliases ({ ### V ### v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 + validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05 @@ -1647,6 +1649,7 @@ mapAliases ({ ### W ### wakatime = wakatime-cli; # 2024-05-30 + wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22 waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' @@ -1817,4 +1820,4 @@ mapAliases ({ purple-facebook ; -}) +} diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 72a2be0f2d..b5d6cac789 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -737,7 +737,7 @@ with pkgs; sea-orm-cli = callPackage ../development/tools/sea-orm-cli { }; vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; fmt = fmt_10; }; @@ -1118,7 +1118,7 @@ with pkgs; # So turn gssSupport off there, and on Windows. # On other platforms, keep the previous value. gssSupport = - if stdenv.isDarwin || stdenv.hostPlatform.isWindows + if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWindows then false else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.krb5.override { @@ -1306,10 +1306,21 @@ with pkgs; substituteAllFiles = callPackage ../build-support/substitute-files/substitute-all-files.nix { }; - replaceDependency = callPackage ../build-support/replace-dependency.nix { }; + replaceDependencies = callPackage ../build-support/replace-dependencies.nix { }; + + replaceDependency = { drv, oldDependency, newDependency, verbose ? true }: replaceDependencies { + inherit drv verbose; + replacements = [{ + inherit oldDependency newDependency; + }]; + # When newDependency depends on drv, instead of causing infinite recursion, keep it as is. + cutoffPackages = [ newDependency ]; + }; replaceVars = callPackage ../build-support/replace-vars { }; + replaceDirectDependencies = callPackage ../build-support/replace-direct-dependencies.nix { }; + nukeReferences = callPackage ../build-support/nuke-references { inherit (darwin) signingUtils; }; @@ -1341,7 +1352,7 @@ with pkgs; desktopToDarwinBundle = makeSetupHook { name = "desktop-to-darwin-bundle-hook"; - propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; + propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick (onlyBin python3Packages.icnsutil) ]; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; keepBuildTree = makeSetupHook { @@ -1674,8 +1685,6 @@ with pkgs; crypto-tracker = callPackage ../tools/misc/crypto-tracker { }; - ejs = callPackage ../development/tools/ejs { }; - ejson2env = callPackage ../tools/admin/ejson2env { }; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; @@ -1732,10 +1741,6 @@ with pkgs; gen6dns = callPackage ../tools/networking/gen6dns { }; - gen-license = callPackage ../development/tools/gen-license { - inherit (darwin.apple_sdk.frameworks) Security; - }; - github-copilot-cli = callPackage ../tools/misc/github-copilot-cli { }; # This is to workaround gfal2-python broken against Python 3.12 or later. @@ -1800,8 +1805,6 @@ with pkgs; hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; - immich-cli = callPackage ../tools/misc/immich-cli { }; - inherit (callPackages ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; jobber = callPackage ../tools/system/jobber { }; @@ -2089,7 +2092,7 @@ with pkgs; guiSupport = true; sendEmailSupport = true; withSsh = true; - withLibsecret = !stdenv.isDarwin; + withLibsecret = !stdenv.hostPlatform.isDarwin; }; # Git with SVN support, but without GUI. @@ -2116,7 +2119,7 @@ with pkgs; bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { }; - bump2version = python3Packages.callPackage ../applications/version-management/bump2version { }; + bump2version = with python3Packages; toPythonApplication bump2version; cgit = callPackage ../applications/version-management/cgit { }; @@ -2139,7 +2142,7 @@ with pkgs; delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { }; debase = callPackage ../by-name/de/debase/package.nix { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; @@ -2308,7 +2311,7 @@ with pkgs; git-radar = callPackage ../applications/version-management/git-radar { }; git-recent = callPackage ../applications/version-management/git-recent { - util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; + util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux; }; git-relevant-history = callPackage ../applications/version-management/git-relevant-history { }; @@ -2542,15 +2545,13 @@ with pkgs; dosbox = callPackage ../applications/emulators/dosbox { inherit (darwin.apple_sdk.frameworks ) OpenGL; - SDL = if stdenv.isDarwin then SDL else SDL_compat; + SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat; }; dosbox-x = darwin.apple_sdk_11_0.callPackage ../applications/emulators/dosbox-x { inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; - dynamips = callPackage ../applications/emulators/dynamips { }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; @@ -2702,7 +2703,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; }; @@ -2840,7 +2841,7 @@ with pkgs; contour = qt6.callPackage ../applications/terminal-emulators/contour { inherit (darwin.apple_sdk_11_0.libs) utmp; inherit (darwin) sigtool; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; catch2 = catch2_3; fmt = fmt_9; }; @@ -2860,7 +2861,7 @@ with pkgs; iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { - harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa @@ -2992,8 +2993,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - amberol = callPackage ../applications/audio/amberol { }; - inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; @@ -3482,7 +3481,9 @@ with pkgs; cyclone-scheme = callPackage ../development/interpreters/cyclone { }; - cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { }; + cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { + buildGoModule = buildGo123Module; + }; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; @@ -3536,7 +3537,7 @@ with pkgs; ecdsautils = callPackage ../tools/security/ecdsautils { }; - echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); + echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/security/echidna { }); sedutil = callPackage ../tools/security/sedutil { }; @@ -5211,6 +5212,10 @@ with pkgs; grobi = callPackage ../tools/X11/grobi { }; + grype = callPackage ../by-name/gr/grype/package.nix { + buildGoModule = buildGo123Module; + }; + gscan2pdf = callPackage ../applications/graphics/gscan2pdf { # needs this fork of libtiff, because original libtiff # stopped packaging required tools with version 4.6 @@ -5345,7 +5350,7 @@ with pkgs; joystickwake = callPackage ../tools/games/joystickwake { }; juce = callPackage ../development/misc/juce { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; jumppad = callPackage ../tools/virtualization/jumppad { }; @@ -6217,8 +6222,6 @@ with pkgs; byzanz = callPackage ../applications/video/byzanz { }; - algolia-cli = callPackage ../development/tools/algolia-cli { }; - anydesk = callPackage ../applications/networking/remote/anydesk { }; anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; @@ -6278,7 +6281,7 @@ with pkgs; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrtools = callPackage ../tools/cd-dvd/cdrtools { - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; @@ -6516,6 +6519,7 @@ with pkgs; netbird = callPackage ../tools/networking/netbird { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit; + buildGoModule = buildGo123Module; }; netbird-ui = netbird.override { @@ -6552,7 +6556,18 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { }; + inherit mozc; + + mozc-ut = mozc.override { dictionaries = [ + mozcdic-ut-alt-cannadic + mozcdic-ut-edict2 + mozcdic-ut-jawiki + mozcdic-ut-neologd + mozcdic-ut-personal-names + mozcdic-ut-place-names + mozcdic-ut-skk-jisyo + mozcdic-ut-sudachidict + ]; }; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; @@ -6605,7 +6620,7 @@ with pkgs; bbin = callPackage ../development/tools/bbin { }; - blacken-docs = callPackage ../tools/misc/blacken-docs { }; + blacken-docs = with python3Packages; toPythonApplication blacken-docs; bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; @@ -6668,7 +6683,7 @@ with pkgs; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; clamav = callPackage ../tools/security/clamav { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -6887,8 +6902,6 @@ with pkgs; deer = callPackage ../shells/zsh/zsh-deer { }; - deno = callPackage ../development/web/deno { }; - deqp-runner = callPackage ../tools/graphics/deqp-runner { }; detox = callPackage ../tools/misc/detox { }; @@ -7026,7 +7039,7 @@ with pkgs; dmd = callPackage ../by-name/dm/dmd/package.nix ({ inherit (darwin.apple_sdk.frameworks) Foundation; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { # https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123 stdenv = gcc11Stdenv; }); @@ -7606,9 +7619,9 @@ with pkgs; fingerprintx = callPackage ../tools/security/fingerprintx { }; - bsd-fingerd = bsd-finger.override({ + bsd-fingerd = bsd-finger.override { buildProduct = "daemon"; - }); + }; iprange = callPackage ../applications/networking/firehol/iprange.nix { }; @@ -7845,7 +7858,7 @@ with pkgs; garage garage_0_8 garage_0_9 garage_0_8_7 garage_0_9_4 - garage_1_0_0 garage_1_x; + garage_1_0_1 garage_1_x; garmintools = callPackage ../development/libraries/garmintools { }; @@ -7967,8 +7980,6 @@ with pkgs; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; - gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; - gokart = callPackage ../development/tools/gokart { }; gl2ps = callPackage ../development/libraries/gl2ps { }; @@ -8049,12 +8060,12 @@ with pkgs; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg22 = callPackage ../tools/security/gnupg/22.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; + pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2; libgcrypt = libgcrypt_1_8; }; gnupg24 = callPackage ../tools/security/gnupg/24.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; + pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg24; @@ -8447,7 +8458,7 @@ with pkgs; haste-server = callPackage ../servers/haste-server { }; hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; half = callPackage ../development/libraries/half { }; @@ -8551,9 +8562,9 @@ with pkgs; hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight ({ + highlight = callPackage ../tools/text/highlight { lua = lua5; - }); + }; hockeypuck = callPackage ../servers/hockeypuck/server.nix { }; @@ -8939,7 +8950,7 @@ with pkgs; go-jira = callPackage ../applications/misc/go-jira { }; jogl = callPackage ../by-name/jo/jogl/package.nix { - stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv; }; john = callPackage ../tools/security/john { }; @@ -9030,8 +9041,6 @@ with pkgs; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; - kargo = callPackage ../tools/misc/kargo { }; - kazam = callPackage ../applications/video/kazam { }; kalibrate-rtl = callPackage ../applications/radio/kalibrate-rtl { }; @@ -9229,7 +9238,7 @@ with pkgs; libcryptui = callPackage ../development/libraries/libcryptui { autoreconfHook = buildPackages.autoreconfHook269; - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; + gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; libshumate = callPackage ../development/libraries/libshumate { }; @@ -9513,7 +9522,7 @@ with pkgs; pythonPackages = python3Packages; }; - nanoemoji = python3Packages.callPackage ../tools/misc/nanoemoji { }; + nanoemoji = with python3Packages; toPythonApplication nanoemoji; nagelfar = callPackage ../development/tools/nagelfar { }; @@ -9541,7 +9550,7 @@ with pkgs; protobuf = protobuf_21; }; netdataCloud = netdata.override { - withCloud = !stdenv.isDarwin; + withCloud = !stdenv.hostPlatform.isDarwin; withCloudUi = true; }; @@ -10002,7 +10011,7 @@ with pkgs; bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { }; mailpit = callPackage ../servers/mail/mailpit { - libtool = if stdenv.isDarwin then cctools else libtool; + libtool = if stdenv.hostPlatform.isDarwin then cctools else libtool; }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -11038,7 +11047,7 @@ with pkgs; page = callPackage ../tools/misc/page { }; pageedit = libsForQt5.callPackage ../applications/office/PageEdit { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; pagefind = libsForQt5.callPackage ../applications/misc/pagefind { }; @@ -11065,8 +11074,6 @@ with pkgs; paperless-ngx = callPackage ../applications/office/paperless-ngx { }; - paperoni = callPackage ../tools/text/paperoni { }; - paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; papeer = callPackage ../tools/text/papeer { }; @@ -11313,19 +11320,13 @@ with pkgs; pk2cmd = callPackage ../tools/misc/pk2cmd { }; - plantuml = callPackage ../tools/misc/plantuml { }; - - plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { }; - - plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore; inherit (darwin) DarwinTools; }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); - platformio = if stdenv.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core; + platformio = if stdenv.hostPlatform.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core; platformio-core = platformioPackages.platformio-core; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -11502,7 +11503,7 @@ with pkgs; proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; proxychains = callPackage ../tools/networking/proxychains { }; @@ -11707,7 +11708,7 @@ with pkgs; qovery-cli = callPackage ../tools/admin/qovery-cli { }; qownnotes = qt6Packages.callPackage ../applications/office/qownnotes { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -11738,7 +11739,7 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; - quota = if stdenv.isLinux then linuxquota else unixtools.quota; + quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; @@ -12452,15 +12453,13 @@ with pkgs; snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast { inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; }; snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; snet = callPackage ../tools/networking/snet { }; - sng = callPackage ../tools/graphics/sng { }; - snmpcheck = callPackage ../tools/networking/snmpcheck { }; snobol4 = callPackage ../development/interpreters/snobol4 { }; @@ -12468,7 +12467,7 @@ with pkgs; snort = callPackage ../applications/networking/ids/snort { }; soapui = callPackage ../applications/networking/soapui { - jdk = if stdenv.isDarwin + jdk = if stdenv.hostPlatform.isDarwin then (jdk11.override { enableJavaFX = true; }) else jdk11; }; @@ -12910,7 +12909,7 @@ with pkgs; tewisay = callPackage ../tools/misc/tewisay { }; texmacs = libsForQt5.callPackage ../applications/editors/texmacs { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; extraFonts = true; }; @@ -12956,8 +12955,6 @@ with pkgs; threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { }; - thumbdrives = callPackage ../applications/system/thumbdrives { }; - tidy-viewer = callPackage ../tools/text/tidy-viewer { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; @@ -13258,8 +13255,6 @@ with pkgs; tvm = callPackage ../development/compilers/tvm { }; - oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; - ttfb = callPackage ../development/tools/ttfb { }; twilight = callPackage ../tools/graphics/twilight { @@ -13549,8 +13544,6 @@ with pkgs; inherit (openconnectPackages) openconnect openconnect_openssl; - globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; - ding-libs = callPackage ../tools/misc/ding-libs { }; sssd = callPackage ../os-specific/linux/sssd { @@ -13572,16 +13565,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - wakapi = callPackage ../tools/misc/wakapi { }; - wambo = callPackage ../development/tools/wambo { }; weather = callPackage ../applications/misc/weather { }; wego = callPackage ../applications/misc/wego { }; - wal_e = callPackage ../tools/backup/wal-e { }; - wander = callPackage ../tools/admin/wander { }; watchexec = callPackage ../tools/misc/watchexec { @@ -13607,7 +13596,7 @@ with pkgs; wasm-tools = callPackage ../tools/misc/wasm-tools { }; wasmedge = callPackage ../development/tools/wasmedge { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -14574,7 +14563,7 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack; - libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; + libcxxStdenv = if stdenv.hostPlatform.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -14663,7 +14652,7 @@ with pkgs; apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { }; fasm = pkgsi686Linux.callPackage ../development/compilers/fasm { - inherit (stdenv) isx86_64; + inherit (stdenv.hostPlatform) isx86_64; }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; @@ -14816,7 +14805,7 @@ with pkgs; reproducibleBuild = true; profiledCompiler = false; - isl = if !stdenv.isDarwin then isl_0_20 else null; + isl = if !stdenv.hostPlatform.isDarwin then isl_0_20 else null; withoutTargetLibc = true; langCC = false; @@ -15422,18 +15411,12 @@ with pkgs; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; + # Please remove all this logic when bumping to LLVM 19 and make this + # a simple alias. llvmPackages = let # This returns the minimum supported version for the platform. The # assumption is that or any later version is good. - choose = platform: - /**/ if platform.isDarwin then 16 - else if platform.isFreeBSD then 18 - else if platform.isOpenBSD then 18 - else if platform.isAndroid then 12 - else if platform.isLinux then 18 - else if platform.isWasm then 16 - # For unknown systems, assume the latest version is required. - else 18; + choose = platform: if platform.isDarwin then 16 else 18; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then # taking the min bound of that. @@ -15441,12 +15424,12 @@ with pkgs; stdenv.targetPlatform)); in pkgs.${"llvmPackages_${minSupported}"}; - llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ + llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; - })); + }); inherit (rec { llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { }); @@ -15705,8 +15688,6 @@ with pkgs; ); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; - cargo-web = callPackage ../development/tools/rust/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -15736,7 +15717,7 @@ with pkgs; }; cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { rustPlatform = makeRustPlatform { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit rustc cargo; }; }; @@ -15772,6 +15753,7 @@ with pkgs; cargo-pgrx_0_10_2 cargo-pgrx_0_11_2 cargo-pgrx_0_11_3 + cargo-pgrx_0_12_0_alpha_1 ; cargo-pgrx = cargo-pgrx_0_11_2; @@ -16437,7 +16419,7 @@ with pkgs; luarocks-nix = luaPackages.luarocks-nix; luarocks-packages-updater = callPackage ../by-name/lu/luarocks-packages-updater/package.nix { - pluginupdate = ../../maintainers/scripts/pluginupdate.py; + pluginupdate = ../../maintainers/scripts/pluginupdate-py; }; luau = callPackage ../development/interpreters/luau { }; @@ -16950,8 +16932,6 @@ with pkgs; actiona = libsForQt5.callPackage ../applications/misc/actiona { }; - actionlint = callPackage ../development/tools/analysis/actionlint { }; - adreaper = callPackage ../tools/security/adreaper { }; aeron = callPackage ../servers/aeron { }; @@ -17145,7 +17125,9 @@ with pkgs; electron_28-bin electron_29-bin electron_30-bin - electron_31-bin; + electron_31-bin + electron_32-bin + ; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 @@ -17159,9 +17141,10 @@ with pkgs; electron_29 = electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; - electron = electron_31; - electron-bin = electron_31-bin; - electron-chromedriver = electron-chromedriver_31; + electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; + electron = electron_32; + electron-bin = electron_32-bin; + electron-chromedriver = electron-chromedriver_32; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -17211,7 +17194,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else if stdenv.cc.isClang then llvmPackages.stdenv else if stdenv.cc.isGNU then gcc12Stdenv else stdenv; @@ -17223,7 +17206,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit; buildJdk = jdk17_headless; runJdk = jdk17_headless; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_7; @@ -17347,8 +17330,6 @@ with pkgs; blackmagic = callPackage ../development/embedded/blackmagic { }; - bloaty = callPackage ../development/tools/bloaty { }; - bloomrpc = callPackage ../development/web/bloomrpc { }; bloop = callPackage ../development/tools/build-managers/bloop { }; @@ -17672,7 +17653,7 @@ with pkgs; wrapCC (distcc.links extraConfig)) { }; distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper); - distccMasquerade = if stdenv.isDarwin + distccMasquerade = if stdenv.hostPlatform.isDarwin then null else callPackage ../development/tools/misc/distcc/masq.nix { gccRaw = gcc.cc; @@ -18230,7 +18211,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; mold = callPackage ../by-name/mo/mold/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; tbb = tbb_2021_11; }; @@ -18632,16 +18613,12 @@ with pkgs; sloc = nodePackages.sloc; - smatch = callPackage ../development/tools/analysis/smatch { }; - smc = callPackage ../tools/misc/smc { }; snakemake = callPackage ../applications/science/misc/snakemake { }; snore = callPackage ../tools/misc/snore { }; - snyk = callPackage ../development/tools/analysis/snyk { }; - snzip = callPackage ../tools/archivers/snzip { }; snowman = qt5.callPackage ../development/tools/analysis/snowman { }; @@ -18714,8 +18691,6 @@ with pkgs; strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { }; - stylelint = callPackage ../development/tools/analysis/stylelint { }; - stylua = callPackage ../development/tools/stylua { }; summon = callPackage ../development/tools/summon { }; @@ -18737,7 +18712,7 @@ with pkgs; c2ffi = callPackage ../development/tools/misc/c2ffi { }; c0 = callPackage ../development/compilers/c0 { - stdenv = if stdenv.isDarwin then gccStdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; }; c3c = callPackage ../development/compilers/c3c { }; @@ -18817,8 +18792,6 @@ with pkgs; todoist-electron = callPackage ../applications/misc/todoist-electron { }; - toil = callPackage ../applications/science/misc/toil { }; - travis = callPackage ../development/tools/misc/travis { }; tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { @@ -18998,25 +18971,25 @@ with pkgs; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; @@ -19465,7 +19438,7 @@ with pkgs; ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; uri = callPackage ../development/libraries/uri { }; @@ -19484,8 +19457,6 @@ with pkgs; croaring = callPackage ../development/libraries/croaring { }; - crocoddyl = callPackage ../development/libraries/crocoddyl { }; - crossguid = callPackage ../development/libraries/crossguid { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -19600,7 +19571,7 @@ with pkgs; eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; - stdenv = if stdenv.isDarwin then gccStdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; }; eclib = callPackage ../development/libraries/eclib { }; @@ -19653,8 +19624,6 @@ with pkgs; libesmtp = callPackage ../development/libraries/libesmtp { }; - example-robot-data = callPackage ../development/libraries/example-robot-data { }; - exiv2 = callPackage ../development/libraries/exiv2 { }; expat = callPackage ../development/libraries/expat { }; @@ -19951,7 +19920,7 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; gr-framework = callPackage ../by-name/gr/gr-framework/package.nix { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; @@ -20164,7 +20133,7 @@ with pkgs; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc { - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; } else stdenv; }; @@ -20272,7 +20241,7 @@ with pkgs; }; pango = callPackage ../development/libraries/pango { - harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; }; pangolin = callPackage ../development/libraries/pangolin { @@ -20401,7 +20370,7 @@ with pkgs; }; harfbuzzFull = harfbuzz.override { - withCoreText = stdenv.isDarwin; + withCoreText = stdenv.hostPlatform.isDarwin; withGraphite2 = true; withIcu = true; }; @@ -20510,7 +20479,7 @@ with pkgs; ilmbase = callPackage ../development/libraries/ilmbase { }; imgui = callPackage ../development/libraries/imgui { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; imtui = callPackage ../development/libraries/imtui { }; @@ -20525,8 +20494,8 @@ with pkgs; imlib2Full = imlib2.override { # Compilation error on Darwin with librsvg. For more information see: # https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 - svgSupport = !stdenv.isDarwin; - heifSupport = !stdenv.isDarwin; + svgSupport = !stdenv.hostPlatform.isDarwin; + heifSupport = !stdenv.hostPlatform.isDarwin; webpSupport = true; jxlSupport = true; psSupport = true; @@ -20570,7 +20539,7 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; - irrlicht = if !stdenv.isDarwin then + irrlicht = if !stdenv.hostPlatform.isDarwin then callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit; @@ -20665,7 +20634,7 @@ with pkgs; libjodycode = callPackage ../development/libraries/libjodycode { # missing aligned_alloc() - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; libb64 = callPackage ../development/libraries/libb64 { }; @@ -20682,7 +20651,7 @@ with pkgs; }; keybinder3 = callPackage ../development/libraries/keybinder3 { - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; + gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; automake = automake111x; }; @@ -21226,7 +21195,7 @@ with pkgs; libfabric = callPackage ../development/libraries/libfabric { }; libfive = libsForQt5.callPackage ../development/libraries/libfive { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; }; @@ -21947,7 +21916,7 @@ with pkgs; }; libunwind = - if stdenv.isDarwin then darwin.libunwind + if stdenv.hostPlatform.isDarwin then darwin.libunwind else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages.libunwind else callPackage ../development/libraries/libunwind { }; @@ -22296,7 +22265,7 @@ with pkgs; else freeglut; - mesa = if stdenv.isDarwin + mesa = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/darwin.nix { inherit (darwin.apple_sdk_11_0.libs) Xplugin; } @@ -22343,7 +22312,7 @@ with pkgs; minizip-ng = callPackage ../development/libraries/minizip-ng { }; mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; mkvtoolnix-cli = mkvtoolnix.override { @@ -22613,6 +22582,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; pythonPackages = python3Packages; + # TODO(@connorbaker): OpenCV 4.9 only supports up to CUDA 12.3. + cudaPackages = cudaPackages_12_3; + # TODO: LTO does not work. + # https://github.com/NixOS/nixpkgs/issues/343123 + enableLto = false; }; opencv4WithoutCuda = opencv4.override { @@ -22745,7 +22719,7 @@ with pkgs; pcg_c = callPackage ../development/libraries/pcg-c { }; pcl = libsForQt5.callPackage ../development/libraries/pcl { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL; }; @@ -22776,8 +22750,6 @@ with pkgs; pingvin-share = callPackage ../servers/pingvin-share { }; - pinocchio = callPackage ../development/libraries/pinocchio { }; - pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; wine-staging = pkgsi686Linux.wine-staging; @@ -22934,7 +22906,7 @@ with pkgs; darwin; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; inherit config; - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }); libsForQt5 = (recurseIntoAttrs (import ./qt5-packages.nix { @@ -22951,7 +22923,7 @@ with pkgs; qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); quark-engine = callPackage ../tools/security/quark-engine { }; @@ -23656,7 +23628,7 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; v8 = callPackage ../development/libraries/v8 { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; @@ -24481,7 +24453,7 @@ with pkgs; directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { # https://github.com/NixOS/nixpkgs/issues/216294 - stdenv = if stdenv.cc.isGNU && stdenv.isi686 then gcc11Stdenv else stdenv; + stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv; }; dkimproxy = callPackage ../servers/mail/dkimproxy { }; @@ -25057,7 +25029,7 @@ with pkgs; mariadb_105 mariadb_106 mariadb_1011 - mariadb_110 + mariadb_114 ; mariadb = mariadb_1011; mariadb-embedded = mariadb.override { withEmbedded = true; }; @@ -25074,7 +25046,7 @@ with pkgs; sasl = cyrus_sasl; boost = boost178.override { enableShared = false; }; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - stdenv = if stdenv.isDarwin then + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv.override (old: { hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; }; buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; }; @@ -25167,8 +25139,6 @@ with pkgs; oidentd = callPackage ../servers/identd/oidentd { }; - softether = callPackage ../servers/softether { }; - qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; @@ -25182,7 +25152,7 @@ with pkgs; httpSupport = true; tpmSupport = true; tlsSupport = true; - msVarsTemplate = stdenv.isx86_64 || stdenv.isAarch64; + msVarsTemplate = stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64; }; ops = callPackage ../applications/virtualization/ops { }; @@ -25449,7 +25419,7 @@ with pkgs; check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { }; shishi = callPackage ../servers/shishi { - pam = if stdenv.isLinux then pam else null; + pam = if stdenv.hostPlatform.isLinux then pam else null; # see also openssl, which has/had this same trick }; @@ -25603,8 +25573,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; inherit (darwin.apple_sdk.libs) Xplugin; inherit (buildPackages.darwin) bootstrap_cmds; - udev = if stdenv.isLinux then udev else null; - libdrm = if stdenv.isLinux then libdrm else null; + udev = if stdenv.hostPlatform.isLinux then udev else null; + libdrm = if stdenv.hostPlatform.isLinux then libdrm else null; }; generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix { }; @@ -25876,7 +25846,7 @@ with pkgs; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; - libuuid = if stdenv.isLinux + libuuid = if stdenv.hostPlatform.isLinux then util-linuxMinimal else null; @@ -25922,7 +25892,7 @@ with pkgs; util-linux = util-linuxMinimal; }); fuse = fuse2; - fuse2 = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2); + fuse2 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fusePackages.fuse_2); fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; @@ -26180,8 +26150,6 @@ with pkgs; # hardened kernels linuxPackages_hardened = linuxKernel.packages.linux_hardened; linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened; - linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; @@ -26366,7 +26334,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation; }); - nettools = if stdenv.isLinux + nettools = if stdenv.hostPlatform.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -26530,7 +26498,7 @@ with pkgs; pagemon = callPackage ../os-specific/linux/pagemon { }; - pam = if stdenv.isLinux then linux-pam else openpam; + pam = if stdenv.hostPlatform.isLinux then linux-pam else openpam; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) @@ -26604,7 +26572,7 @@ with pkgs; pps-tools = callPackage ../os-specific/linux/pps-tools { }; - procps = if stdenv.isLinux + procps = if stdenv.hostPlatform.isLinux then callPackage ../os-specific/linux/procps-ng { } else unixtools.procps; @@ -26694,7 +26662,7 @@ with pkgs; sdparm = callPackage ../os-specific/linux/sdparm { }; sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; setools = callPackage ../os-specific/linux/setools { }; @@ -27158,7 +27126,9 @@ with pkgs; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; - cnspec = callPackage ../tools/security/cnspec { }; + cnspec = callPackage ../tools/security/cnspec { + buildGoModule = buildGo123Module; + }; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { }; @@ -28253,7 +28223,7 @@ with pkgs; dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; grass = callPackage ../applications/gis/grass { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; @@ -28991,7 +28961,7 @@ with pkgs; darktable = callPackage ../by-name/da/darktable/package.nix { lua = lua5_4; pugixml = pugixml.override { shared = true; }; - stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK llvmPackages_18.stdenv { darwinMinVersion = "10.14"; darwinSdkVersion = "11.0"; } else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK llvmPackages_18.stdenv { darwinMinVersion = "10.14"; darwinSdkVersion = "11.0"; } else stdenv; }; das_watchdog = callPackage ../tools/system/das_watchdog { }; @@ -29218,11 +29188,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - elvis = callPackage ../applications/editors/elvis { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs28 - emacs28-gtk2 emacs28-gtk3 emacs28-nox @@ -29355,7 +29322,7 @@ with pkgs; keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc { inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; keepass-diff = callPackage ../applications/misc/keepass-diff { }; @@ -29568,7 +29535,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python311; volk = volk_2; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; }); }; @@ -29686,7 +29653,7 @@ with pkgs; wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration; - libpcap = libpcap.override { withBluez = stdenv.isLinux; }; + libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; }; wireshark-qt = wireshark; @@ -29695,7 +29662,7 @@ with pkgs; tshark = wireshark-cli; wireshark-cli = wireshark.override { withQt = false; - libpcap = libpcap.override { withBluez = stdenv.isLinux; }; + libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; }; sngrep = callPackage ../applications/networking/sniffers/sngrep { }; @@ -29865,7 +29832,7 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; }; }) @@ -29953,9 +29920,9 @@ with pkgs; lemonade = callPackage ../applications/misc/lemonade { }; librespot = callPackage ../applications/audio/librespot { - withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or stdenv.isLinux; - withPortAudio = stdenv.isDarwin; + withALSA = stdenv.hostPlatform.isLinux; + withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux; + withPortAudio = stdenv.hostPlatform.isDarwin; }; limesctl = callPackage ../applications/misc/limesctl { }; @@ -30197,10 +30164,6 @@ with pkgs; hmm = callPackage ../applications/misc/hmm { }; - homebank = callPackage ../applications/office/homebank { - gtk = gtk3; - }; - hollywood = callPackage ../applications/misc/hollywood { inherit (python3Packages) pygments; }; @@ -30391,7 +30354,7 @@ with pkgs; waylevel = callPackage ../tools/misc/waylevel { }; i3 = callPackage ../applications/window-managers/i3 { - xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; + xcb-util-cursor = if stdenv.hostPlatform.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { }; @@ -30795,7 +30758,7 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; kotatogram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - stdenv = if stdenv.isDarwin + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; @@ -30981,7 +30944,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = callPackage ../applications/networking/browsers/ladybird { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL; }; @@ -31567,7 +31530,7 @@ with pkgs; } // (config.mplayer or {})); mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { - stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv; inherit lua; }; @@ -31911,10 +31874,10 @@ with pkgs; ncspot = callPackage ../applications/audio/ncspot { inherit (darwin.apple_sdk.frameworks) Cocoa; - withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or stdenv.isLinux; - withPortAudio = stdenv.isDarwin; - withMPRIS = stdenv.isLinux; + withALSA = stdenv.hostPlatform.isLinux; + withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux; + withPortAudio = stdenv.hostPlatform.isDarwin; + withMPRIS = stdenv.hostPlatform.isLinux; }; ncview = callPackage ../tools/X11/ncview { } ; @@ -32221,7 +32184,7 @@ with pkgs; phantomsocks = callPackage ../tools/networking/phantomsocks { }; photoqt = callPackage ../by-name/ph/photoqt/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; @@ -32485,7 +32448,7 @@ with pkgs; quantomatic = callPackage ../applications/science/physics/quantomatic { }; quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; quasselClient = quassel.override { @@ -32635,7 +32598,7 @@ with pkgs; ries = callPackage ../applications/science/math/ries { }; - ripcord = if stdenv.isLinux then + ripcord = if stdenv.hostPlatform.isLinux then qt5.callPackage ../applications/networking/instant-messengers/ripcord { } else callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; @@ -32942,7 +32905,7 @@ with pkgs; # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds # with --cores 32 on clang). - stdenv = if stdenv.isDarwin then overrideSDK llvmPackages.stdenv "11.0" else llvmPackages.stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK llvmPackages.stdenv "11.0" else llvmPackages.stdenv; }; super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; @@ -33127,7 +33090,7 @@ with pkgs; }; synergy = libsForQt5.callPackage ../applications/misc/synergy { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications; }; @@ -33192,7 +33155,7 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { - stdenv = if stdenv.isDarwin + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; @@ -33509,7 +33472,7 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; @@ -33919,7 +33882,7 @@ with pkgs; }; chatterino2 = callPackage ../applications/networking/instant-messengers/chatterino2 { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; weston = callPackage ../applications/window-managers/weston { }; @@ -34141,7 +34104,7 @@ with pkgs; }; xpdf = libsForQt5.callPackage ../applications/misc/xpdf { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; xplugd = callPackage ../tools/X11/xplugd { }; @@ -34393,7 +34356,7 @@ with pkgs; balanceofsatoshis = callPackage ../tools/misc/balanceofsatoshis { }; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; }; @@ -34704,7 +34667,7 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; shipwright = callPackage ../games/shipwright { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; wipeout-rewrite = callPackage ../games/wipeout-rewrite { @@ -34906,7 +34869,7 @@ with pkgs; bsdgames = callPackage ../games/bsdgames { }; bugdom = callPackage ../games/bugdom { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; }; @@ -35358,7 +35321,7 @@ with pkgs; mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; @@ -36571,7 +36534,7 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { inherit (darwin) DarwinTools; - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; protobuf = protobuf_23; # or-tools builds with -std=c++20, so abseil-cpp must @@ -36720,8 +36683,6 @@ with pkgs; shtns = callPackage ../applications/science/physics/shtns { }; - validphys2 = with python3Packages; toPythonApplication validphys2; - xfitter = callPackage ../applications/science/physics/xfitter { }; xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; @@ -37582,8 +37543,6 @@ with pkgs; flockit = callPackage ../tools/backup/flockit { }; fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { }; - fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix { }; - fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix { }; fbmark = callPackage ../tools/misc/fbmark { }; @@ -37623,13 +37582,17 @@ with pkgs; gobuster = callPackage ../tools/security/gobuster { }; - gotestwaf = callPackage ../tools/security/gotestwaf { }; + gotestwaf = callPackage ../tools/security/gotestwaf { + buildGoModule = buildGo123Module; + }; gotrue = callPackage ../tools/security/gotrue { }; gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { }; - gowitness = callPackage ../tools/security/gowitness { }; + gowitness = callPackage ../tools/security/gowitness { + buildGoModule = buildGo123Module; + }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -37850,7 +37813,7 @@ with pkgs; # Not recommended; too fragile nixops_unstable_full; - # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-aws: ...` to trigger automatically. + # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-digitalocean: ...` to trigger automatically. nixops_unstablePlugins = recurseIntoAttrs nixops_unstable_minimal.availablePlugins; /* @@ -37932,7 +37895,7 @@ with pkgs; /* A NixOS/home-manager/arion/... module that sets the `pkgs` module argument. */ - pkgsModule = { lib, options, ... }: { + pkgsModule = { options, ... }: { config = if options?nixpkgs.pkgs then { # legacy / nixpkgs.nix style @@ -38016,9 +37979,7 @@ with pkgs; nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; - nix-serve = callPackage ../tools/package-management/nix-serve { - nix = nixVersions.nix_2_18; - }; + nix-serve = callPackage ../tools/package-management/nix-serve { }; nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng; @@ -38157,7 +38118,7 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; putty = callPackage ../applications/networking/remote/putty { - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; + gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { }; @@ -38535,9 +38496,7 @@ with pkgs; vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { }; - vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { - luaPackages = lua51Packages; - }); + vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { }); vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; @@ -38610,7 +38569,7 @@ with pkgs; winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; stdenv = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then # Match upstream, which builds with the latest SDK and a 10.7 deployment target. overrideSDK pkgs.stdenv { darwinMinVersion = "10.7"; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 8e78e3fe75..792a26d973 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip +{ lib, stdenv, fetchurl, fetchzip , callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 , ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14 , fetchpatch, makeWrapper, coq2html @@ -11,7 +11,7 @@ let coqPackages = self // { __attrsFailEvaluation = true; recurseForDerivations = false; }; metaFetch = import ../build-support/coq/meta-fetch/default.nix - {inherit lib stdenv fetchzip; }; + {inherit lib stdenv fetchzip fetchurl; }; mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq {}); contribs = recurseIntoAttrs diff --git a/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix b/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix index 639fa70446..b2a2336370 100644 --- a/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix @@ -33,7 +33,9 @@ let attrsets customisation fixedPoints + lists strings + trivial versions ; # Backbone @@ -81,6 +83,45 @@ let nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; + tests = + let + bools = [ + true + false + ]; + configs = { + openCVFirst = bools; + useOpenCVDefaultCuda = bools; + useTorchDefaultCuda = bools; + }; + builder = + { + openCVFirst, + useOpenCVDefaultCuda, + useTorchDefaultCuda, + }@config: + { + name = strings.concatStringsSep "-" ( + [ + "test" + (if openCVFirst then "opencv" else "torch") + ] + ++ lists.optionals (if openCVFirst then useOpenCVDefaultCuda else useTorchDefaultCuda) [ + "with-default-cuda" + ] + ++ [ + "then" + (if openCVFirst then "torch" else "opencv") + ] + ++ lists.optionals (if openCVFirst then useTorchDefaultCuda else useOpenCVDefaultCuda) [ + "with-default-cuda" + ] + ); + value = final.callPackage ../development/cuda-modules/tests/opencv-and-torch config; + }; + in + attrsets.listToAttrs (attrsets.mapCartesianProduct builder configs); + writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-test-python.nix { }; }); diff --git a/third_party/nixpkgs/pkgs/top-level/emilua-plugins.nix b/third_party/nixpkgs/pkgs/top-level/emilua-plugins.nix index eb220d4b3a..9706ef5ce9 100644 --- a/third_party/nixpkgs/pkgs/top-level/emilua-plugins.nix +++ b/third_party/nixpkgs/pkgs/top-level/emilua-plugins.nix @@ -9,6 +9,12 @@ emilua: (lib.makeScope newScope (self: { inherit emilua; beast = self.callPackage ../development/emilua-plugins/beast { }; + botan = self.callPackage ../development/emilua-plugins/botan { + inherit (pkgs) botan3; + }; qt5 = self.callPackage ../development/emilua-plugins/qt5 { }; qt6 = self.callPackage ../development/emilua-plugins/qt6 { }; + secp256k1 = self.callPackage ../development/emilua-plugins/secp256k1 { + inherit (pkgs) secp256k1; + }; })) diff --git a/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix b/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix index f4d2fd06a9..af4f2fa7f1 100644 --- a/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix @@ -67,8 +67,8 @@ rec { set -x emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \ ./.libs/'' - + pkgs.lib.optionalString pkgs.stdenv.isDarwin "libxml2.dylib " - + pkgs.lib.optionalString (!pkgs.stdenv.isDarwin) "libxml2.a " + + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin "libxml2.dylib " + + pkgs.lib.optionalString (!pkgs.stdenv.hostPlatform.isDarwin) "libxml2.a " + '' `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ --embed-file ./test/xmlid/id_err1.xml @@ -175,7 +175,7 @@ rec { echo "================= /testing zlib using node =================" ''; - postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ diff --git a/third_party/nixpkgs/pkgs/top-level/java-packages.nix b/third_party/nixpkgs/pkgs/top-level/java-packages.nix index 82022f2561..5b72824f1d 100644 --- a/third_party/nixpkgs/pkgs/top-level/java-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/java-packages.nix @@ -13,7 +13,7 @@ in { compiler = let mkOpenjdk = path-linux: path-darwin: args: - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then mkOpenjdkLinuxOnly path-linux args else let openjdk = callPackage path-darwin {}; @@ -21,7 +21,7 @@ in { mkOpenjdkLinuxOnly = path-linux: args: let openjdk = callPackage path-linux (args); - in assert stdenv.isLinux; openjdk // { + in assert stdenv.hostPlatform.isLinux; openjdk // { headless = openjdk.override { headless = true; }; }; @@ -71,13 +71,13 @@ in { }; temurin-bin = recurseIntoAttrs (callPackage ( - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix else ../development/compilers/temurin-bin/jdk-darwin.nix ) {}); semeru-bin = recurseIntoAttrs (callPackage ( - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then ../development/compilers/semeru-bin/jdk-linux.nix else ../development/compilers/semeru-bin/jdk-darwin.nix ) {}); diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index cbcee495ef..3c00a5693a 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -26,6 +26,10 @@ let linux = kernel; }; + markBroken = drv: drv.overrideAttrs ({ meta ? {}, ... }: { + meta = meta // { broken = true; }; + }); + # Hardened Linux hardenedKernelFor = kernel': overrides: let @@ -97,15 +101,6 @@ in { rpiVersion = 4; }; - linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "4.19"; - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "5.4"; kernelPatches = [ @@ -268,27 +263,18 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { + linux_5_4_hardened = markBroken (hardenedKernelFor kernels.linux_5_4 { stdenv = gcc10Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }; - linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }; + }); linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; } // lib.optionalAttrs config.allowAliases { - linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; - linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; - linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; - linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream"; + linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream"; linux_6_5 = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream"; @@ -297,9 +283,10 @@ in { linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; - linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; + linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; + linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; + linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; @@ -630,7 +617,6 @@ in { vanillaPackages = { # recurse to build modules for the kernels - linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); @@ -639,13 +625,8 @@ in { linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); } // lib.optionalAttrs config.allowAliases { - linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 - linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 - linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 - linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 - linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 - linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22 + linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02 linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28 linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04 @@ -676,7 +657,6 @@ in { linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); - linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened); linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened); linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); @@ -694,9 +674,10 @@ in { linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); __recurseIntoDerivationForReleaseJobs = true; } // lib.optionalAttrs config.allowAliases { - linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; + linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; + linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; + linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; diff --git a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix index 3eafa2fa78..6f62f2dee8 100644 --- a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix @@ -76,8 +76,8 @@ rec { # The makefile tries to link to `-llua` LUA_LIBS = "-llua"; - buildInputs = lib.optionals stdenv.isLinux [linux-pam] - ++ lib.optionals stdenv.isDarwin [openpam]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [linux-pam] + ++ lib.optionals stdenv.hostPlatform.isDarwin [openpam]; installPhase = '' runHook preInstall @@ -163,7 +163,7 @@ rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Lightweight UNIX I/O and POSIX binding for Lua"; homepage = "https://www.gitano.org.uk/luxio/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 51163610fe..f40b306ee3 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -689,6 +689,8 @@ let httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { }; + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; ### I ### @@ -1177,6 +1179,8 @@ let mirage-vnetif = callPackage ../development/ocaml-modules/mirage-vnetif { }; + mlbdd = callPackage ../development/ocaml-modules/mlbdd { }; + mldoc = callPackage ../development/ocaml-modules/mldoc { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 52bf1b19da..56bfd093fd 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -100,9 +100,9 @@ with self; { outputs = [ "out" "man" ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/ack ''; @@ -341,7 +341,7 @@ with self; { meta = { description = "Gumbo parser library"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin }; }; @@ -680,7 +680,7 @@ with self; { # Fails because /etc/protocols is not available in sandbox and make # getprotobyname('tcp') in ApacheTest fail. - doCheck = !stdenv.isLinux; + doCheck = !stdenv.hostPlatform.isLinux; meta = { description = "Perl Authentication and Authorization via cookies"; @@ -868,8 +868,8 @@ with self; { }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/cpm ''; meta = { @@ -905,8 +905,8 @@ with self; { }; buildInputs = [ ObjectPad ]; propagatedBuildInputs = [ AppPackager FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] - ++ lib.optionals (!stdenv.isDarwin) [ Wx ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; # Delete tests that fail when version env var is set, see # https://github.com/ChordPro/chordpro/issues/293 @@ -914,7 +914,7 @@ with self; { rm t/320_subst.t t/321_subst.t t/322_subst.t ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin ''; @@ -1047,16 +1047,16 @@ with self; { ArchiveLibarchive = buildPerlPackage { pname = "Archive-Libarchive"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.08.tar.gz"; - hash = "sha256-6ONC1U/T1uXn4xYP4IjBOgpQM8/76JSBodJHHUNyAFk="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.09.tar.gz"; + hash = "sha256-avdG7P9/GjUwzmtaWNCtR0MaaZjUWduw8VYqEiPn3v8="; }; patches = [ ../development/perl-modules/ArchiveLibarchive-set-findlib-path.patch ]; postPatch = '' - substituteInPlace lib/Archive/Libarchive/Lib.pm --replace "@@libarchive@@" "${pkgs.libarchive.lib}/lib" + substituteInPlace lib/Archive/Libarchive/Lib.pm --replace-fail "@@libarchive@@" "${lib.getLib pkgs.libarchive}/lib" ''; - buildInputs = [ FFIC Filechdir PathTiny SubIdentify TermTable Test2Suite Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; + buildInputs = [ FFIC Filechdir PathTiny SubIdentify Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; propagatedBuildInputs = [ FFICStat FFICheckLib FFIPlatypus FFIPlatypusTypeEnum FFIPlatypusTypePtrObject RefUtil ]; meta = { homepage = "https://metacpan.org/pod/Archive::Libarchive"; @@ -1334,7 +1334,7 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; hash = "sha256-9DqTuwK0H3Mn2S+eljtpUF9nNQpS6PUHlvmK/E+z8Xc="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; @@ -1647,7 +1647,7 @@ with self; { ''; buildInputs =[ ExtUtilsMakeMaker ]; propagatedBuildInputs = [ pkgs.zbar PerlMagick ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl interface to the ZBar Barcode Reader"; homepage = "https://metacpan.org/pod/Barcode::ZBar"; @@ -2490,7 +2490,7 @@ with self; { }; propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ]; buildInputs = [ TestMockObject TestException NetLDAPServerTest ]; - doCheck = !stdenv.isDarwin; # t/02-realms_api.t and t/50.auth.case.sensitivity.t + doCheck = !stdenv.hostPlatform.isDarwin; # t/02-realms_api.t and t/50.auth.case.sensitivity.t meta = { description = "Authenticate Users against LDAP Directories"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -3968,7 +3968,7 @@ with self; { # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. # Ssh sessions and cron jobs can not create the requisite pasteboard handles, giving coreFoundationUnknownErr (-4960)' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Copy and paste with any OS"; homepage = "https://metacpan.org/release/Clipboard"; @@ -4197,7 +4197,7 @@ with self; { EOF ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Low-Level Interface to zlib or zlib-ng compression library"; @@ -4762,9 +4762,9 @@ with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111017.tar.gz"; hash = "sha256-8gQpO+JqyEGsyHBEoYjbD1kegIgTFseiiK7A7s4wYVU="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/minicpan ''; @@ -5100,7 +5100,7 @@ with self; { hash = "sha256-PMcSbVhBEHI3qb4txcf7wWfPPEtM40Z4qESLhQdXAUw="; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Eksblowfish block cipher"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5129,9 +5129,9 @@ with self; { url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz"; hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ Clone DateTime FileHomeDir FileShare FileShareDir GetoptLong JSON ListMoreUtils MathRound Readonly TextUnidecode TypeTiny ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/hsxkpasswd ''; @@ -5356,7 +5356,7 @@ with self; { hash = "sha256-k+vfqu/P6atoPwEhyF8kR12Bl/C87EYBghnkERQ03eM="; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Emulate MySQL PASSWORD() function"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5478,8 +5478,8 @@ with self; { buildInputs = [ TestException ]; propagatedBuildInputs = [ AltCryptRSABigInt CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish FileHomeDir LWP ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pgplet ''; doCheck = false; /* test fails with 'No random source available!' */ @@ -5703,7 +5703,7 @@ with self; { url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.13.tar.gz"; hash = "sha256-xBnjCM3IKvHCXWuNB7L/JjR6Yit6Y+wghWq+jbQFH4I="; }; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; buildInputs = [ TestDiagINC ]; meta = { description = "XS based CSS minifier"; @@ -6058,7 +6058,7 @@ with self; { homepage = "https://github.com/msgpack/msgpack-perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin }; }; @@ -6332,12 +6332,12 @@ with self; { hash = "sha256-tVypHHafgTN8xrCrIMMmg4eOWyZj8cwljFEamZpd/dM="; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Selection of utilities for data and data types"; homepage = "https://github.com/gfx/Perl-Data-Util"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin }; }; @@ -6488,7 +6488,7 @@ with self; { patchPhase = '' sed -i "s#/bin/date#${pkgs.coreutils}/bin/date#" lib/Date/Manip/TZ.pm ''; - doCheck = !stdenv.isi686; # build freezes during tests on i686 + doCheck = !stdenv.hostPlatform.isi686; # build freezes during tests on i686 buildInputs = [ TestInter ]; meta = { description = "Date manipulation routines"; @@ -7222,7 +7222,7 @@ with self; { buildInputs = [ pkgs.oracle-instantclient TestNoWarnings ]; propagatedBuildInputs = [ DBI ]; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${pkgs.oracle-instantclient.lib}/lib" blib/arch/auto/DBD/Oracle/Oracle.bundle ''; meta = { @@ -7275,7 +7275,7 @@ with self; { meta = { description = "DBI driver for Sybase datasources"; license = with lib.licenses; [ artistic1 gpl1Only ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DBDsybase.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DBDsybase.x86_64-darwin }; }; @@ -7637,7 +7637,7 @@ with self; { hash = "sha256-z/jSTllF45RN6/ITmVprFVuR5YE0aRVrE9Ws819qXZ8="; }; propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs"; license = with lib.licenses; [ mit ]; @@ -7735,8 +7735,8 @@ with self; { }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; buildInputs = [ CaptureTiny TestDifferences ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/* ''; meta = { @@ -8050,8 +8050,8 @@ with self; { }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/dzil ''; doCheck = false; @@ -8630,11 +8630,11 @@ with self; { }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailAddressXS EmailSimple ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util ''; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang util/sendmail ''; meta = { @@ -8813,7 +8813,7 @@ with self; { url = "mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz"; hash = "sha256-F2+gJ3H1QqTvsdvCpMko6PQ5G/QHhHO9YEDY8RrbDsE="; }; - preCheck = if stdenv.isCygwin then '' + preCheck = if stdenv.hostPlatform.isCygwin then '' sed -i"" -e "s@plan tests => 13@plan tests => 10@" t/env.t sed -i"" -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t sed -i"" -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t @@ -9180,7 +9180,7 @@ with self; { url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.26.tar.gz"; hash = "sha256-yLNiuGAXKkB2rO4AQ49SuGRk8sUAcCz891J4Ef+aaD4="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; buildInputs = [ ModuleBuild ]; @@ -9517,10 +9517,10 @@ with self; { FFIPlatypus = buildPerlPackage { pname = "FFI-Platypus"; - version = "2.08"; + version = "2.09"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.08.tar.gz"; - hash = "sha256-EbOrEU7ZY1YxzYWzjSKXhuFEv5Sjr5rAnD17s0M2uSQ="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.09.tar.gz"; + hash = "sha256-nTEjEiieeHNbRcMRt6wWqejaCT93m/aUaccK+sTdW2M="; }; buildInputs = [ AlienFFI Test2Suite ]; propagatedBuildInputs = [ CaptureTiny FFICheckLib ]; @@ -9915,7 +9915,7 @@ with self; { }; propagatedBuildInputs = [ FileWhich ]; preCheck = "export HOME=$TMPDIR"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Find your home and other directories on any platform"; homepage = "https://metacpan.org/release/File-HomeDir"; @@ -9945,7 +9945,7 @@ with self; { hash = "sha256-oC+/KFQGqKTZOZKE8DLy1VxWl1FUwuFnS9EJg3uAluw="; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -9969,7 +9969,7 @@ with self; { description = "Determine MIME types of data or files using libmagic"; homepage = "https://metacpan.org/release/File::LibMagic"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.FileLibMagic.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.FileLibMagic.x86_64-darwin }; }; @@ -10431,10 +10431,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.62"; + version = "1.63"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-DTEzsL89d5WCxWaFDVd/K76OGsvRFJeDHNQ9jzFgZII="; + hash = "sha256-Y0dqDIJ60aHf7KjePopkKiToeMH0p6neb1FNaoV3so0="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies HTTPCookieJar JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; @@ -10584,7 +10584,7 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -10816,8 +10816,8 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004001.tar.gz"; hash = "sha256-WroBPI3hOZD1iRoOKjnJcHTQcnvjZTIMLGrxnTbF3aw="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/git-autofixup ''; meta = { @@ -10909,7 +10909,7 @@ with self; { postCheck = '' rm -r $out/lib ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Dynamically create Perl language bindings"; homepage = "https://gtk2-perl.sourceforge.net"; @@ -11201,7 +11201,7 @@ with self; { ]; buildInputs = [ pkgs.gtk2 ]; # https://rt.cpan.org/Public/Bug/Display.html?id=130742 - # doCheck = !stdenv.isDarwin; + # doCheck = !stdenv.hostPlatform.isDarwin; doCheck = false; propagatedBuildInputs = [ Pango ]; meta = { @@ -11222,7 +11222,7 @@ with self; { meta = { description = "(DEPRECATED) Perl interface to the EggTrayIcon library"; license = with lib.licenses; [ gpl2Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin }; }; @@ -11273,7 +11273,7 @@ with self; { meta = { description = "(DEPRECATED) Use single instance applications"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2Unique.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2Unique.x86_64-darwin }; }; @@ -11285,7 +11285,7 @@ with self; { hash = "sha256-cNxL8qp0mBx54V/SmNmY4FqS66SBHxrVyfH03jdzesw="; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Currently failing on macOS rm t/overrides.t rm t/signals.t @@ -11372,14 +11372,14 @@ with self; { }; buildInputs = [ BotTrainingMegaHAL BotTrainingStarCraft DataSection FileSlurp PodSection TestException TestExpect TestOutput TestScript TestScriptRun ]; propagatedBuildInputs = [ ClassLoad DBDSQLite DataDump DirSelf FileCountLines GetoptLongDescriptive IOInteractive IPCSystemSimple ListMoreUtils Moose MooseXGetopt MooseXStrictConstructor MooseXTypes RegexpCommon TermSk namespaceclean ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; patches = [ ../development/perl-modules/Hailo-fix-test-gld.patch ]; postPatch = '' patchShebangs bin ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/hailo ''; meta = { @@ -11518,12 +11518,12 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz"; hash = "sha256-Mkd2gIYC973EStqpN4lTZUVAKakm+mEfMhyb9rlAu14="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-mno-outline-atomics"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-mno-outline-atomics"; buildInputs = [ ScalarString ]; meta = { description = "Efficient shared mutable hash"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HashSharedMem.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HashSharedMem.x86_64-darwin }; }; @@ -11535,7 +11535,7 @@ with self; { hash = "sha256-ucvE3NgjPo0dfxSB3beaSl+dtxgMs+8CtLy+4F5l6gw="; }; buildInputs = [ Test2Suite ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Functions for accessing a hashes internal iterator"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11619,12 +11619,12 @@ with self; { hash = "sha256-Wl7viWUA0epsJKkIXs++mkOr7mjPxmwD+InSostoml0="; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Extremely fast HTML escaping"; homepage = "https://github.com/tokuhirom/HTML-Escape"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTMLEscape.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTMLEscape.x86_64-darwin }; }; @@ -12136,6 +12136,7 @@ with self; { }; buildInputs = [ ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; + __darwinAllowLocalNetworking = true; meta = { description = "Simple http server class"; homepage = "https://github.com/libwww-perl/HTTP-Daemon"; @@ -12215,8 +12216,8 @@ with self; { description = "XS extension for processing HTTP headers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; broken = - stdenv.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) - || stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin + stdenv.hostPlatform.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) + || stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin }; }; @@ -12467,7 +12468,7 @@ with self; { description = "Perl interface to libpng"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "pnginspect"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.ImagePNGLibpng.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.ImagePNGLibpng.x86_64-darwin }; }; @@ -12651,8 +12652,8 @@ with self; { }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/treescan ''; meta = { @@ -12744,7 +12745,7 @@ with self; { }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; # Same as CompressRawZlib - doCheck = false && !stdenv.isDarwin; + doCheck = false && !stdenv.hostPlatform.isDarwin; meta = { description = "IO Interface to compressed data files/buffers"; homepage = "https://github.com/pmqs/IO-Compress"; @@ -12803,7 +12804,7 @@ with self; { url = "mirror://cpan/authors/id/L/LD/LDS/IO-Interface-1.09.tar.gz"; hash = "sha256-5j6BxS6x4OYOwtmD9VUtJJPhFxeZJclnV/I8S9n6cTo="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.ld-is-cc-hook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.ld-is-cc-hook ]; meta = { description = "Access and modify network interface card configuration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -13066,7 +13067,7 @@ with self; { hash = "sha256-pfGoMCC8W13WwbVw9Ix1RuCo9/rBCgaHQLA5Ja2eFOg="; }; patches = [ ../development/perl-modules/IO-Tty-fix-makefile.patch ]; - doCheck = !stdenv.isDarwin; # openpty fails in the sandbox + doCheck = !stdenv.hostPlatform.isDarwin; # openpty fails in the sandbox meta = { description = "Low-level allocate a pseudo-Tty, import constants"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -13273,7 +13274,7 @@ with self; { available to the Perl program as if they had been written in Perl. ''; license = with lib.licenses; [ artistic2 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin }; }; @@ -13298,7 +13299,7 @@ with self; { hash = "sha256-XZsDT1jwtv9bZGR708WpzgWypw7e4zn7wxc67nR8wFA="; }; buildInputs = [ TestDiagINC ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; homepage = "https://metacpan.org/release/JavaScript-Minifier-XS"; @@ -13533,12 +13534,12 @@ with self; { }; outputs = [ "out" "tex" ]; propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageMagick ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; - nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; makeMakerFlags = [ "TEXMF=\${tex}" "NOMKTEXLSR" ]; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in bin/*; do shortenPerlShebang "$file" done @@ -14001,7 +14002,7 @@ with self; { }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Linux specific special filehandles"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14661,7 +14662,7 @@ with self; { postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; meta = { description = "World-Wide Web library for Perl"; @@ -15332,7 +15333,7 @@ with self; { description = "Manipulate 128 bits integers in Perl"; homepage = "https://metacpan.org/release/Math-Int128"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.is32bit; # compiler doesn't support a 128-bit integer type + broken = stdenv.hostPlatform.is32bit; # compiler doesn't support a 128-bit integer type }; }; @@ -15569,7 +15570,7 @@ with self; { description = "Fast XS implementation of MaxMind DB reader"; homepage = "https://metacpan.org/release/MaxMind-DB-Reader-XS"; license = with lib.licenses; [ artistic2 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBReaderXS.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBReaderXS.x86_64-darwin }; }; @@ -15587,7 +15588,7 @@ with self; { description = "Create MaxMind DB database files"; homepage = "https://metacpan.org/release/MaxMind-DB-Writer"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBWriter.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBWriter.x86_64-darwin }; }; @@ -16953,7 +16954,7 @@ with self; { }; buildInputs = [ ModuleInstall ]; propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Caching, Non-blocking I/O HTTP, Local file and WebSocket user agent"; homepage = "https://github.com/nicomen/mojo-useragent-cached"; @@ -18113,8 +18114,8 @@ with self; { }; buildInputs = [ ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fno-stack-protector"; - hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-fno-stack-protector"; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; meta = { description = "Moose minus the antlers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -18457,7 +18458,7 @@ with self; { }; buildInputs = [ HTTPCookies Test2Suite TestMetricsAny ]; propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # network tests fail on Darwin/sandbox, so disable these rm -f t/20local-connect.t t/22local-connect-pipeline.t t/23local-connect-redir.t rm -f t/90rt75615.t t/90rt75616.t t/90rt93232.t @@ -18510,7 +18511,7 @@ with self; { hash = "sha256-DayDQtPHii/syr1GZxRd1a3U+4zRjRVtKXoead/hFgA="; }; propagatedBuildInputs = [ IOAsync ProtocolWebSocket URI ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # network tests fail on Darwin/sandbox, so disable these rm -f t/02server.t t/03cross.t ''; @@ -18723,7 +18724,7 @@ with self; { meta = { description = "OOP Interface to FreeDB Server(s)"; license = with lib.licenses; [ artistic1 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin }; }; @@ -19502,7 +19503,7 @@ with self; { hash = "sha256-z4jSquGKKHHX1/MPi6bU7lv5U+IP3KileME8dB0W0a0="; }; buildInputs = [ Test2Suite TestFatal TestRefcount ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; meta = { description = "Simple syntax for lexical field-based objects"; @@ -19689,7 +19690,7 @@ with self; { # https://github.com/NixOS/nixpkgs/pull/104889#issuecomment-737144513 preCheck = '' rm t/35_log.t - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' rm t/30_connect.t rm t/45_class.t ''; @@ -19861,7 +19862,7 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz"; hash = "sha256-OY7BXNiZ/Ni+89ueoXSL9jHxX2wyviA+R1tn31EKWRQ="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Argument type classification"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -20378,9 +20379,9 @@ with self; { hash = "sha256-5c2V3j5DvOcHdRdidLqkBfMm/IdA3wBUu4FpdcyNNJs="; }; buildInputs = [ TestDeep ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ BKeywords ConfigTiny ExceptionClass FileWhich ListSomeUtils ModulePluggable PPI PPIxQuoteLike PPIxRegexp PPIxUtilities PPIxUtils PerlTidy PodSpell Readonly StringFormat ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/perlcritic ''; meta = { @@ -20884,8 +20885,8 @@ with self; { hash = "sha256-RVW1J5nBZBXDy/5eMB6gLKDrvDQhTH/lLx19ykUwLik="; }; propagatedBuildInputs = [ Future FutureQueue IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pls ''; meta = { @@ -21814,8 +21815,8 @@ with self; { url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; hash = "sha256-TxOa01+q8t4GI9wLsd2J+lpDHlSL/sh97hlM8OJcyX0="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/rainbarf ''; meta = { @@ -22889,8 +22890,8 @@ with self; { patchShebangs script ''; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/bin/*; do shortenPerlShebang $file done @@ -22940,7 +22941,7 @@ with self; { }; buildInputs = [ LWP TestSharedFork TestTCP ]; propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Simple, high-performance PSGI/Plack HTTP server"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -22955,9 +22956,9 @@ with self; { hash = "sha256-b/q5FfMj9gCJ4+v4Urm5cH1pFyZt+K/XNw+sBL/f7k4="; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork IOSocketINET6 ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/starman ''; @@ -23317,7 +23318,7 @@ with self; { url = "mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz"; hash = "sha256-5gY2UDjOINZG0lXIBe/90y+GR18Y1DynVFWwDk2G3TU="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Quote strings for passing through the shell"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23625,7 +23626,7 @@ with self; { hash = "sha256-oSfa52RcGpVwzZopcMbcST1SL/BzGKNKOeQJCY9pESU="; }; propagatedBuildInputs = [ LexicalSealRequireHints ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Detect undeclared subroutines in compilation"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23667,7 +23668,7 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz"; hash = "sha256-9PVui70GxP5K4G2xIYbeyt+6wep3XqGMbAKJSB0V7AU="; }; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Lib/Safe/Hole.pm"; homepage = "https://github.com/toddr/Safe-Hole"; @@ -23787,7 +23788,7 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Try/catch/finally syntax for perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23842,8 +23843,8 @@ with self; { hash = "sha256-nCypGyi6bZDEXqdb7wlGGzk9cFzmYkWGP1slBpXDfHw="; }) ]; - buildInputs = lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; - doCheck = !stdenv.isAarch64; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; + doCheck = !stdenv.hostPlatform.isAarch64; meta = { description = "Perl extension for getting CPU information. Currently only number of CPU's supported"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23886,7 +23887,7 @@ with self; { url = "mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz"; hash = "sha256-xO9sk0VTQDH8u+Ktw0f8cZTUevyUXnpE+sfpVjCV01M="; }; - doCheck = !stdenv.isAarch64; # it hangs on Aarch64 + doCheck = !stdenv.hostPlatform.isAarch64; # it hangs on Aarch64 meta = { description = "Perl extension for Consistent Signal Handling"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23932,12 +23933,12 @@ with self; { }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Libvirt Perl API"; homepage = "https://libvirt.org"; license = with lib.licenses; [ gpl2Plus artistic1 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.SysVirt.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.SysVirt.x86_64-darwin }; }; @@ -23948,7 +23949,7 @@ with self; { url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.36.tar.gz"; hash = "sha256-B75RUy4GPqxu2OWBUFRw7ryB1VBkQa8tzzK8Dr7pjGc="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Stream TAP from pgTAP test scripts"; homepage = "https://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP"; @@ -24043,9 +24044,9 @@ with self; { pkgs.tcl pkgs.tix pkgs.tk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - makeMakerFlags = lib.optionals stdenv.isLinux + makeMakerFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--tclsh=${pkgs.tcl}/bin/tclsh" "--nousestubs" ]; meta = { description = "Tcl extension module for Perl"; @@ -24073,7 +24074,7 @@ with self; { mkdir -p $out/lib/perl5/site_perl mv $out/lib/perl5/Tcl $out/lib/perl5/site_perl/ mv $out/lib/perl5/auto $out/lib/perl5/site_perl/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/lib/perl5/darwin-thread-multi-2level $out/lib/perl5/site_perl/ ''; meta = { @@ -24189,7 +24190,7 @@ with self; { url = "mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-3.101.tar.gz"; hash = "sha256-0qMt1sIeSzfGqT34CHyp6IDPrmE6Pl766jB7C9yu21g="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; propagatedBuildInputs = [ AppConfig ]; buildInputs = [ CGI TestLeakTrace ]; meta = { @@ -24523,7 +24524,7 @@ with self; { description = "New and improved test harness with better Test2 integration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "yath"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin }; }; @@ -25329,7 +25330,7 @@ with self; { meta = { description = "Assert that code does not cause growth in memory usage"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestMemoryGrowth.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestMemoryGrowth.x86_64-darwin }; }; @@ -25823,7 +25824,7 @@ with self; { }; buildInputs = [ TestRun TestTrap ]; propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Analyze tests from the command line using Test::Run"; homepage = "http://web-cpan.berlios.de/modules/Test-Run"; @@ -26380,7 +26381,7 @@ with self; { # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; perlPreHook = "export LD=$CC"; - perlPostHook = lib.optionalString stdenv.isDarwin '' + perlPostHook = lib.optionalString stdenv.hostPlatform.isDarwin '' oldPath="$(pwd)/btparse/src/libbtparse.dylib" newPath="$out/lib/libbtparse.dylib" @@ -26572,7 +26573,7 @@ with self; { meta = { description = "Perl interface to iconv() codeset conversion function"; license = with lib.licenses; [ artistic1 gpl1Plus ]; # taken from el6 - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextIconv.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextIconv.x86_64-darwin }; }; @@ -26688,7 +26689,7 @@ with self; { hash = "sha256-U6cw/29IgrmavYVW8mqRH1gvZ1tZ8OFnJe0ey8CE7lA="; }; buildInputs = [ Filepushd ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Hoedown for Perl5"; homepage = "https://github.com/tokuhirom/Text-Markdown-Hoedown"; @@ -27036,7 +27037,7 @@ with self; { meta = { description = "Remove accents from a string"; license = with lib.licenses; [ gpl2Only ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin }; }; @@ -27131,7 +27132,7 @@ with self; { url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz"; hash = "sha256-S9KaF/DCx5LRLBAFs8J28qsPrjnACFmuF0HXlBhGpIg="; }; - buildInputs = lib.optionals (!stdenv.isDarwin) [ pkgs.glibcLocales ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkgs.glibcLocales ]; propagatedBuildInputs = [ TextCharWidth ]; preConfigure = '' substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.unixtools.locale}/bin/locale' @@ -27709,7 +27710,7 @@ with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz"; hash = "sha256-QYohKAj50Li7MwrJBQltLdNkl2dT1McVNNq5g2pjGU0="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Unicode case-folding for case-insensitive lookups"; homepage = "https://metacpan.org/release/Unicode-CaseFold"; @@ -27987,7 +27988,7 @@ with self; { url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.003.tar.gz"; hash = "sha256-4S9sgrg1dcORd3O0HA+1HPeDx8bPcuDJkWks4u8Hg2I="; }; - postPatch = lib.optionalString (stdenv.isAarch64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isAarch64) '' # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h # printf SYS_getrandom | gcc -include sys/syscall.h -E - substituteInPlace lib/UUID4/Tiny.pm \ @@ -28187,7 +28188,7 @@ with self; { meta = { description = "Use WWW::Mechanize with CGI applications"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.WWWMechanizeCGI.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.WWWMechanizeCGI.x86_64-darwin }; }; @@ -28448,9 +28449,9 @@ with self; { url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz"; hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/download-entities.pl ''; meta = { @@ -28523,12 +28524,12 @@ with self; { url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Filter-Sort-1.01.tar.gz"; hash = "sha256-UQWF85pJFszV+o1UXpYXnJHq9vx8l6QBp1aOhBFi+l8="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ XMLSAX XMLSAXWriter ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/xmlsort ''; meta = { @@ -28580,7 +28581,7 @@ with self; { }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] - ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with pkgs; [ libiconv zlib ]); patches = [ # https://github.com/shlomif/perl-XML-LibXML/pull/87 ../development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch @@ -28658,7 +28659,7 @@ with self; { patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Expat/Makefile.PL --replace 'use English;' '#' - '' + lib.optionalString stdenv.isCygwin '' + '' + lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm ''; makeMakerFlags = [ "EXPATLIBPATH=${pkgs.expat.out}/lib" "EXPATINCPATH=${pkgs.expat.dev}/include" ]; @@ -28958,7 +28959,7 @@ with self; { hash = "sha256-JQDEeGnPXKjGHdI8Z7rav2a48e+14nkgdlfBzmk+IR4="; }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -28974,7 +28975,7 @@ with self; { hash = "sha256-Wn0myqMroqQQUZwMJLHYCznvMgdRN224vbef2u/pms0="; }; buildInputs = [ Test2Suite ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -29036,7 +29037,7 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; hash = "sha256-zJFWzK69p5jr/i8xthnoBld/hg7RcEJi8X/608bjQVk="; }; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Fast, lightweight YAML loader and dumper"; homepage = "https://github.com/toddr/YAML-Syck"; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 7cef004a87..8710dd6d97 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -253,7 +253,7 @@ in { datadog_trace = callPackage ../development/php-packages/datadog_trace { buildPecl = buildPecl.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; inherit (pkgs) darwin; }; @@ -463,7 +463,7 @@ in { name = "iconv"; buildInputs = [ libiconv ]; configureFlags = [ "--with-iconv" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; } { name = "imap"; @@ -484,7 +484,7 @@ in { "LDAP_DIR=${openldap.dev}" "LDAP_INCDIR=${openldap.dev}/include" "LDAP_LIBDIR=${openldap.out}/lib" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-ldap-sasl=${cyrus_sasl.dev}" ]; doCheck = false; @@ -528,11 +528,11 @@ in { name = "opcache"; buildInputs = [ pcre2 ] ++ lib.optional - (!stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) + (!stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) valgrind.dev; configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit"; zendExtension = true; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Tests are flaky on darwin rm ext/opcache/tests/blacklist.phpt rm ext/opcache/tests/bug66338.phpt @@ -567,7 +567,7 @@ in { internalDeps = [ php.extensions.pdo ]; configureFlags = [ "--with-pdo-dblib=${freetds}" ]; # Doesn't seem to work on darwin. - enable = (!stdenv.isDarwin); + enable = (!stdenv.hostPlatform.isDarwin); doCheck = false; } { @@ -671,7 +671,7 @@ in { buildInputs = [ net-snmp openssl ]; configureFlags = [ "--with-snmp" ]; # net-snmp doesn't build on darwin. - enable = (!stdenv.isDarwin); + enable = (!stdenv.hostPlatform.isDarwin); doCheck = false; } { @@ -680,7 +680,7 @@ in { configureFlags = [ "--enable-soap" ]; - doCheck = stdenv.isDarwin; # TODO: a couple tests still fail on *-linux + doCheck = stdenv.hostPlatform.isDarwin; # TODO: a couple tests still fail on *-linux internalDeps = [ php.extensions.session ]; patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [ # Fix tests with libxml2 2.12 @@ -731,7 +731,7 @@ in { # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.: # - https://github.com/php/php-src/issues/12076 # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f - patches = lib.optionals (stdenv.isi686 && stdenv.isLinux) [ + patches = lib.optionals (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isLinux) [ ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch ]; } diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 3bcb357458..9c26e747a4 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -73,8 +73,10 @@ mapAliases ({ bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bip_utils = bip-utils; # 2023-10-08 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 + blessings = throw "blessings has been removed in favor of blessed, as it was unmaintained"; # added 2024-08-20 BlinkStick = blinkstick; # added 2023-02-19 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 + boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22 bsblan = python-bsblan; # added 2022-11-04 btchip = btchip-python; # added 2023-03-03 buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07 @@ -219,6 +221,7 @@ mapAliases ({ fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 + gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22 gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15 GeoIP = geoip; # added 2023-02-19 gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02 @@ -278,6 +281,7 @@ mapAliases ({ jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 jupyter_console = jupyter-console; # added 2023-07-31 + jupyter-contrib-nbextensions = throw "jupyter-contrib-nbextensions has been removed, as it does not work with Jupyter Notebook 7"; # added 2024-09-22 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 @@ -332,6 +336,7 @@ mapAliases ({ mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01 multi_key_dict = multi-key-dict; # added 2023-11-05 mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02 + n3fit = throw "n3fit has been removed since it relies on a dependency that was removed"; # added 2024-08-24 nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05 mypy-boto3-alexaforbusiness = throw "mypy-boto3-alexaforbusiness was removed because it is unmaintained"; # added 2024-09-04 mypy-boto3-backupstorage = throw "mypy-boto3-backupstorage was removed because it is unmaintained"; # added 2024-09-04 @@ -395,6 +400,8 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 + proton-vpn-network-manager-openvpn = throw "proton-vpn-network-manager-openvpn functionality was integrated in the proton-vpn-network-manager module"; # added 2024-09-20 + proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-09-20 proxy_tools = proxy-tools; # added 2023-11-05 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 @@ -511,6 +518,7 @@ mapAliases ({ pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 + pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 pyvicare = pyvicare-neo; # added 2024-08-31 @@ -519,6 +527,7 @@ mapAliases ({ pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 querystring_parser = querystring-parser; # added 2024-01-07 @@ -535,6 +544,7 @@ mapAliases ({ recursivePthLoader = recursive-pth-loader; # added 2024-01-07 rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06 repeated_test = repeated-test; # added 2022-11-15 + reportengine = throw "reportengine has been removed, since it is unmaintained and broken"; # added 2024-08-21 repoze_lru = repoze-lru; # added 2023-11-11 repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11 repoze_who = repoze-who; # added 2023-11-11 @@ -548,6 +558,7 @@ mapAliases ({ rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28 rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 + ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21 ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 ruamel_base = ruamel-base; # added 2021-11-01 @@ -640,6 +651,7 @@ mapAliases ({ urwid-mitmproxy-mitmproxy = throw "urwid-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-07-26 uuid = throw "uuid is a Python standard module"; # added 2024-04-18 validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07 + validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07 vega_datasets = vega-datasets; # added 2023-11-04 ViennaRNA = viennarna; # added 2023-08-23 virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index e7ca94816f..a6db98bd99 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -521,6 +521,11 @@ self: super: with self; { algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + aligator = toPythonModule (pkgs.aligator.override { + python3Packages = self; + pythonSupport = true; + }); + alive-progress = callPackage ../development/python-modules/alive-progress { }; aliyun-python-sdk-cdn = callPackage ../development/python-modules/aliyun-python-sdk-cdn { }; @@ -1662,10 +1667,14 @@ self: super: with self; { black = callPackage ../development/python-modules/black { }; + blacken-docs = callPackage ../development/python-modules/blacken-docs { }; + blackjax = callPackage ../development/python-modules/blackjax { }; black-macchiato = callPackage ../development/python-modules/black-macchiato { }; + blackrenderer = callPackage ../development/python-modules/blackrenderer { }; + bleach = callPackage ../development/python-modules/bleach { }; bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { }; @@ -1682,8 +1691,6 @@ self: super: with self; { blessed = callPackage ../development/python-modules/blessed { }; - blessings = callPackage ../development/python-modules/blessings { }; - blinker = callPackage ../development/python-modules/blinker { }; blinkpy = callPackage ../development/python-modules/blinkpy { }; @@ -1783,8 +1790,6 @@ self: super: with self; { boto3-stubs = callPackage ../development/python-modules/boto3-stubs { }; - boto = callPackage ../development/python-modules/boto { }; - botocore = callPackage ../development/python-modules/botocore { }; botocore-stubs = callPackage ../development/python-modules/botocore-stubs { }; @@ -1905,6 +1910,10 @@ self: super: with self; { buildcatrust = callPackage ../development/python-modules/buildcatrust { }; + bump2version = callPackage ../development/python-modules/bump2version { }; + + bumpfontversion = callPackage ../development/python-modules/bumpfontversion { }; + bumps = callPackage ../development/python-modules/bumps { }; bunch = callPackage ../development/python-modules/bunch { }; @@ -2043,7 +2052,7 @@ self: super: with self; { cattrs = callPackage ../development/python-modules/cattrs { }; - cbeams = callPackage ../misc/cbeams { }; + causal-conv1d = callPackage ../development/python-modules/causal-conv1d { }; cbor2 = callPackage ../development/python-modules/cbor2 { }; @@ -2429,6 +2438,8 @@ self: super: with self; { colander = callPackage ../development/python-modules/colander { }; + colbert-ai = callPackage ../development/python-modules/colbert-ai { }; + collections-extended = callPackage ../development/python-modules/collections-extended { }; collidoscope = callPackage ../development/python-modules/collidoscope { }; @@ -2517,6 +2528,8 @@ self: super: with self; { confuse = callPackage ../development/python-modules/confuse { }; + confusable-homoglyphs = callPackage ../development/python-modules/confusable-homoglyphs { }; + confight = callPackage ../development/python-modules/confight { }; connexion = callPackage ../development/python-modules/connexion { }; @@ -3137,6 +3150,8 @@ self: super: with self; { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + diffenator2 = callPackage ../development/python-modules/diffenator2 { }; + diffimg = callPackage ../development/python-modules/diffimg { }; diffsync = callPackage ../development/python-modules/diffsync { }; @@ -4860,8 +4875,6 @@ self: super: with self; { gcovr = callPackage ../development/python-modules/gcovr { }; - gcs-oauth2-boto-plugin = callPackage ../development/python-modules/gcs-oauth2-boto-plugin { }; - gcsa = callPackage ../development/python-modules/gcsa { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; @@ -4969,6 +4982,12 @@ self: super: with self; { georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { }; + gepetto-gui = toPythonModule (gepetto-viewer.withPlugins [ gepetto-viewer-corba ]); + + gepetto-viewer-corba = toPythonModule (pkgs.gepetto-viewer-corba.override { python3Packages = self; }); + + gepetto-viewer = toPythonModule (pkgs.gepetto-viewer.override { python3Packages = self; }); + gerbonara = callPackage ../development/python-modules/gerbonara { }; getjump = callPackage ../development/python-modules/getjump { }; @@ -4999,6 +5018,8 @@ self: super: with self; { gfsubsets = callPackage ../development/python-modules/gfsubsets { }; + gftools = callPackage ../development/python-modules/gftools { }; + gguf = callPackage ../development/python-modules/gguf { }; ghapi = callPackage ../development/python-modules/ghapi { }; @@ -6539,8 +6560,6 @@ self: super: with self; { jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { }; - jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { }; - jupyter-console = callPackage ../development/python-modules/jupyter-console { }; jupyter-core = callPackage ../development/python-modules/jupyter-core { }; @@ -6820,6 +6839,8 @@ self: super: with self; { langchain-mongodb = callPackage ../development/python-modules/langchain-mongodb { }; + langchain-ollama = callPackage ../development/python-modules/langchain-ollama { }; + langchain-openai = callPackage ../development/python-modules/langchain-openai { }; langchain-standard-tests = callPackage ../development/python-modules/langchain-standard-tests { }; @@ -6871,6 +6892,8 @@ self: super: with self; { latexify-py = callPackage ../development/python-modules/latexify-py { }; + latexrestricted = callPackage ../development/python-modules/latexrestricted { }; + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; laundrify-aio = callPackage ../development/python-modules/laundrify-aio { }; @@ -7398,6 +7421,8 @@ self: super: with self; { lomond = callPackage ../development/python-modules/lomond { }; + loompy = callPackage ../development/python-modules/loompy { }; + loopy = callPackage ../development/python-modules/loopy { }; looseversion = callPackage ../development/python-modules/looseversion { }; @@ -7530,6 +7555,8 @@ self: super: with self; { malduck = callPackage ../development/python-modules/malduck { }; + mamba-ssm = callPackage ../development/python-modules/mamba-ssm { }; + managesieve = callPackage ../development/python-modules/managesieve { }; mando = callPackage ../development/python-modules/mando { }; @@ -7627,7 +7654,7 @@ self: super: with self; { matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { }; matplotlib = callPackage ../development/python-modules/matplotlib { - stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; ghostscript = pkgs.ghostscript_headless; }; @@ -7803,6 +7830,8 @@ self: super: with self; { meteofrance-api = callPackage ../development/python-modules/meteofrance-api { }; + meteoswiss-async = callPackage ../development/python-modules/meteoswiss-async { }; + methodtools = callPackage ../development/python-modules/methodtools { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -8642,8 +8671,6 @@ self: super: with self; { myuplink = callPackage ../development/python-modules/myuplink { }; - n3fit = callPackage ../development/python-modules/n3fit { }; - nad-receiver = callPackage ../development/python-modules/nad-receiver { }; nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; @@ -8666,6 +8693,8 @@ self: super: with self; { nanobind = callPackage ../development/python-modules/nanobind { }; + nanoemoji = callPackage ../development/python-modules/nanoemoji { }; + nanoid = callPackage ../development/python-modules/nanoid { }; nanoleaf = callPackage ../development/python-modules/nanoleaf { }; @@ -8976,6 +9005,8 @@ self: super: with self; { inherit (pkgs) notmuch; }; + notobuilder = callPackage ../development/python-modules/notobuilder { }; + nototools = callPackage ../development/python-modules/nototools { }; notus-scanner = callPackage ../development/python-modules/notus-scanner { }; @@ -9056,6 +9087,8 @@ self: super: with self; { python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; + python-qt = toPythonModule (pkgs.python-qt.override { python3 = self.python; }); + python-secp256k1-cardano = callPackage ../development/python-modules/python-secp256k1-cardano { }; python-tds = callPackage ../development/python-modules/python-tds { }; @@ -9169,6 +9202,10 @@ self: super: with self; { omnilogic = callPackage ../development/python-modules/omnilogic { }; + omniorb = toPythonModule (pkgs.omniorb.override { python3 = self.python; }); + + omniorbpy = callPackage ../development/python-modules/omniorbpy { }; + omorfi = callPackage ../development/python-modules/omorfi { }; omrdatasettools = callPackage ../development/python-modules/omrdatasettools { }; @@ -9415,6 +9452,8 @@ self: super: with self; { osc-lib = callPackage ../development/python-modules/osc-lib { }; + osc-placement = callPackage ../development/python-modules/osc-placement { }; + osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { }; oschmod = callPackage ../development/python-modules/oschmod { }; @@ -9503,6 +9542,8 @@ self: super: with self; { paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { }; paho-mqtt = paho-mqtt_1; + paintcompiler = callPackage ../development/python-modules/paintcompiler { }; + palace = callPackage ../development/python-modules/palace { }; palettable = callPackage ../development/python-modules/palettable { }; @@ -9839,6 +9880,8 @@ self: super: with self; { openapi-core = callPackage ../development/python-modules/openapi-core { }; + opentype-feature-freezer = callPackage ../development/python-modules/opentype-feature-freezer { }; + openusd = callPackage ../development/python-modules/openusd { alembic = pkgs.alembic; }; @@ -10631,10 +10674,6 @@ self: super: with self; { proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { }; - proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { }; - - proton-vpn-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-network-manager-wireguard { }; - proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { }; protonup-ng = callPackage ../development/python-modules/protonup-ng { }; @@ -10658,7 +10697,7 @@ self: super: with self; { psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -12544,6 +12583,8 @@ self: super: with self; { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-aodhclient = callPackage ../development/python-modules/python-aodhclient { }; + python-apt = callPackage ../development/python-modules/python-apt { }; python-arango = callPackage ../development/python-modules/python-arango { }; @@ -12964,8 +13005,6 @@ self: super: with self; { pyunifi = callPackage ../development/python-modules/pyunifi { }; - pyunifiprotect = callPackage ../development/python-modules/pyunifiprotect { }; - pyupdate = callPackage ../development/python-modules/pyupdate { }; pyupgrade = callPackage ../development/python-modules/pyupgrade { }; @@ -13120,6 +13159,8 @@ self: super: with self; { qcs-api-client = callPackage ../development/python-modules/qcs-api-client { }; + qcs-api-client-common = callPackage ../development/python-modules/qcs-api-client-common { }; + qcs-sdk-python = callPackage ../development/python-modules/qcs-sdk-python { }; qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; @@ -13128,8 +13169,6 @@ self: super: with self; { qdrant-client = callPackage ../development/python-modules/qdrant-client { }; - qds-sdk = callPackage ../development/python-modules/qds-sdk { }; - qgrid = callPackage ../development/python-modules/qgrid { }; qemu = callPackage ../development/python-modules/qemu { @@ -13446,8 +13485,6 @@ self: super: with self; { repocheck = callPackage ../development/python-modules/repocheck { }; - reportengine = callPackage ../development/python-modules/reportengine { }; - reportlab = callPackage ../development/python-modules/reportlab { }; reportlab-qrcode = callPackage ../development/python-modules/reportlab-qrcode { }; @@ -13692,8 +13729,6 @@ self: super: with self; { roonapi = callPackage ../development/python-modules/roonapi { }; - ronin = callPackage ../development/python-modules/ronin { }; - rope = callPackage ../development/python-modules/rope { }; ropgadget = callPackage ../development/python-modules/ropgadget { }; @@ -13836,6 +13871,8 @@ self: super: with self; { sagemaker = callPackage ../development/python-modules/sagemaker { }; + salib = callPackage ../development/python-modules/salib { }; + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; sane = callPackage ../development/python-modules/sane { @@ -15773,6 +15810,8 @@ self: super: with self; { treeo = callPackage ../development/python-modules/treeo { }; + treescope = callPackage ../development/python-modules/treescope { }; + treex = callPackage ../development/python-modules/treex { }; treq = callPackage ../development/python-modules/treq { }; @@ -16788,6 +16827,8 @@ self: super: with self; { ufolint = callPackage ../development/python-modules/ufolint { }; + ufomerge = callPackage ../development/python-modules/ufomerge { }; + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; @@ -17004,8 +17045,6 @@ self: super: with self; { validobj = callPackage ../development/python-modules/validobj { }; - validphys2 = callPackage ../development/python-modules/validphys2 { }; - vallox-websocket-api = callPackage ../development/python-modules/vallox-websocket-api { }; vapoursynth = callPackage ../development/python-modules/vapoursynth { @@ -17161,6 +17200,8 @@ self: super: with self; { enablePython = true; }); + vttlib = callPackage ../development/python-modules/vttlib { }; + vulcan-api = callPackage ../development/python-modules/vulcan-api { }; vultr = callPackage ../development/python-modules/vultr { }; @@ -17859,6 +17900,8 @@ self: super: with self; { zulip = callPackage ../development/python-modules/zulip { }; + zulip-emoji-mapping = callPackage ../development/python-modules/zulip-emoji-mapping { }; + zwave-me-ws = callPackage ../development/python-modules/zwave-me-ws { }; zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix index b0091a16f3..e491c44365 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -154,7 +154,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP liblastfm = callPackage ../development/libraries/liblastfm { }; libopenshot = callPackage ../development/libraries/libopenshot { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; python3 = pkgs.python311; }; @@ -205,7 +205,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca = callPackage ../development/libraries/qca { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (libsForQt5) qtbase; }; qca-qt5 = self.qca; @@ -237,7 +237,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtkeychain = callPackage ../development/libraries/qtkeychain { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; diff --git a/third_party/nixpkgs/pkgs/top-level/stage.nix b/third_party/nixpkgs/pkgs/top-level/stage.nix index 6ad193c892..265ab242d8 100644 --- a/third_party/nixpkgs/pkgs/top-level/stage.nix +++ b/third_party/nixpkgs/pkgs/top-level/stage.nix @@ -312,7 +312,7 @@ let crossSystem = { isStatic = true; parsed = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then makeMuslParsedPlatform stdenv.hostPlatform.parsed else stdenv.hostPlatform.parsed; gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } // diff --git a/third_party/nixpkgs/pkgs/top-level/wine-packages.nix b/third_party/nixpkgs/pkgs/top-level/wine-packages.nix index 18596f2101..c31ae27c6f 100644 --- a/third_party/nixpkgs/pkgs/top-level/wine-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/wine-packages.nix @@ -9,35 +9,35 @@ rec { base = minimal.override { gettextSupport = true; - fontconfigSupport = stdenv.isLinux; - alsaSupport = stdenv.isLinux; + fontconfigSupport = stdenv.hostPlatform.isLinux; + alsaSupport = stdenv.hostPlatform.isLinux; openglSupport = true; vulkanSupport = true; tlsSupport = true; cupsSupport = true; - dbusSupport = stdenv.isLinux; - cairoSupport = stdenv.isLinux; + dbusSupport = stdenv.hostPlatform.isLinux; + cairoSupport = stdenv.hostPlatform.isLinux; cursesSupport = true; - saneSupport = stdenv.isLinux; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; - udevSupport = stdenv.isLinux; - xineramaSupport = stdenv.isLinux; + saneSupport = stdenv.hostPlatform.isLinux; + pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; + udevSupport = stdenv.hostPlatform.isLinux; + xineramaSupport = stdenv.hostPlatform.isLinux; sdlSupport = true; mingwSupport = true; usbSupport = true; - waylandSupport = stdenv.isLinux; - x11Support = stdenv.isLinux; + waylandSupport = stdenv.hostPlatform.isLinux; + x11Support = stdenv.hostPlatform.isLinux; }; full = base.override { - gtkSupport = stdenv.isLinux; + gtkSupport = stdenv.hostPlatform.isLinux; gstreamerSupport = true; openclSupport = true; odbcSupport = true; - netapiSupport = stdenv.isLinux; - vaSupport = stdenv.isLinux; + netapiSupport = stdenv.hostPlatform.isLinux; + vaSupport = stdenv.hostPlatform.isLinux; pcapSupport = true; - v4lSupport = stdenv.isLinux; + v4lSupport = stdenv.hostPlatform.isLinux; gphoto2Support = true; krb5Support = true; embedInstallers = true;